5 files changed, 137 insertions, 173 deletions

diff --git a/OpenSim/Data/Tests/AssetTests.cs b/OpenSim/Data/Tests/AssetTests.cs
index acd5449..d228c1f 100644
--- a/OpenSim/Data/Tests/AssetTests.cs
+++ b/OpenSim/Data/Tests/AssetTests.cs
@@ -35,6 +35,10 @@ using OpenSim.Framework;
 using System.Data.Common;
 using log4net;
 
+#if !NUNIT25
+using NUnit.Framework.SyntaxHelpers;
+#endif
+
 // DBMS-specific:
 using MySql.Data.MySqlClient;
 using OpenSim.Data.MySQL;
@@ -47,25 +51,46 @@ using OpenSim.Data.SQLite;
 
 namespace OpenSim.Data.Tests
 {
+
+#if NUNIT25
+
     [TestFixture(typeof(MySqlConnection), typeof(MySQLAssetData), Description="Basic Asset store tests (MySQL)")]
     [TestFixture(typeof(SqlConnection), typeof(MSSQLAssetData), Description = "Basic Asset store tests (MS SQL Server)")]
     [TestFixture(typeof(SqliteConnection), typeof(SQLiteAssetData), Description = "Basic Asset store tests (SQLite)")]
 
+#else
+
+    [TestFixture(Description = "Region store tests (SQLite)")]
+    public class SQLiteAssetTests : AssetTests<SqliteConnection, SQLiteAssetData>
+    {
+    }
+
+    [TestFixture(Description = "Region store tests (MySQL)")]
+    public class MySqlAssetTests : AssetTests<MySqlConnection, MySQLAssetData>
+    {
+    }
+
+    [TestFixture(Description = "Region store tests (MS SQL Server)")]
+    public class MSSQLAssetTests : AssetTests<SqlConnection, MSSQLAssetData>
+    {
+    }
+
+#endif
+
+
     public class AssetTests<TConn, TAssetData> : BasicDataServiceTest<TConn, TAssetData>
         where TConn : DbConnection, new()
         where TAssetData : AssetDataBase, new()
     {
         TAssetData m_db;
 
-        const bool COMPARE_CREATOR = false;
-
         public UUID uuid1 = UUID.Random();
         public UUID uuid2 = UUID.Random();
         public UUID uuid3 = UUID.Random();
 
-        public UUID critter1 = COMPARE_CREATOR ? UUID.Random() : UUID.Zero;
-        public UUID critter2 = COMPARE_CREATOR ? UUID.Random() : UUID.Zero;
-        public UUID critter3 = COMPARE_CREATOR ? UUID.Random() : UUID.Zero;
+        public string critter1 = UUID.Random().ToString();
+        public string critter2 = UUID.Random().ToString();
+        public string critter3 = UUID.Random().ToString();
 
         public byte[] data1 = new byte[100];
 
@@ -157,5 +182,32 @@ namespace OpenSim.Data.Tests
                 Assert.That(metadata.FullID, Is.EqualTo(a1b.FullID));
             }
         }
+
+        [Test]
+        public void T020_CheckForWeirdCreatorID()
+        {
+            // It is expected that eventually the CreatorID might be an arbitrary string (an URI)
+            // rather than a valid UUID (?).  This test is to make sure that the database layer does not
+            // attempt to convert CreatorID to GUID, but just passes it both ways as a string.
+            AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, critter1);
+            AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture, "This is not a GUID!");
+            AssetBase a3 = new AssetBase(uuid3, "asset three", (sbyte)AssetType.Texture, "");
+            a1.Data = data1;
+            a2.Data = data1;
+            a3.Data = data1;
+
+            m_db.StoreAsset(a1);
+            m_db.StoreAsset(a2);
+            m_db.StoreAsset(a3);
+
+            AssetBase a1a = m_db.GetAsset(uuid1);
+            Assert.That(a1a, Constraints.PropertyCompareConstraint(a1));
+
+            AssetBase a2a = m_db.GetAsset(uuid2);
+            Assert.That(a2a, Constraints.PropertyCompareConstraint(a2));
+
+            AssetBase a3a = m_db.GetAsset(uuid3);
+            Assert.That(a3a, Constraints.PropertyCompareConstraint(a3));
+        }
     }
 }
diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs
deleted file mode 100644
index 71d6314..0000000
--- a/OpenSim/Data/Tests/BasicAssetTest.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * 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 OpenSimulator 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.Collections.Generic;
-using log4net.Config;
-using NUnit.Framework;
-using NUnit.Framework.SyntaxHelpers;
-using OpenMetaverse;
-using OpenSim.Framework;
-using log4net;
-
-namespace OpenSim.Data.Tests
-{
-    public class BasicAssetTest
-    {
-        public IAssetDataPlugin db;
-        public UUID uuid1;
-        public UUID uuid2;
-        public UUID uuid3;
-        public string critter1 = UUID.Random().ToString();
-        public string critter2 = UUID.Random().ToString();
-        public string critter3 = UUID.Random().ToString();
-        public byte[] asset1;
-        PropertyScrambler<AssetBase> scrambler;
-
-        public void SuperInit()
-        {
-            OpenSim.Tests.Common.TestLogging.LogToConsole();
-
-            uuid1 = UUID.Random();
-            uuid2 = UUID.Random();
-            uuid3 = UUID.Random();
-            asset1 = new byte[100];
-            asset1.Initialize();
-            
-
-            scrambler = new PropertyScrambler<AssetBase>()
-                .DontScramble(x => x.ID)
-                .DontScramble(x => x.FullID)
-                .DontScramble(x => x.Metadata.ID)
-                .DontScramble(x => x.Metadata.Type)
-                .DontScramble(x => x.Metadata.CreatorID)
-                .DontScramble(x => x.Metadata.ContentType)
-                .DontScramble(x => x.Metadata.FullID);
-        }
-
-        [Test]
-        public void T001_LoadEmpty()
-        {
-            Assert.That(db.ExistsAsset(uuid1), Is.False);
-            Assert.That(db.ExistsAsset(uuid2), Is.False);
-            Assert.That(db.ExistsAsset(uuid3), Is.False);
-        }
-
-        [Test]
-        public void T010_StoreSimpleAsset()
-        {
-            AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, critter1);
-            AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture, critter2);
-            AssetBase a3 = new AssetBase(uuid3, "asset three", (sbyte)AssetType.Texture, critter3);
-            a1.Data = asset1;
-            a2.Data = asset1;
-            a3.Data = asset1;
-
-            scrambler.Scramble(a1);
-            scrambler.Scramble(a2);
-            scrambler.Scramble(a3);
-
-            db.StoreAsset(a1);
-            db.StoreAsset(a2);
-            db.StoreAsset(a3);
-            
-            AssetBase a1a = db.GetAsset(uuid1);
-            Assert.That(a1a, Constraints.PropertyCompareConstraint(a1));
-
-            AssetBase a2a = db.GetAsset(uuid2);
-            Assert.That(a2a, Constraints.PropertyCompareConstraint(a2));
-
-            AssetBase a3a = db.GetAsset(uuid3);
-            Assert.That(a3a, Constraints.PropertyCompareConstraint(a3));
-
-            scrambler.Scramble(a1a);
-            scrambler.Scramble(a2a);
-            scrambler.Scramble(a3a);
-
-            db.StoreAsset(a1a);
-            db.StoreAsset(a2a);
-            db.StoreAsset(a3a);
-
-            AssetBase a1b = db.GetAsset(uuid1);
-            Assert.That(a1b, Constraints.PropertyCompareConstraint(a1a));
-
-            AssetBase a2b = db.GetAsset(uuid2);
-            Assert.That(a2b, Constraints.PropertyCompareConstraint(a2a));
-
-            AssetBase a3b = db.GetAsset(uuid3);
-            Assert.That(a3b, Constraints.PropertyCompareConstraint(a3a));
-
-            Assert.That(db.ExistsAsset(uuid1), Is.True);
-            Assert.That(db.ExistsAsset(uuid2), Is.True);
-            Assert.That(db.ExistsAsset(uuid3), Is.True);
-
-            List<AssetMetadata> metadatas = db.FetchAssetMetadataSet(0, 1000);
-
-            AssetMetadata metadata = metadatas.Find(x => x.FullID == uuid1);
-            Assert.That(metadata.Name, Is.EqualTo(a1b.Name));
-            Assert.That(metadata.Description, Is.EqualTo(a1b.Description));
-            Assert.That(metadata.Type, Is.EqualTo(a1b.Type));
-            Assert.That(metadata.Temporary, Is.EqualTo(a1b.Temporary));
-            Assert.That(metadata.FullID, Is.EqualTo(a1b.FullID));
-        }
-
-
-        [Test]
-        public void T020_CheckForWeirdCreatorID()
-        {
-            // It is expected that eventually the CreatorID might be an arbitrary string (an URI)
-            // rather than a valid UUID (?).  This test is to make sure that the database layer does not
-            // attempt to convert CreatorID to GUID, but just passes it both ways as a string.
-            AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, critter1);
-            AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture, "This is not a GUID!");
-            AssetBase a3 = new AssetBase(uuid3, "asset three", (sbyte)AssetType.Texture, "");
-            a1.Data = asset1;
-            a2.Data = asset1;
-            a3.Data = asset1;
-
-            db.StoreAsset(a1);
-            db.StoreAsset(a2);
-            db.StoreAsset(a3);
-
-            AssetBase a1a = db.GetAsset(uuid1);
-            Assert.That(a1a, Constraints.PropertyCompareConstraint(a1));
-
-            AssetBase a2a = db.GetAsset(uuid2);
-            Assert.That(a2a, Constraints.PropertyCompareConstraint(a2));
-
-            AssetBase a3a = db.GetAsset(uuid3);
-            Assert.That(a3a, Constraints.PropertyCompareConstraint(a3));
-        }
-    }
-}
diff --git a/OpenSim/Data/Tests/EstateTests.cs b/OpenSim/Data/Tests/EstateTests.cs
index 4893cc7..2da010d 100644
--- a/OpenSim/Data/Tests/EstateTests.cs
+++ b/OpenSim/Data/Tests/EstateTests.cs
@@ -37,6 +37,10 @@ using log4net;
 using System.Reflection;
 using System.Data.Common;
 
+#if !NUNIT25
+using NUnit.Framework.SyntaxHelpers;
+#endif
+
 
 // DBMS-specific:
 using MySql.Data.MySqlClient;
@@ -51,10 +55,32 @@ using OpenSim.Data.SQLite;
 
 namespace OpenSim.Data.Tests
 {
+
+#if NUNIT25
+
     [TestFixture(typeof(MySqlConnection), typeof(MySQLEstateStore), Description = "Estate store tests (MySQL)")]
     [TestFixture(typeof(SqlConnection), typeof(MSSQLEstateStore), Description = "Estate store tests (MS SQL Server)")]
     [TestFixture(typeof(SqliteConnection), typeof(SQLiteEstateStore), Description = "Estate store tests (SQLite)")]
 
+#else
+
+    [TestFixture(Description = "Estate store tests (SQLite)")]
+    public class SQLiteEstateTests : EstateTests<SqliteConnection, SQLiteEstateStore>
+    {
+    }
+
+    [TestFixture(Description = "Estate store tests (MySQL)")]
+    public class MySqlEstateTests : EstateTests<MySqlConnection, MySQLEstateStore>
+    {
+    }
+
+    [TestFixture(Description = "Estate store tests (MS SQL Server)")]
+    public class MSSQLEstateTests : EstateTests<SqlConnection, MSSQLEstateStore>
+    {
+    }
+
+#endif
+
     public class EstateTests<TConn, TEstateStore> : BasicDataServiceTest<TConn, TEstateStore>
         where TConn : DbConnection, new()
         where TEstateStore : class, IEstateDataStore, new()
diff --git a/OpenSim/Data/Tests/InventoryTests.cs b/OpenSim/Data/Tests/InventoryTests.cs
index d5f3be4..93e1eba 100644
--- a/OpenSim/Data/Tests/InventoryTests.cs
+++ b/OpenSim/Data/Tests/InventoryTests.cs
@@ -25,6 +25,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+// #define NUNIT25
+
 using System;
 using log4net.Config;
 using NUnit.Framework;
@@ -35,6 +37,10 @@ using log4net;
 using System.Reflection;
 using System.Data.Common;
 
+#if !NUNIT25
+using NUnit.Framework.SyntaxHelpers;
+#endif
+
 // DBMS-specific:
 using MySql.Data.MySqlClient;
 using OpenSim.Data.MySQL;
@@ -47,9 +53,29 @@ using OpenSim.Data.SQLite;
 
 namespace OpenSim.Data.Tests
 {
+#if NUNIT25
+
+    [TestFixture(typeof(SqliteConnection), typeof(SQLiteInventoryStore), Description = "Inventory store tests (SQLite)")]
     [TestFixture(typeof(MySqlConnection), typeof(MySQLInventoryData), Description = "Inventory store tests (MySQL)")]
     [TestFixture(typeof(SqlConnection), typeof(MSSQLInventoryData), Description = "Inventory store tests (MS SQL Server)")]
-    [TestFixture(typeof(SqliteConnection), typeof(SQLiteInventoryStore), Description = "Inventory store tests (SQLite)")]
+
+#else
+
+    [TestFixture(Description = "Inventory store tests (SQLite)")]
+    public class SQLiteInventoryTests : InventoryTests<SqliteConnection, SQLiteInventoryStore>
+    {
+    }
+
+    [TestFixture(Description = "Inventory store tests (MySQL)")]
+    public class MySqlInventoryTests : InventoryTests<MySqlConnection, MySQLInventoryData>
+    { 
+    }
+
+    [TestFixture(Description = "Inventory store tests (MS SQL Server)")]
+    public class MSSQLInventoryTests : InventoryTests<SqlConnection, MSSQLInventoryData>
+    {
+    }
+#endif
 
     public class InventoryTests<TConn, TInvStore> : BasicDataServiceTest<TConn, TInvStore>
         where TConn : DbConnection, new()
@@ -85,6 +111,7 @@ namespace OpenSim.Data.Tests
         {
             name1 = "Root Folder for " + owner1.ToString();
         }
+        public InventoryTests() : this("") { }
 
         protected override void InitService(object service)
         {
diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs
index f38dc4a..5ac2dd0 100644
--- a/OpenSim/Data/Tests/RegionTests.cs
+++ b/OpenSim/Data/Tests/RegionTests.cs
@@ -40,6 +40,10 @@ using log4net;
 using System.Reflection;
 using System.Data.Common;
 
+#if !NUNIT25
+using NUnit.Framework.SyntaxHelpers;
+#endif
+
 // DBMS-specific:
 using MySql.Data.MySqlClient;
 using OpenSim.Data.MySQL;
@@ -52,9 +56,30 @@ using OpenSim.Data.SQLite;
 
 namespace OpenSim.Data.Tests
 {
+#if NUNIT25
+
+    [TestFixture(typeof(SqliteConnection), typeof(SQLiteRegionData), Description = "Region store tests (SQLite)")]
     [TestFixture(typeof(MySqlConnection), typeof(MySqlRegionData), Description = "Region store tests (MySQL)")]
     [TestFixture(typeof(SqlConnection), typeof(MSSQLRegionData), Description = "Region store tests (MS SQL Server)")]
-    [TestFixture(typeof(SqliteConnection), typeof(SQLiteRegionData), Description = "Region store tests (SQLite)")]
+
+#else
+
+    [TestFixture(Description = "Region store tests (SQLite)")]
+    public class SQLiteRegionTests : RegionTests<SqliteConnection, SQLiteRegionData>
+    {
+    }
+
+    [TestFixture(Description = "Region store tests (MySQL)")]
+    public class MySqlRegionTests : RegionTests<MySqlConnection, MySQLDataStore>
+    {
+    }
+
+    [TestFixture(Description = "Region store tests (MS SQL Server)")]
+    public class MSSQLRegionTests : RegionTests<SqlConnection, MSSQLRegionDataStore>
+    {
+    }
+
+#endif
 
     public class RegionTests<TConn, TRegStore> : BasicDataServiceTest<TConn, TRegStore>
         where TConn : DbConnection, new()