Initial update to OpenSim 0.8.2.1 source code.

5 files changed, 12 insertions, 39 deletions

diff --git a/OpenSim/Data/Tests/AssetTests.cs b/OpenSim/Data/Tests/AssetTests.cs
index 8cb2ee0..5d7b169 100644
--- a/OpenSim/Data/Tests/AssetTests.cs
+++ b/OpenSim/Data/Tests/AssetTests.cs
@@ -40,9 +40,6 @@ using log4net;
 using MySql.Data.MySqlClient;
 using OpenSim.Data.MySQL;
 
-using System.Data.SqlClient;
-using OpenSim.Data.MSSQL;
-
 using Mono.Data.Sqlite;
 using OpenSim.Data.SQLite;
 
@@ -58,11 +55,6 @@ namespace OpenSim.Data.Tests
     {
     }
 
-    [TestFixture(Description = "Asset store tests (MS SQL Server)")]
-    public class MSSQLAssetTests : AssetTests<SqlConnection, MSSQLAssetData>
-    {
-    }
-
     public class AssetTests<TConn, TAssetData> : BasicDataServiceTest<TConn, TAssetData>
         where TConn : DbConnection, new()
         where TAssetData : AssetDataBase, new()
@@ -107,10 +99,11 @@ namespace OpenSim.Data.Tests
         public void T001_LoadEmpty()
         {
             TestHelpers.InMethod();
-            
-            Assert.That(m_db.ExistsAsset(uuid1), Is.False);
-            Assert.That(m_db.ExistsAsset(uuid2), Is.False);
-            Assert.That(m_db.ExistsAsset(uuid3), Is.False);
+
+            bool[] exist = m_db.AssetsExist(new[] { uuid1, uuid2, uuid3 });
+            Assert.IsFalse(exist[0]);
+            Assert.IsFalse(exist[1]);
+            Assert.IsFalse(exist[2]);
         }
 
         [Test]
@@ -159,9 +152,10 @@ namespace OpenSim.Data.Tests
             AssetBase a3b = m_db.GetAsset(uuid3);
             Assert.That(a3b, Constraints.PropertyCompareConstraint(a3a));
 
-            Assert.That(m_db.ExistsAsset(uuid1), Is.True);
-            Assert.That(m_db.ExistsAsset(uuid2), Is.True);
-            Assert.That(m_db.ExistsAsset(uuid3), Is.True);
+            bool[] exist = m_db.AssetsExist(new[] { uuid1, uuid2, uuid3 });
+            Assert.IsTrue(exist[0]);
+            Assert.IsTrue(exist[1]);
+            Assert.IsTrue(exist[2]);
 
             List<AssetMetadata> metadatas = m_db.FetchAssetMetadataSet(0, 1000);
 
diff --git a/OpenSim/Data/Tests/BasicDataServiceTest.cs b/OpenSim/Data/Tests/BasicDataServiceTest.cs
index 69b79bf..acfebd0 100644
--- a/OpenSim/Data/Tests/BasicDataServiceTest.cs
+++ b/OpenSim/Data/Tests/BasicDataServiceTest.cs
@@ -99,6 +99,9 @@ namespace OpenSim.Data.Tests
                 if (Directory.Exists("/proc/ppc64") || Directory.Exists("/proc/dasd"))
                     Assert.Ignore();
 
+                if (Util.IsWindows())
+                    Util.LoadArchSpecificWindowsDll("sqlite3.dll");
+
                 // for SQLite, if no explicit conn string is specified, use a temp file
                 if (String.IsNullOrEmpty(m_connStr))
                 {
diff --git a/OpenSim/Data/Tests/EstateTests.cs b/OpenSim/Data/Tests/EstateTests.cs
index 3e47bcf..e2b2d12 100644
--- a/OpenSim/Data/Tests/EstateTests.cs
+++ b/OpenSim/Data/Tests/EstateTests.cs
@@ -41,9 +41,6 @@ using System.Data.Common;
 using MySql.Data.MySqlClient;
 using OpenSim.Data.MySQL;
 
-using System.Data.SqlClient;
-using OpenSim.Data.MSSQL;
-
 using Mono.Data.Sqlite;
 using OpenSim.Data.SQLite;
 
@@ -59,11 +56,6 @@ namespace OpenSim.Data.Tests
     {
     }
 
-    [TestFixture(Description = "Estate store tests (MS SQL Server)")]
-    public class MSSQLEstateTests : EstateTests<SqlConnection, MSSQLEstateStore>
-    {
-    }
-
     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 5b6b61b..3edf89d 100644
--- a/OpenSim/Data/Tests/InventoryTests.cs
+++ b/OpenSim/Data/Tests/InventoryTests.cs
@@ -39,9 +39,6 @@ using System.Data.Common;
 using MySql.Data.MySqlClient;
 using OpenSim.Data.MySQL;
 
-using System.Data.SqlClient;
-using OpenSim.Data.MSSQL;
-
 using Mono.Data.Sqlite;
 using OpenSim.Data.SQLite;
 
@@ -57,11 +54,6 @@ namespace OpenSim.Data.Tests
     { 
     }
 
-    [TestFixture(Description = "Inventory store tests (MS SQL Server)")]
-    public class MSSQLInventoryTests : InventoryTests<SqlConnection, MSSQLInventoryData>
-    {
-    }
-
     public class InventoryTests<TConn, TInvStore> : BasicDataServiceTest<TConn, TInvStore>
         where TConn : DbConnection, new()
         where TInvStore : class, IInventoryDataPlugin, new()
diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs
index dbed8f6..8d4249a 100644
--- a/OpenSim/Data/Tests/RegionTests.cs
+++ b/OpenSim/Data/Tests/RegionTests.cs
@@ -44,9 +44,6 @@ using System.Data.Common;
 using MySql.Data.MySqlClient;
 using OpenSim.Data.MySQL;
 
-using System.Data.SqlClient;
-using OpenSim.Data.MSSQL;
-
 using Mono.Data.Sqlite;
 using OpenSim.Data.SQLite;
 
@@ -62,11 +59,6 @@ namespace OpenSim.Data.Tests
     {
     }
 
-    [TestFixture(Description = "Region store tests (MS SQL Server)")]
-    public class MSSQLRegionTests : RegionTests<SqlConnection, MSSQLSimulationData>
-    {
-    }
-
     public class RegionTests<TConn, TRegStore> : BasicDataServiceTest<TConn, TRegStore>
         where TConn : DbConnection, new()
         where TRegStore : class, ISimulationDataStore, new()