8 files changed, 143 insertions, 123 deletions
diff --git a/OpenSim/Data/Tests/AssetTests.cs b/OpenSim/Data/Tests/AssetTests.cs
index 5d7b169..70880cf 100644
--- a/OpenSim/Data/Tests/AssetTests.cs
+++ b/OpenSim/Data/Tests/AssetTests.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Data.Tests
        public void T010_StoreReadVerifyAssets()
        {
            TestHelpers.InMethod();
-            
            AssetBase a1 = new AssetBase(uuid1, "asset one", (sbyte)AssetType.Texture, critter1.ToString());
            AssetBase a2 = new AssetBase(uuid2, "asset two", (sbyte)AssetType.Texture, critter2.ToString());
            AssetBase a3 = new AssetBase(uuid3, "asset three", (sbyte)AssetType.Texture, critter3.ToString());
@@ -125,14 +125,20 @@ namespace OpenSim.Data.Tests
            m_db.StoreAsset(a1);
            m_db.StoreAsset(a2);
            m_db.StoreAsset(a3);
-            
+            a1.UploadAttempts = 0;
+            a2.UploadAttempts = 0;
+            a3.UploadAttempts = 0;
            AssetBase a1a = m_db.GetAsset(uuid1);
+            a1a.UploadAttempts = 0;
            Assert.That(a1a, Constraints.PropertyCompareConstraint(a1));
            AssetBase a2a = m_db.GetAsset(uuid2);
+            a2a.UploadAttempts = 0;
            Assert.That(a2a, Constraints.PropertyCompareConstraint(a2));
            AssetBase a3a = m_db.GetAsset(uuid3);
+            a3a.UploadAttempts = 0;
            Assert.That(a3a, Constraints.PropertyCompareConstraint(a3));
            scrambler.Scramble(a1a);
@@ -142,14 +148,20 @@ namespace OpenSim.Data.Tests
            m_db.StoreAsset(a1a);
            m_db.StoreAsset(a2a);
            m_db.StoreAsset(a3a);
+            a1a.UploadAttempts = 0;
+            a2a.UploadAttempts = 0;
+            a3a.UploadAttempts = 0;
            AssetBase a1b = m_db.GetAsset(uuid1);
+            a1b.UploadAttempts = 0;
            Assert.That(a1b, Constraints.PropertyCompareConstraint(a1a));
            AssetBase a2b = m_db.GetAsset(uuid2);
+            a2b.UploadAttempts = 0;
            Assert.That(a2b, Constraints.PropertyCompareConstraint(a2a));
            AssetBase a3b = m_db.GetAsset(uuid3);
+            a3b.UploadAttempts = 0;
            Assert.That(a3b, Constraints.PropertyCompareConstraint(a3a));
            bool[] exist = m_db.AssetsExist(new[] { uuid1, uuid2, uuid3 });
@@ -178,7 +190,7 @@ namespace OpenSim.Data.Tests
        public void T020_CheckForWeirdCreatorID()
        {
            TestHelpers.InMethod();
-            
            // 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.
@@ -190,16 +202,22 @@ namespace OpenSim.Data.Tests
            a3.Data = data1;
            m_db.StoreAsset(a1);
+            a1.UploadAttempts = 0;
            m_db.StoreAsset(a2);
+            a2.UploadAttempts = 0;
            m_db.StoreAsset(a3);
+            a3.UploadAttempts = 0;
            AssetBase a1a = m_db.GetAsset(uuid1);
+            a1a.UploadAttempts = 0;
            Assert.That(a1a, Constraints.PropertyCompareConstraint(a1));
            AssetBase a2a = m_db.GetAsset(uuid2);
+            a2a.UploadAttempts = 0;
            Assert.That(a2a, Constraints.PropertyCompareConstraint(a2));
            AssetBase a3a = m_db.GetAsset(uuid3);
+            a3a.UploadAttempts = 0;
            Assert.That(a3a, Constraints.PropertyCompareConstraint(a3));
        }
    }
diff --git a/OpenSim/Data/Tests/BasicDataServiceTest.cs b/OpenSim/Data/Tests/BasicDataServiceTest.cs
index 8c296b9..79691e4 100644
--- a/OpenSim/Data/Tests/BasicDataServiceTest.cs
+++ b/OpenSim/Data/Tests/BasicDataServiceTest.cs
@@ -41,11 +41,11 @@ using System.Reflection;
 namespace OpenSim.Data.Tests
 {
-    /// <summary>This is a base class for testing any Data service for any DBMS. 
+    /// <summary>This is a base class for testing any Data service for any DBMS.
    /// Requires NUnit 2.5 or better (to support the generics).
    /// </summary>
    /// <remarks>
-    /// FIXME: Should extend OpenSimTestCase but compile on mono 2.4.3 currently fails with 
+    /// FIXME: Should extend OpenSimTestCase but compile on mono 2.4.3 currently fails with
    /// AssetTests`2 : System.MemberAccessException : Cannot create an instance of OpenSim.Data.Tests.AssetTests`2[TConn,TAssetData] because Type.ContainsGenericParameters is true.
    /// and similar on EstateTests, InventoryTests and RegionTests.
    /// Runs fine with mono 2.10.8.1, so easiest thing is to wait until min Mono version uplifts.
@@ -60,7 +60,7 @@ namespace OpenSim.Data.Tests
        private TService m_service;
        private string m_file;
-        // TODO: Is this in the right place here? 
+        // TODO: Is this in the right place here?
        // Later:  apparently it's not, but does it matter here?
 //        protected static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -68,7 +68,7 @@ namespace OpenSim.Data.Tests
        public BasicDataServiceTest()
            : this("")
-        { 
+        {
        }
        public BasicDataServiceTest(string conn)
@@ -106,7 +106,7 @@ namespace OpenSim.Data.Tests
                if (String.IsNullOrEmpty(m_connStr))
                {
                    m_file = Path.GetTempFileName() + ".db";
-                    m_connStr = "URI=file:../db/" + m_file + ",version=3";
+                    m_connStr = "URI=file:" + m_file + ",version=3";
                }
            }
@@ -226,7 +226,7 @@ namespace OpenSim.Data.Tests
            }
        }
-        /// <summary>Clear tables listed as parameters (without dropping them). 
+        /// <summary>Clear tables listed as parameters (without dropping them).
        /// </summary>
        /// <param name="tables"></param>
        protected virtual void ResetMigrations(params string[] stores)
@@ -251,7 +251,7 @@ namespace OpenSim.Data.Tests
            }
        }
-        /// <summary>Clear tables listed as parameters (without dropping them). 
+        /// <summary>Clear tables listed as parameters (without dropping them).
        /// </summary>
        /// <param name="tables"></param>
        protected virtual void ClearTables(params string[] tables)
diff --git a/OpenSim/Data/Tests/DefaultTestConns.cs b/OpenSim/Data/Tests/DefaultTestConns.cs
index 7c47bdd..5ad238b 100644
--- a/OpenSim/Data/Tests/DefaultTestConns.cs
+++ b/OpenSim/Data/Tests/DefaultTestConns.cs
@@ -39,16 +39,16 @@ namespace OpenSim.Data.Tests
    /// a connection string for testing one of the supported databases.
    /// The connections must be in the section [TestConnections] with names matching the connection class
    /// name for the specific database, e.g.:
-    /// 
+    ///
    /// [TestConnections]
    /// MySqlConnection="..."
    /// SqlConnection="..."
    /// SqliteConnection="..."
-    /// 
+    ///
    /// Note that the conn string may also be set explicitly in the [TestCase()] attribute of test classes
    /// based on BasicDataServiceTest.cs.
    /// </summary>
-    
    static class DefaultTestConns
    {
        private static Dictionary<Type, string> conns = new Dictionary<Type, string>();
@@ -63,8 +63,8 @@ namespace OpenSim.Data.Tests
            Assembly asm = Assembly.GetExecutingAssembly();
            string sType = connType.Name;
-            // Note: when running from NUnit, the DLL is located in some temp dir, so how do we get 
+            // Note: when running from NUnit, the DLL is located in some temp dir, so how do we get
-            // to the INI file? Ok, so put it into the resources! 
+            // to the INI file? Ok, so put it into the resources!
            // string iniName = Path.Combine(Path.GetDirectoryName(asm.Location), "TestDataConnections.ini");
            string[] allres = asm.GetManifestResourceNames();
diff --git a/OpenSim/Data/Tests/EstateTests.cs b/OpenSim/Data/Tests/EstateTests.cs
index e2b2d12..cf3f2b4 100644
--- a/OpenSim/Data/Tests/EstateTests.cs
+++ b/OpenSim/Data/Tests/EstateTests.cs
@@ -100,7 +100,7 @@ namespace OpenSim.Data.Tests
        public void T010_EstateSettingsSimpleStorage_MinimumParameterSet()
        {
            TestHelpers.InMethod();
-            
            EstateSettingsSimpleStorage(
                REGION_ID,
                DataTestUtil.STRING_MIN,
@@ -133,7 +133,7 @@ namespace OpenSim.Data.Tests
        public void T011_EstateSettingsSimpleStorage_MaximumParameterSet()
        {
            TestHelpers.InMethod();
-            
            EstateSettingsSimpleStorage(
                REGION_ID,
                DataTestUtil.STRING_MAX(64),
@@ -166,7 +166,7 @@ namespace OpenSim.Data.Tests
        public void T012_EstateSettingsSimpleStorage_AccurateParameterSet()
        {
            TestHelpers.InMethod();
-            
            EstateSettingsSimpleStorage(
                REGION_ID,
                DataTestUtil.STRING_MAX(1),
@@ -199,7 +199,7 @@ namespace OpenSim.Data.Tests
        public void T012_EstateSettingsRandomStorage()
        {
            TestHelpers.InMethod();
-            
            // Letting estate store generate rows to database for us
            EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
            new PropertyScrambler<EstateSettings>()
@@ -220,7 +220,7 @@ namespace OpenSim.Data.Tests
        public void T020_EstateSettingsManagerList()
        {
            TestHelpers.InMethod();
-            
            // Letting estate store generate rows to database for us
            EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
@@ -241,7 +241,7 @@ namespace OpenSim.Data.Tests
        public void T021_EstateSettingsUserList()
        {
            TestHelpers.InMethod();
-            
            // Letting estate store generate rows to database for us
            EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
@@ -262,7 +262,7 @@ namespace OpenSim.Data.Tests
        public void T022_EstateSettingsGroupList()
        {
            TestHelpers.InMethod();
-            
            // Letting estate store generate rows to database for us
            EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
@@ -283,7 +283,7 @@ namespace OpenSim.Data.Tests
        public void T022_EstateSettingsBanList()
        {
            TestHelpers.InMethod();
-            
            // Letting estate store generate rows to database for us
            EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID, true);
@@ -310,7 +310,7 @@ namespace OpenSim.Data.Tests
        #endregion
-        #region Parametrizable Test Implementations 
+        #region Parametrizable Test Implementations
        private void EstateSettingsSimpleStorage(
            UUID regionId,
diff --git a/OpenSim/Data/Tests/InventoryTests.cs b/OpenSim/Data/Tests/InventoryTests.cs
index 3edf89d..da6e7d4 100644
--- a/OpenSim/Data/Tests/InventoryTests.cs
+++ b/OpenSim/Data/Tests/InventoryTests.cs
@@ -44,14 +44,9 @@ using OpenSim.Data.SQLite;
 namespace OpenSim.Data.Tests
 {
-    [TestFixture(Description = "Inventory store tests (SQLite)")]
-    public class SQLiteInventoryTests : InventoryTests<SqliteConnection, SQLiteInventoryStore>
-    {
-    }
    [TestFixture(Description = "Inventory store tests (MySQL)")]
    public class MySqlInventoryTests : InventoryTests<MySqlConnection, MySQLInventoryData>
-    { 
+    {
    }
    public class InventoryTests<TConn, TInvStore> : BasicDataServiceTest<TConn, TInvStore>
@@ -107,7 +102,7 @@ namespace OpenSim.Data.Tests
        public void T001_LoadEmpty()
        {
            TestHelpers.InMethod();
-            
            Assert.That(db.getInventoryFolder(zero), Is.Null);
            Assert.That(db.getInventoryFolder(folder1), Is.Null);
            Assert.That(db.getInventoryFolder(folder2), Is.Null);
@@ -127,7 +122,7 @@ namespace OpenSim.Data.Tests
        public void T010_FolderNonParent()
        {
            TestHelpers.InMethod();
-            
            InventoryFolderBase f1 = NewFolder(folder2, folder1, owner1, name2);
            // the folder will go in
            db.addInventoryFolder(f1);
@@ -139,7 +134,7 @@ namespace OpenSim.Data.Tests
        public void T011_FolderCreate()
        {
            TestHelpers.InMethod();
-            
            InventoryFolderBase f1 = NewFolder(folder1, zero, owner1, name1);
            // TODO: this is probably wrong behavior, but is what we have
            // db.updateInventoryFolder(f1);
@@ -164,7 +159,7 @@ namespace OpenSim.Data.Tests
        public void T012_FolderList()
        {
            TestHelpers.InMethod();
-            
            InventoryFolderBase f2 = NewFolder(folder3, folder1, owner1, name3);
            db.addInventoryFolder(f2);
@@ -180,7 +175,7 @@ namespace OpenSim.Data.Tests
        public void T013_FolderHierarchy()
        {
            TestHelpers.InMethod();
-            
            int n = db.getFolderHierarchy(zero).Count;  // (for dbg - easier to see what's returned)
            Assert.That(n, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))");
            n = db.getFolderHierarchy(folder1).Count;
@@ -195,7 +190,7 @@ namespace OpenSim.Data.Tests
        public void T014_MoveFolder()
        {
            TestHelpers.InMethod();
-            
            InventoryFolderBase f2 = db.getInventoryFolder(folder2);
            f2.ParentID = folder3;
            db.moveInventoryFolder(f2);
@@ -211,7 +206,7 @@ namespace OpenSim.Data.Tests
        public void T015_FolderHierarchy()
        {
            TestHelpers.InMethod();
-            
            Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(zero).Count, Is.EqualTo(0))");
            Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2), "Assert.That(db.getFolderHierarchy(folder1).Count, Is.EqualTo(2))");
            Assert.That(db.getFolderHierarchy(folder2).Count, Is.EqualTo(0), "Assert.That(db.getFolderHierarchy(folder2).Count, Is.EqualTo(0))");
@@ -224,7 +219,7 @@ namespace OpenSim.Data.Tests
        public void T100_NoItems()
        {
            TestHelpers.InMethod();
-            
            Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0))");
            Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(folder1).Count, Is.EqualTo(0))");
            Assert.That(db.getInventoryInFolder(folder2).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(folder2).Count, Is.EqualTo(0))");
@@ -238,7 +233,7 @@ namespace OpenSim.Data.Tests
        public void T101_CreatItems()
        {
            TestHelpers.InMethod();
-            
            db.addInventoryItem(NewItem(item1, folder3, owner1, iname1, asset1));
            db.addInventoryItem(NewItem(item2, folder3, owner1, iname2, asset2));
            db.addInventoryItem(NewItem(item3, folder3, owner1, iname3, asset3));
@@ -249,7 +244,7 @@ namespace OpenSim.Data.Tests
        public void T102_CompareItems()
        {
            TestHelpers.InMethod();
-            
            InventoryItemBase i1 = db.getInventoryItem(item1);
            InventoryItemBase i2 = db.getInventoryItem(item2);
            InventoryItemBase i3 = db.getInventoryItem(item3);
@@ -268,7 +263,7 @@ namespace OpenSim.Data.Tests
        public void T103_UpdateItem()
        {
            TestHelpers.InMethod();
-            
            // TODO: probably shouldn't have the ability to have an
            // owner of an item in a folder not owned by the user
@@ -288,7 +283,7 @@ namespace OpenSim.Data.Tests
        public void T104_RandomUpdateItem()
        {
            TestHelpers.InMethod();
-            
            PropertyScrambler<InventoryFolderBase> folderScrambler =
                new PropertyScrambler<InventoryFolderBase>()
                    .DontScramble(x => x.Owner)
@@ -347,7 +342,7 @@ namespace OpenSim.Data.Tests
        public void T999_StillNull()
        {
            TestHelpers.InMethod();
-            
            // After all tests are run, these should still return no results
            Assert.That(db.getInventoryFolder(zero), Is.Null);
            Assert.That(db.getInventoryItem(zero), Is.Null);
diff --git a/OpenSim/Data/Tests/PropertyScrambler.cs b/OpenSim/Data/Tests/PropertyScrambler.cs
index e0f5862..0d291df 100644
--- a/OpenSim/Data/Tests/PropertyScrambler.cs
+++ b/OpenSim/Data/Tests/PropertyScrambler.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Data.Tests
    public class PropertyScrambler<T>
    {
        readonly System.Collections.Generic.List<string> membersToNotScramble = new List<string>();
-        
        private void AddExpressionToNotScrableList(Expression expression)
        {
            UnaryExpression unaryExpression = expression as UnaryExpression;
diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs
index 8d4249a..4f81594 100644
--- a/OpenSim/Data/Tests/RegionTests.cs
+++ b/OpenSim/Data/Tests/RegionTests.cs
@@ -39,6 +39,7 @@ using OpenSim.Tests.Common;
 using log4net;
 using System.Reflection;
 using System.Data.Common;
+using System.Threading;
 // DBMS-specific:
 using MySql.Data.MySqlClient;
@@ -82,7 +83,7 @@ namespace OpenSim.Data.Tests
        public UUID item3 = UUID.Random();
        public static Random random = new Random();
-        
        public string itemname1 = "item1";
        public uint localID = 1;
@@ -110,10 +111,10 @@ namespace OpenSim.Data.Tests
        private void ClearDB()
        {
-            string[] reg_tables = new string[] { 
+            string[] reg_tables = new string[] {
-                "prims", "primshapes", "primitems", "terrain", "land", "landaccesslist", "regionban", "regionsettings" 
+                "prims", "primshapes", "primitems", "terrain", "land", "landaccesslist", "regionban", "regionsettings"
            };
-            
            if (m_rebuildDB)
            {
                DropTables(reg_tables);
@@ -144,7 +145,7 @@ namespace OpenSim.Data.Tests
        public void T001_LoadEmpty()
        {
            TestHelpers.InMethod();
-            
            List<SceneObjectGroup> objs = db.LoadObjects(region1);
            List<SceneObjectGroup> objs3 = db.LoadObjects(region3);
            List<LandData> land = db.LoadLandObjects(region1);
@@ -153,21 +154,21 @@ namespace OpenSim.Data.Tests
            Assert.That(objs3.Count, Is.EqualTo(0), "Assert.That(objs3.Count, Is.EqualTo(0))");
            Assert.That(land.Count, Is.EqualTo(0), "Assert.That(land.Count, Is.EqualTo(0))");
        }
-        
        // SOG round trips
        //  * store objects, make sure they save
-        //  * update 
+        //  * update
        [Test]
        public void T010_StoreSimpleObject()
        {
            TestHelpers.InMethod();
-            
            SceneObjectGroup sog = NewSOG("object1", prim1, region1);
            SceneObjectGroup sog2 = NewSOG("object2", prim2, region1);
            // in case the objects don't store
-            try 
+            try
            {
                db.StoreObject(sog, region1);
            }
@@ -176,8 +177,8 @@ namespace OpenSim.Data.Tests
                m_log.Error(e.ToString());
                Assert.Fail();
            }
-                    
-            try 
+            try
            {
                db.StoreObject(sog2, region1);
            }
@@ -189,15 +190,15 @@ namespace OpenSim.Data.Tests
            // This tests the ADO.NET driver
            List<SceneObjectGroup> objs = db.LoadObjects(region1);
-            
            Assert.That(objs.Count, Is.EqualTo(2), "Assert.That(objs.Count, Is.EqualTo(2))");
        }
-        
        [Test]
        public void T011_ObjectNames()
        {
            TestHelpers.InMethod();
-            
            List<SceneObjectGroup> objs = db.LoadObjects(region1);
            foreach (SceneObjectGroup sog in objs)
            {
@@ -206,12 +207,12 @@ namespace OpenSim.Data.Tests
                Assert.That(p.Name, Is.EqualTo(p.Description), "Assert.That(p.Name, Is.EqualTo(p.Description))");
            }
        }
-        
        [Test]
        public void T012_SceneParts()
        {
            TestHelpers.InMethod();
-            
            UUID tmp0 = UUID.Random();
            UUID tmp1 = UUID.Random();
            UUID tmp2 = UUID.Random();
@@ -224,10 +225,10 @@ namespace OpenSim.Data.Tests
            sog.AddPart(p1);
            sog.AddPart(p2);
            sog.AddPart(p3);
-            
            SceneObjectPart[] parts = sog.Parts;
            Assert.That(parts.Length,Is.EqualTo(4), "Assert.That(parts.Length,Is.EqualTo(4))");
-            
            db.StoreObject(sog, newregion);
            List<SceneObjectGroup> sogs = db.LoadObjects(newregion);
            Assert.That(sogs.Count,Is.EqualTo(1), "Assert.That(sogs.Count,Is.EqualTo(1))");
@@ -235,18 +236,18 @@ namespace OpenSim.Data.Tests
            SceneObjectPart[] newparts = newsog.Parts;
            Assert.That(newparts.Length,Is.EqualTo(4), "Assert.That(newparts.Length,Is.EqualTo(4))");
-            
            Assert.That(newsog.ContainsPart(tmp0), "Assert.That(newsog.ContainsPart(tmp0))");
            Assert.That(newsog.ContainsPart(tmp1), "Assert.That(newsog.ContainsPart(tmp1))");
            Assert.That(newsog.ContainsPart(tmp2), "Assert.That(newsog.ContainsPart(tmp2))");
            Assert.That(newsog.ContainsPart(tmp3), "Assert.That(newsog.ContainsPart(tmp3))");
        }
-        
        [Test]
        public void T013_DatabasePersistency()
        {
            TestHelpers.InMethod();
-            
            // Sets all ScenePart parameters, stores and retrieves them, then check for consistency with initial data
            // The commented Asserts are the ones that are unchangeable (when storing on the database, their "Set" values are ignored
            // The ObjectFlags is an exception, if it is entered incorrectly, the object IS REJECTED on the database silently.
@@ -259,7 +260,7 @@ namespace OpenSim.Data.Tests
            uint localid = localID+1;
            localID = localID + 1;
            string name = "Adam  West";
-            byte material = (byte) random.Next(127);
+            byte material = (byte) random.Next((int)SOPMaterialData.MaxMaterial);
            ulong regionh = (ulong)random.NextDouble() * (ulong)random.Next();
            int pin = random.Next();
            Byte[] partsys = new byte[8];
@@ -297,7 +298,7 @@ namespace OpenSim.Data.Tests
            SceneObjectPart sop = new SceneObjectPart();
            SceneObjectGroup sog = new SceneObjectGroup(sop);
-            
            sop.RegionHandle = regionh;
            sop.UUID = uuid;
            sop.LocalId = localid;
@@ -359,10 +360,10 @@ namespace OpenSim.Data.Tests
            Assert.That(linknum,Is.EqualTo(sop.LinkNum), "Assert.That(linknum,Is.EqualTo(sop.LinkNum))");
            Assert.That(clickaction,Is.EqualTo(sop.ClickAction), "Assert.That(clickaction,Is.EqualTo(sop.ClickAction))");
            Assert.That(scale,Is.EqualTo(sop.Scale), "Assert.That(scale,Is.EqualTo(sop.Scale))");
-            
            // This is necessary or object will not be inserted in DB
            sop.Flags = PrimFlags.None;
-            
            // Inserts group in DB
            db.StoreObject(sog,region3);
            List<SceneObjectGroup> sogs = db.LoadObjects(region3);
@@ -371,7 +372,7 @@ namespace OpenSim.Data.Tests
            db.StoreObject(sog,region3);
            sogs = db.LoadObjects(region3);
            Assert.That(sogs.Count, Is.EqualTo(1), "Assert.That(sogs.Count, Is.EqualTo(1))");
-                
            // Tests if the parameters were inserted correctly
            SceneObjectPart p = sogs[0].RootPart;
@@ -413,12 +414,12 @@ namespace OpenSim.Data.Tests
            Assert.That(pbshap.ProfileEnd, Is.EqualTo(p.Shape.ProfileEnd), "Assert.That(pbshap.ProfileEnd, Is.EqualTo(p.Shape.ProfileEnd))");
            Assert.That(pbshap.ProfileHollow, Is.EqualTo(p.Shape.ProfileHollow), "Assert.That(pbshap.ProfileHollow, Is.EqualTo(p.Shape.ProfileHollow))");
        }
-        
        [Test]
        public void T014_UpdateObject()
        {
            TestHelpers.InMethod();
-            
            string text1 = "object1 text";
            SceneObjectGroup sog = FindSOG("object1", region1);
            sog.RootPart.Text = text1;
@@ -433,7 +434,7 @@ namespace OpenSim.Data.Tests
            TaskInventoryDictionary dic = new TaskInventoryDictionary();
            localID = localID + 1;
            string name = "West  Adam";
-            byte material = (byte) random.Next(127);
+            byte material = (byte) random.Next((int)SOPMaterialData.MaxMaterial);
            ulong regionh = (ulong)random.NextDouble() * (ulong)random.Next();
            int pin = random.Next();
            Byte[] partsys = new byte[8];
@@ -458,7 +459,7 @@ namespace OpenSim.Data.Tests
            PrimitiveBaseShape pbshap = new PrimitiveBaseShape();
            pbshap = PrimitiveBaseShape.Default;
            Vector3 scale = new Vector3(random.Next(),random.Next(),random.Next());
-            
            // Updates the region with new values
            SceneObjectGroup sog2 = FindSOG("Adam  West", region3);
            Assert.That(sog2,Is.Not.Null);
@@ -487,11 +488,11 @@ namespace OpenSim.Data.Tests
            sog2.RootPart.LinkNum = linknum;
            sog2.RootPart.ClickAction = clickaction;
            sog2.RootPart.Scale = scale;
-            
            db.StoreObject(sog2, region3);
            List<SceneObjectGroup> sogs = db.LoadObjects(region3);
            Assert.That(sogs.Count, Is.EqualTo(1), "Assert.That(sogs.Count, Is.EqualTo(1))");
-            
            SceneObjectGroup retsog = FindSOG("West  Adam", region3);
            Assert.That(retsog,Is.Not.Null);
            SceneObjectPart p = retsog.RootPart;
@@ -518,7 +519,7 @@ namespace OpenSim.Data.Tests
            Assert.That(clickaction,Is.EqualTo(p.ClickAction), "Assert.That(clickaction,Is.EqualTo(p.ClickAction))");
            Assert.That(scale,Is.EqualTo(p.Scale), "Assert.That(scale,Is.EqualTo(p.Scale))");
        }
-                
        /// <summary>
        /// Test storage and retrieval of a scene object with a large number of parts.
        /// </summary>
@@ -526,12 +527,12 @@ namespace OpenSim.Data.Tests
        public void T015_LargeSceneObjects()
        {
            TestHelpers.InMethod();
-            
            UUID id = UUID.Random();
            Dictionary<UUID, SceneObjectPart> mydic = new Dictionary<UUID, SceneObjectPart>();
            SceneObjectGroup sog = NewSOG("Test SOG", id, region4);
            mydic.Add(sog.RootPart.UUID,sog.RootPart);
-            for (int i = 0; i < 30; i++) 
+            for (int i = 0; i < 30; i++)
            {
                UUID tmp = UUID.Random();
                SceneObjectPart sop = NewSOP(("Test SOP " + i.ToString()),tmp);
@@ -541,20 +542,20 @@ namespace OpenSim.Data.Tests
                Vector3 velocity = new Vector3(random.Next(),random.Next(),random.Next());
                Vector3 angvelo = new Vector3(random.Next(),random.Next(),random.Next());
                Vector3 accel = new Vector3(random.Next(),random.Next(),random.Next());
-                
                sop.GroupPosition = groupos;
                sop.RotationOffset = rotoff;
                sop.OffsetPosition = offset;
                sop.Velocity = velocity;
                sop.AngularVelocity = angvelo;
                sop.Acceleration = accel;
-                
                mydic.Add(tmp,sop);
-                sog.AddPart(sop);                
+                sog.AddPart(sop);
            }
-            
            db.StoreObject(sog, region4);
-            
            SceneObjectGroup retsog = FindSOG("Test SOG", region4);
            SceneObjectPart[] parts = retsog.Parts;
            for (int i = 0; i < 30; i++)
@@ -573,7 +574,7 @@ namespace OpenSim.Data.Tests
        public void T016_RandomSogWithSceneParts()
        {
            TestHelpers.InMethod();
-            
            PropertyScrambler<SceneObjectPart> scrambler =
                new PropertyScrambler<SceneObjectPart>()
                    .DontScramble(x => x.UUID);
@@ -633,22 +634,22 @@ namespace OpenSim.Data.Tests
            SceneObjectGroup sog = FindSOG(name, region1);
            if (sog == null)
            {
-                sog = NewSOG(name, prim1, region1); 
+                sog = NewSOG(name, prim1, region1);
                db.StoreObject(sog, region1);
            }
            return sog;
        }
-        
        // NOTE: it is a bad practice to rely on some of the previous tests having been run before.
        // If the tests are run manually, one at a time, each starts with full class init (DB cleared).
        // Even when all tests are run, NUnit 2.5+ no longer guarantee a specific test order.
        // We shouldn't expect to find anything in the DB if we haven't put it there *in the same test*!
-        
        [Test]
        public void T020_PrimInventoryEmpty()
        {
            TestHelpers.InMethod();
-            
            SceneObjectGroup sog = GetMySOG("object1");
            TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, item1);
            Assert.That(t, Is.Null);
@@ -672,14 +673,14 @@ namespace OpenSim.Data.Tests
        public void T021_PrimInventoryBasic()
        {
            TestHelpers.InMethod();
-            
            SceneObjectGroup sog = GetMySOG("object1");
            InventoryItemBase i = NewItem(item1, zero, zero, itemname1, zero);
            Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, i, zero), Is.True);
            TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, item1);
            Assert.That(t.Name, Is.EqualTo(itemname1), "Assert.That(t.Name, Is.EqualTo(itemname1))");
-            
            StoreInventory(sog);
            SceneObjectGroup sog1 = FindSOG("object1", region1);
@@ -707,12 +708,12 @@ namespace OpenSim.Data.Tests
            t = sog.GetInventoryItem(sog.RootPart.LocalId, item1);
            Assert.That(t, Is.Null);
        }
-        
        [Test]
        public void T025_PrimInventoryPersistency()
        {
            TestHelpers.InMethod();
-            
            InventoryItemBase i = new InventoryItemBase();
            UUID id = UUID.Random();
            i.ID = id;
@@ -751,11 +752,11 @@ namespace OpenSim.Data.Tests
            i.Flags = flags;
            int creationd = random.Next();
            i.CreationDate = creationd;
-            
            SceneObjectGroup sog = GetMySOG("object1");
            Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, i, zero), Is.True);
            TaskInventoryItem t = sog.GetInventoryItem(sog.RootPart.LocalId, id);
-            
            Assert.That(t.Name, Is.EqualTo(name), "Assert.That(t.Name, Is.EqualTo(name))");
            Assert.That(t.AssetID,Is.EqualTo(assetid), "Assert.That(t.AssetID,Is.EqualTo(assetid))");
            Assert.That(t.BasePermissions,Is.EqualTo(baseperm), "Assert.That(t.BasePermissions,Is.EqualTo(baseperm))");
@@ -779,13 +780,13 @@ namespace OpenSim.Data.Tests
            Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID), "Assert.That(t.ParentID,Is.EqualTo(sog.RootPart.FolderID))");
            Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID), "Assert.That(t.ParentPartID,Is.EqualTo(sog.RootPart.UUID))");
        }
-        
        [Test]
        [ExpectedException(typeof(ArgumentException))]
        public void T026_PrimInventoryMany()
        {
            TestHelpers.InMethod();
-            
            UUID i1,i2,i3,i4;
            i1 = UUID.Random();
            i2 = UUID.Random();
@@ -795,14 +796,14 @@ namespace OpenSim.Data.Tests
            InventoryItemBase ib2 = NewItem(i2, zero, zero, RandomName(), zero);
            InventoryItemBase ib3 = NewItem(i3, zero, zero, RandomName(), zero);
            InventoryItemBase ib4 = NewItem(i4, zero, zero, RandomName(), zero);
-            
            SceneObjectGroup sog = FindSOG("object1", region1);
            Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, ib1, zero), Is.True);
            Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, ib2, zero), Is.True);
            Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, ib3, zero), Is.True);
            Assert.That(sog.AddInventoryItem(zero, sog.RootPart.LocalId, ib4, zero), Is.True);
-            
            TaskInventoryItem t1 = sog.GetInventoryItem(sog.RootPart.LocalId, i1);
            Assert.That(t1.Name, Is.EqualTo(ib1.Name), "Assert.That(t1.Name, Is.EqualTo(ib1.Name))");
            TaskInventoryItem t2 = sog.GetInventoryItem(sog.RootPart.LocalId, i2);
@@ -817,7 +818,7 @@ namespace OpenSim.Data.Tests
        public void T052_RemoveObject()
        {
            TestHelpers.InMethod();
-            
            db.RemoveObject(prim1, region1);
            SceneObjectGroup sog = FindSOG("object1", region1);
            Assert.That(sog, Is.Null);
@@ -827,7 +828,7 @@ namespace OpenSim.Data.Tests
        public void T100_DefaultRegionInfo()
        {
            TestHelpers.InMethod();
-            
            RegionSettings r1 = db.LoadRegionSettings(region1);
            Assert.That(r1.RegionUUID, Is.EqualTo(region1), "Assert.That(r1.RegionUUID, Is.EqualTo(region1))");
@@ -839,7 +840,7 @@ namespace OpenSim.Data.Tests
        public void T101_UpdateRegionInfo()
        {
            TestHelpers.InMethod();
-            
            int agentlimit = random.Next();
            double objectbonus = random.Next();
            int maturity = random.Next();
@@ -899,9 +900,9 @@ namespace OpenSim.Data.Tests
            r1.FixedSun = true;
            r1.SunPosition = sunpos;
            r1.Covenant = cov;
-            
            db.StoreRegionSettings(r1);
-            
            RegionSettings r1a = db.LoadRegionSettings(region1);
            Assert.That(r1a.RegionUUID, Is.EqualTo(region1), "Assert.That(r1a.RegionUUID, Is.EqualTo(region1))");
            Assert.That(r1a.BlockTerraform,Is.True);
@@ -938,14 +939,14 @@ namespace OpenSim.Data.Tests
            //Assert.That(r1a.TerrainImageID,Is.EqualTo(terimgid), "Assert.That(r1a.TerrainImageID,Is.EqualTo(terimgid))");
            Assert.That(r1a.FixedSun,Is.True);
            Assert.That(r1a.SunPosition, Is.EqualTo(sunpos), "Assert.That(r1a.SunPosition, Is.EqualTo(sunpos))");
-            Assert.That(r1a.Covenant, Is.EqualTo(cov), "Assert.That(r1a.Covenant, Is.EqualTo(cov))");            
+            Assert.That(r1a.Covenant, Is.EqualTo(cov), "Assert.That(r1a.Covenant, Is.EqualTo(cov))");
        }
        [Test]
        public void T300_NoTerrain()
        {
            TestHelpers.InMethod();
-            
            Assert.That(db.LoadTerrain(zero), Is.Null);
            Assert.That(db.LoadTerrain(region1), Is.Null);
            Assert.That(db.LoadTerrain(region2), Is.Null);
@@ -956,10 +957,13 @@ namespace OpenSim.Data.Tests
        public void T301_CreateTerrain()
        {
            TestHelpers.InMethod();
-            
            double[,] t1 = GenTerrain(height1);
            db.StoreTerrain(t1, region1);
-            
+            // store terrain is async
+            Thread.Sleep(1000);
            Assert.That(db.LoadTerrain(zero), Is.Null);
            Assert.That(db.LoadTerrain(region1), Is.Not.Null);
            Assert.That(db.LoadTerrain(region2), Is.Null);
@@ -970,7 +974,7 @@ namespace OpenSim.Data.Tests
        public void T302_FetchTerrain()
        {
            TestHelpers.InMethod();
-            
            double[,] baseterrain1 = GenTerrain(height1);
            double[,] baseterrain2 = GenTerrain(height2);
            double[,] t1 = db.LoadTerrain(region1);
@@ -982,11 +986,14 @@ namespace OpenSim.Data.Tests
        public void T303_UpdateTerrain()
        {
            TestHelpers.InMethod();
-            
            double[,] baseterrain1 = GenTerrain(height1);
            double[,] baseterrain2 = GenTerrain(height2);
            db.StoreTerrain(baseterrain2, region1);
+            // store terrain is async
+            Thread.Sleep(1000);
            double[,] t1 = db.LoadTerrain(region1);
            Assert.That(CompareTerrain(t1, baseterrain1), Is.False);
            Assert.That(CompareTerrain(t1, baseterrain2), Is.True);
@@ -996,7 +1003,7 @@ namespace OpenSim.Data.Tests
        public void T400_EmptyLand()
        {
            TestHelpers.InMethod();
-            
            Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(zero).Count, Is.EqualTo(0))");
            Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(region1).Count, Is.EqualTo(0))");
            Assert.That(db.LoadLandObjects(region2).Count, Is.EqualTo(0), "Assert.That(db.LoadLandObjects(region2).Count, Is.EqualTo(0))");
@@ -1018,15 +1025,15 @@ namespace OpenSim.Data.Tests
            for (int x = 0; x < Constants.RegionSize; x++)
                for (int y = 0; y < Constants.RegionSize; y++)
                    terret[x,y] = value;
-            
            return terret;
        }
-        
        private bool CompareTerrain(double[,] one, double[,] two)
        {
            for (int x = 0; x < Constants.RegionSize; x++)
                for (int y = 0; y < Constants.RegionSize; y++)
-                    if (one[x,y] != two[x,y]) 
+                    if (one[x,y] != two[x,y])
                        return false;
            return true;
@@ -1046,12 +1053,12 @@ namespace OpenSim.Data.Tests
        // common failure case is people adding new fields that aren't
        // initialized, but have non-null db constraints.  We should
        // honestly be passing more and more null things in here.
-        // 
+        //
-        // Please note that in Sqlite.BuildPrim there is a commented out inline version 
+        // Please note that in Sqlite.BuildPrim there is a commented out inline version
        // of this so you can debug and step through the build process and check the fields
-        // 
+        //
        // Real World Value: Tests for situation where extending a SceneObjectGroup/SceneObjectPart
-        //                   causes the application to crash at the database layer because of null values 
+        //                   causes the application to crash at the database layer because of null values
        //                   in NOT NULL fields
        //
        private SceneObjectGroup NewSOG(string name, UUID uuid, UUID regionId)
@@ -1075,7 +1082,7 @@ namespace OpenSim.Data.Tests
            return sog;
        }
-        
        private SceneObjectPart NewSOP(string name, UUID uuid)
        {
            SceneObjectPart sop = new SceneObjectPart();
@@ -1089,7 +1096,7 @@ namespace OpenSim.Data.Tests
            return sop;
        }
-        // These are copied from the Inventory Item tests 
+        // These are copied from the Inventory Item tests
        private InventoryItemBase NewItem(UUID id, UUID parent, UUID owner, string name, UUID asset)
        {
@@ -1107,7 +1114,7 @@ namespace OpenSim.Data.Tests
        private static string RandomName()
        {
            StringBuilder name = new StringBuilder();
-            int size = random.Next(5,12); 
+            int size = random.Next(5,12);
            char ch ;
            for (int i=0; i<size; i++)
            {
diff --git a/OpenSim/Data/Tests/Resources/TestDataConnections.ini b/OpenSim/Data/Tests/Resources/TestDataConnections.ini
index 75f7855..7b55467 100644
--- a/OpenSim/Data/Tests/Resources/TestDataConnections.ini
+++ b/OpenSim/Data/Tests/Resources/TestDataConnections.ini
@@ -16,9 +16,9 @@
 ; file for the DB.  If you want the resulting DB to persist (e.g. for performance testing,
 ; when filling up the tables can take a long time), explicitly specify a conn string like this: 
-; SqliteConnection="URI=file:../db/<path_to_your_file>,version=3"
+; SqliteConnection="URI=file:<path_to_your_file>,version=3"
 [TestConnections]
 MySqlConnection="Server=localhost;Port=3306;Database=opensim-nunit;User ID=opensim-nunit;Password=opensim-nunit;"
 SqlConnection="Server=.\SQL2008;Database=opensim-nunit;Trusted_Connection=True;"
-SqliteConnection="URI=file:../db/opensim-nunit.db,version=3"
-\ No newline at end of file
+SqliteConnection="URI=file:opensim-nunit.db,version=3"
+\ No newline at end of file