diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs index 5c58a4b948..e270b9c480 100644 --- a/OpenSim/Data/MySQL/MySQLAssetData.cs +++ b/OpenSim/Data/MySQL/MySQLAssetData.cs @@ -40,7 +40,7 @@ namespace OpenSim.Data.MySQL /// /// A MySQL Interface for the Asset Server /// - internal class MySQLAssetData : AssetDataBase + public class MySQLAssetData : AssetDataBase { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); diff --git a/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs new file mode 100644 index 0000000000..0419e216c6 --- /dev/null +++ b/OpenSim/Data/MySQL/Tests/MySQLAssetTest.cs @@ -0,0 +1,83 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSim Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using System; +using System.IO; +using System.Collections.Generic; +using NUnit.Framework; +using NUnit.Framework.SyntaxHelpers; +using OpenSim.Framework; +using OpenSim.Data.Tests; +using OpenSim.Data.MySQL; +using OpenSim.Region.Environment.Scenes; +using OpenMetaverse; + +namespace OpenSim.Data.MySQL.Tests +{ + [TestFixture] + public class MySQLAssetTest : BasicAssetTest + { + public string file; + public MySQLManager database; + public string connect = "Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;Pooling=false;"; + + [TestFixtureSetUp] + public void Init() + { + SuperInit(); + // If we manage to connect to the database with the user + // and password above it is our test database, and run + // these tests. If anything goes wrong, ignore these + // tests. + try + { + database = new MySQLManager(connect); + db = new MySQLAssetData(); + db.Initialise(connect); + } + catch (Exception e) + { + System.Console.WriteLine("Exception {0}", e); + Assert.Ignore(); + } + } + + [TestFixtureTearDown] + public void Cleanup() + { + if (db != null) + { + db.Dispose(); + } + if (database != null) + { + database.ExecuteSql("drop table migrations"); + database.ExecuteSql("drop table assets"); + } + } + } +} \ No newline at end of file diff --git a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs index c299452c10..5e6b7f9436 100644 --- a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs +++ b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs @@ -50,6 +50,10 @@ namespace OpenSim.Data.MySQL.Tests public void Init() { SuperInit(); + // If we manage to connect to the database with the user + // and password above it is our test database, and run + // these tests. If anything goes wrong, ignore these + // tests. try { database = new MySQLManager(connect); @@ -66,6 +70,10 @@ namespace OpenSim.Data.MySQL.Tests [TestFixtureTearDown] public void Cleanup() { + if (db != null) + { + db.Dispose(); + } if (database != null) { database.ExecuteSql("drop table migrations"); diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs index 89b86eb81d..53c93790c0 100644 --- a/OpenSim/Data/Tests/BasicAssetTest.cs +++ b/OpenSim/Data/Tests/BasicAssetTest.cs @@ -42,6 +42,7 @@ namespace OpenSim.Data.Tests public UUID uuid1; public UUID uuid2; public UUID uuid3; + public byte[] asset1; public void SuperInit() { @@ -57,6 +58,8 @@ namespace OpenSim.Data.Tests uuid1 = UUID.Random(); uuid2 = UUID.Random(); uuid3 = UUID.Random(); + asset1 = new byte[100]; + asset1.Initialize(); } [Test] @@ -73,21 +76,25 @@ namespace OpenSim.Data.Tests AssetBase a1 = new AssetBase(uuid1, "asset one"); AssetBase a2 = new AssetBase(uuid2, "asset two"); AssetBase a3 = new AssetBase(uuid3, "asset three"); + a1.Data = asset1; + a2.Data = asset1; + a3.Data = asset1; + db.CreateAsset(a1); db.CreateAsset(a2); db.CreateAsset(a3); AssetBase a1a = db.FetchAsset(uuid1); Assert.That(a1.ID, Is.EqualTo(a1a.ID)); - Assert.That(a1.Name, Text.Matches(a1a.Name)); + Assert.That(a1.Name, Is.EqualTo(a1a.Name)); AssetBase a2a = db.FetchAsset(uuid2); Assert.That(a2.ID, Is.EqualTo(a2a.ID)); - Assert.That(a2.Name, Text.Matches(a2a.Name)); + Assert.That(a2.Name, Is.EqualTo(a2a.Name)); AssetBase a3a = db.FetchAsset(uuid3); Assert.That(a3.ID, Is.EqualTo(a3a.ID)); - Assert.That(a3.Name, Text.Matches(a3a.Name)); + Assert.That(a3.Name, Is.EqualTo(a3a.Name)); } [Test]