Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 9 insertions, 15 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);