17 files changed, 637 insertions, 367 deletions
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 26cdd06..0865083 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -168,6 +168,7 @@ namespace OpenSim.Data.MySQL
                            }
                            asset.Name = (string) dbReader["name"];
                            asset.Type = (sbyte) dbReader["assetType"];
+                            asset.Temporary = (bool)dbReader["temporary"];
                        }
                        dbReader.Close();
                        cmd.Dispose();
@@ -195,18 +196,11 @@ namespace OpenSim.Data.MySQL
        {
            lock (_dbConnection)
            {
-                //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID);
-                if (ExistsAsset(asset.FullID))
-                {
-                    //m_log.Info("[ASSET DB]: Asset exists already, ignoring.");
-                    return;
-                }
                _dbConnection.CheckConnection();
                MySqlCommand cmd =
                    new MySqlCommand(
-                        "insert INTO assets(id, name, description, assetType, local, temporary, create_time, access_time, data)" +
+                        "replace INTO assets(id, name, description, assetType, local, temporary, create_time, access_time, data)" +
                        "VALUES(?id, ?name, ?description, ?assetType, ?local, ?temporary, ?create_time, ?access_time, ?data)",
                        _dbConnection.Connection);
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index a4b8663..4521a0f 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -342,7 +342,7 @@ namespace OpenSim.Data.MySQL
                item.EveryOnePermissions = (uint) reader["inventoryEveryOnePermissions"];
                item.GroupPermissions = (uint) reader["inventoryGroupPermissions"];
                item.SalePrice = (int) reader["salePrice"];
-                item.SaleType = Convert.ToByte(reader["saleType"]);
+                item.SaleType = unchecked((byte)(Convert.ToSByte(reader["saleType"])));
                item.CreationDate = (int) reader["creationDate"];
                item.GroupOwned = Convert.ToBoolean(reader["groupOwned"]);
                item.Flags = (uint) reader["flags"];
@@ -423,7 +423,7 @@ namespace OpenSim.Data.MySQL
        /// <summary>
        /// Returns a specified inventory folder
        /// </summary>
-        /// <param name="folder">The folder to return</param>
+        /// <param name="folderID">The folder to return</param>
        /// <returns>A folder class</returns>
        public InventoryFolderBase getInventoryFolder(UUID folderID)
        {
@@ -438,8 +438,9 @@ namespace OpenSim.Data.MySQL
                    result.Parameters.AddWithValue("?uuid", folderID.ToString());
                    MySqlDataReader reader = result.ExecuteReader();
-                    reader.Read();
+                    InventoryFolderBase folder = null;
-                    InventoryFolderBase folder = readInventoryFolder(reader);
+                    if (reader.Read())
+                         folder = readInventoryFolder(reader);
                    reader.Close();
                    result.Dispose();
@@ -506,7 +507,7 @@ namespace OpenSim.Data.MySQL
                result.Parameters.AddWithValue("?inventoryEveryOnePermissions", item.EveryOnePermissions);
                result.Parameters.AddWithValue("?inventoryGroupPermissions", item.GroupPermissions);
                result.Parameters.AddWithValue("?salePrice", item.SalePrice);
-                result.Parameters.AddWithValue("?saleType", item.SaleType);
+                result.Parameters.AddWithValue("?saleType", unchecked((sbyte)item.SaleType));
                result.Parameters.AddWithValue("?creationDate", item.CreationDate);
                result.Parameters.AddWithValue("?groupID", item.GroupID);
                result.Parameters.AddWithValue("?groupOwned", item.GroupOwned);
@@ -603,7 +604,7 @@ namespace OpenSim.Data.MySQL
            cmd.Parameters.AddWithValue("?agentID", folder.Owner.ToString());
            cmd.Parameters.AddWithValue("?parentFolderID", folder.ParentID.ToString());
            cmd.Parameters.AddWithValue("?folderName", folderName);
-            cmd.Parameters.AddWithValue("?type", (short) folder.Type);
+            cmd.Parameters.AddWithValue("?type", folder.Type);
            cmd.Parameters.AddWithValue("?version", folder.Version);
            try
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index 2166845..9c2ee4a 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -834,7 +834,10 @@ namespace OpenSim.Data.MySQL
            // explicit conversion of integers is required, which sort
            // of sucks.  No idea if there is a shortcut here or not.
            prim.CreationDate = Convert.ToInt32(row["CreationDate"]);
-            prim.Name = (String) row["Name"];
+            if (row["Name"] != DBNull.Value)
+                prim.Name = (String)row["Name"];
+            else
+                prim.Name = string.Empty;
            // various text fields
            prim.Text = (String) row["Text"];
            prim.Color = Color.FromArgb(Convert.ToInt32(row["ColorA"]),
@@ -945,12 +948,12 @@ namespace OpenSim.Data.MySQL
                prim.DIE_AT_EDGE = true;
            prim.SalePrice = Convert.ToInt32(row["SalePrice"]);
-            prim.ObjectSaleType = Convert.ToByte(row["SaleType"]);
+            prim.ObjectSaleType = unchecked((byte)Convert.ToSByte(row["SaleType"]));
-            prim.Material = Convert.ToByte(row["Material"]);
+            prim.Material = unchecked((byte)Convert.ToSByte(row["Material"]));
            if (!(row["ClickAction"] is DBNull))
-                prim.ClickAction = (byte)Convert.ToByte(row["ClickAction"]);
+                prim.ClickAction = unchecked((byte)Convert.ToSByte(row["ClickAction"]));
            prim.CollisionSound = new UUID(row["CollisionSound"].ToString());
            prim.CollisionSoundVolume = Convert.ToSingle(row["CollisionSoundVolume"]);
@@ -1277,12 +1280,12 @@ namespace OpenSim.Data.MySQL
                cmd.Parameters.AddWithValue("DieAtEdge", 0);
            cmd.Parameters.AddWithValue("SalePrice", prim.SalePrice);
-            cmd.Parameters.AddWithValue("SaleType", Convert.ToInt16(prim.ObjectSaleType));
+            cmd.Parameters.AddWithValue("SaleType", unchecked((sbyte)(prim.ObjectSaleType)));
            byte clickAction = prim.ClickAction;
-            cmd.Parameters.AddWithValue("ClickAction", clickAction);
+            cmd.Parameters.AddWithValue("ClickAction", unchecked((sbyte)(clickAction)));
-            cmd.Parameters.AddWithValue("Material", prim.Material);
+            cmd.Parameters.AddWithValue("Material", unchecked((sbyte)(prim.Material)));
            cmd.Parameters.AddWithValue("CollisionSound", prim.CollisionSound.ToString());
            cmd.Parameters.AddWithValue("CollisionSoundVolume", prim.CollisionSoundVolume);
diff --git a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
index 7c36375..d1d5c2a 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLGridTest.cs
@@ -62,11 +62,18 @@ namespace OpenSim.Data.MySQL.Tests
                m_log.Error("Exception {0}", e);
                Assert.Ignore();
            }
+            // This actually does the roll forward assembly stuff
+            Assembly assem = GetType().Assembly;
+            Migration m = new Migration(database.Connection, assem, "GridStore");
+            m.Update();
        }
        [TestFixtureTearDown]
        public void Cleanup()
        {
+            m_log.Warn("Cleaning up.");
            if (db != null)
            {
                db.Dispose();
@@ -74,6 +81,7 @@ namespace OpenSim.Data.MySQL.Tests
            // if a new table is added, it has to be dropped here
            if (database != null)
            {
+                database.ExecuteSql("drop table migrations");
                database.ExecuteSql("drop table regions");
            }
        }
diff --git a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
index 23c1ec5..a3a32dc 100644
--- a/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
+++ b/OpenSim/Data/MySQL/Tests/MySQLInventoryTest.cs
@@ -53,6 +53,7 @@ namespace OpenSim.Data.MySQL.Tests
            try 
            {
                database = new MySQLManager(connect);
+                DropTables();
                db = new MySQLInventoryData();
                db.Initialise(connect);
            } 
@@ -72,10 +73,15 @@ namespace OpenSim.Data.MySQL.Tests
            }
            if (database != null)
            {
-                database.ExecuteSql("drop table inventoryitems");
+                DropTables();
-                database.ExecuteSql("drop table inventoryfolders");
-                database.ExecuteSql("drop table migrations");
            }
        }
+        private void DropTables()
+        {
+            database.ExecuteSql("drop table IF EXISTS inventoryitems");
+            database.ExecuteSql("drop table IF EXISTS inventoryfolders");
+            database.ExecuteSql("drop table IF EXISTS migrations");
+        }
    }
 }
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index b09c1c9..72af7a0 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -183,7 +183,7 @@ namespace OpenSim.Data.SQLite
            int assetLength = (asset.Data != null) ? asset.Data.Length : 0;
            m_log.Info("[ASSET DB]: " +
-                                     string.Format("Loaded {6} {5} Asset: [{0}][{3}] \"{1}\":{2} ({7} bytes)",
+                                     string.Format("Loaded {5} {4} Asset: [{0}][{3}] \"{1}\":{2} ({6} bytes)",
                                                   asset.FullID, asset.Name, asset.Description, asset.Type,
                                                   temporary, local, assetLength));
        }
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index 97c40ba..e5f7a50 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -301,7 +301,8 @@ namespace OpenSim.Data.SQLite
                DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
                inventoryRow = inventoryFolderTable.Rows.Find(item.Folder.ToString());
-                inventoryRow["version"] = (int)inventoryRow["version"] + 1;
+                if (inventoryRow != null) //MySQL doesn't throw an exception here, so sqlite shouldn't either.
+                    inventoryRow["version"] = (int)inventoryRow["version"] + 1;
                invFoldersDa.Update(ds, "inventoryfolders");
            }
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index d2548c2..0259ac5 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -307,26 +307,21 @@ namespace OpenSim.Data.SQLite
        /// <param name="regionUUID">the region UUID</param>
        public void StoreObject(SceneObjectGroup obj, UUID regionUUID)
        {
+            uint flags = obj.RootPart.GetEffectiveObjectFlags();
+            // Eligibility check
+            //
+            if ((flags & (uint)PrimFlags.Temporary) != 0)
+                return;
+            if ((flags & (uint)PrimFlags.TemporaryOnRez) != 0)
+                return;
            lock (ds)
            {
                foreach (SceneObjectPart prim in obj.Children.Values)
                {
-                    if ((prim.GetEffectiveObjectFlags() & (uint)PrimFlags.Temporary) == 0
+                    m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
-                        && (prim.GetEffectiveObjectFlags() & (uint)PrimFlags.TemporaryOnRez) == 0)
+                    addPrim(prim, obj.UUID, regionUUID);
-                    {
-                        m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
-                        addPrim(prim, obj.UUID, regionUUID);
-                    }
-                    else if (prim.Stopped)
-                    {
-                        //m_log.Info("[DATASTORE]: " +
-                                                 //"Adding stopped obj: " + obj.UUID + " to region: " + regionUUID);
-                        //addPrim(prim, obj.UUID.ToString(), regionUUID.ToString());
-                    }
-                    else
-                    {
-                        // m_log.Info("[DATASTORE]: Ignoring Physical obj: " + obj.UUID + " in region: " + regionUUID);
-                    }
                }
            }
@@ -1130,7 +1125,7 @@ namespace OpenSim.Data.SQLite
            // explicit conversion of integers is required, which sort
            // of sucks.  No idea if there is a shortcut here or not.
            prim.CreationDate = Convert.ToInt32(row["CreationDate"]);
-            prim.Name = (String) row["Name"];
+            prim.Name = row["Name"] == DBNull.Value ? string.Empty : (string)row["Name"];
            // various text fields
            prim.Text = (String) row["Text"];
            prim.Color = Color.FromArgb(Convert.ToInt32(row["ColorA"]),
diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs
index e85a6a7..09131c1 100644
--- a/OpenSim/Data/Tests/BasicAssetTest.cs
+++ b/OpenSim/Data/Tests/BasicAssetTest.cs
@@ -26,20 +26,19 @@
 */
 using System;
+using System.Collections.Generic;
 using log4net.Config;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
 using OpenSim.Framework;
 using log4net;
-using System.Reflection;
 namespace OpenSim.Data.Tests
 {
    public class BasicAssetTest
    {
-        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        public IAssetDataPlugin db;
-        public AssetDataBase db;
        public UUID uuid1;
        public UUID uuid2;
        public UUID uuid3;
@@ -47,14 +46,7 @@ namespace OpenSim.Data.Tests
        public void SuperInit()
        {
-            try
+            OpenSim.Tests.Common.TestLogging.LogToConsole();
-            {
-                XmlConfigurator.Configure();
-            }
-            catch (Exception)
-            {
-                // I don't care, just leave log4net off
-            }
            uuid1 = UUID.Random();
            uuid2 = UUID.Random();
@@ -81,41 +73,59 @@ namespace OpenSim.Data.Tests
            a2.Data = asset1;
            a3.Data = asset1;
+            PropertyScrambler<AssetBase> scrambler = new PropertyScrambler<AssetBase>()
+                .DontScramble(x => x.Data)
+                .DontScramble(x => x.ID)
+                .DontScramble(x => x.FullID)
+                .DontScramble(x => x.Metadata.ID)
+                .DontScramble(x => x.Metadata.FullID);
+            scrambler.Scramble(a1);
+            scrambler.Scramble(a2);
+            scrambler.Scramble(a3);
            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.ID, Is.EqualTo(a1a.ID))");
+            Assert.That(a1a, Constraints.PropertyCompareConstraint(a1));
-            Assert.That(a1.Name, Is.EqualTo(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.ID, Is.EqualTo(a2a.ID))");
+            Assert.That(a2a, Constraints.PropertyCompareConstraint(a2));
-            Assert.That(a2.Name, Is.EqualTo(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.ID, Is.EqualTo(a3a.ID))");
+            Assert.That(a3a, Constraints.PropertyCompareConstraint(a3));
-            Assert.That(a3.Name, Is.EqualTo(a3a.Name), "Assert.That(a3.Name, Is.EqualTo(a3a.Name))");
-        }
+            scrambler.Scramble(a1a);
+            scrambler.Scramble(a2a);
+            scrambler.Scramble(a3a);
+            db.UpdateAsset(a1a);
+            db.UpdateAsset(a2a);
+            db.UpdateAsset(a3a);
+            AssetBase a1b = db.FetchAsset(uuid1);
+            Assert.That(a1b, Constraints.PropertyCompareConstraint(a1a));
+            AssetBase a2b = db.FetchAsset(uuid2);
+            Assert.That(a2b, Constraints.PropertyCompareConstraint(a2a));
+            AssetBase a3b = db.FetchAsset(uuid3);
+            Assert.That(a3b, Constraints.PropertyCompareConstraint(a3a));
-        [Test]
-        public void T011_ExistsSimpleAsset()
-        {
            Assert.That(db.ExistsAsset(uuid1), Is.True);
            Assert.That(db.ExistsAsset(uuid2), Is.True);
            Assert.That(db.ExistsAsset(uuid3), Is.True);
-        }
-        // this has questionable use, but it is in the interface at the moment.
+            List<AssetMetadata> metadatas = db.FetchAssetMetadataSet(0, 1000);
-        // [Test]
-        // public void T012_DeleteAsset()
+            AssetMetadata metadata = metadatas.Find(x => x.FullID == uuid1);
-        // {
+            Assert.That(metadata.Name, Is.EqualTo(a1b.Name));
-        //     db.DeleteAsset(uuid1);
+            Assert.That(metadata.Description, Is.EqualTo(a1b.Description));
-        //     db.DeleteAsset(uuid2);
+            Assert.That(metadata.Type, Is.EqualTo(a1b.Type));
-        //     db.DeleteAsset(uuid3);
+            Assert.That(metadata.Temporary, Is.EqualTo(a1b.Temporary));
-        //     Assert.That(db.ExistsAsset(uuid1), Is.False);
+            Assert.That(metadata.FullID, Is.EqualTo(a1b.FullID));
-        //     Assert.That(db.ExistsAsset(uuid2), Is.False);
+        }
-        //     Assert.That(db.ExistsAsset(uuid3), Is.False);
-        // }
    }
 }
diff --git a/OpenSim/Data/Tests/BasicEstateTest.cs b/OpenSim/Data/Tests/BasicEstateTest.cs
index a0266b3..284d066 100644
--- a/OpenSim/Data/Tests/BasicEstateTest.cs
+++ b/OpenSim/Data/Tests/BasicEstateTest.cs
@@ -40,7 +40,6 @@ namespace OpenSim.Data.Tests
 {
    public class BasicEstateTest
    {
-        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        public IEstateDataStore db;
        public IRegionDataStore regionDb;
@@ -57,14 +56,7 @@ namespace OpenSim.Data.Tests
        public void SuperInit()
        {
-            try
+            OpenSim.Tests.Common.TestLogging.LogToConsole();
-            {
-                XmlConfigurator.Configure();
-            }
-            catch (Exception)
-            {
-                // I don't care, just leave log4net off
-            }
        }
        #region 0Tests
@@ -163,6 +155,24 @@ namespace OpenSim.Data.Tests
        }
        [Test]
+        private void T012_EstateSettingsRandomStorage()
+        {
+            // Letting estate store generate rows to database for us
+            EstateSettings originalSettings = db.LoadEstateSettings(REGION_ID);
+            new PropertyScrambler<EstateSettings>().Scramble(originalSettings);
+            // Saving settings.
+            db.StoreEstateSettings(originalSettings);
+            // Loading settings to another instance variable.
+            EstateSettings loadedSettings = db.LoadEstateSettings(REGION_ID);
+            // Checking that loaded values are correct.
+            Assert.That(loadedSettings, Constraints.PropertyCompareConstraint(originalSettings));
+        }
+        [Test]
        public void T020_EstateSettingsManagerList()
        {
            // Letting estate store generate rows to database for us
diff --git a/OpenSim/Data/Tests/BasicGridTest.cs b/OpenSim/Data/Tests/BasicGridTest.cs
index 85273c5..de8fb48 100644
--- a/OpenSim/Data/Tests/BasicGridTest.cs
+++ b/OpenSim/Data/Tests/BasicGridTest.cs
@@ -28,81 +28,47 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using log4net.Config;
 using NUnit.Framework;
 using NUnit.Framework.SyntaxHelpers;
 using OpenMetaverse;
-using log4net;
-using System.Reflection;
 namespace OpenSim.Data.Tests
 {
    public class BasicGridTest
    {
-        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        public IGridDataPlugin db;
-        public GridDataBase db;
        public UUID region1, region2, region3;
        public UUID zero = UUID.Zero;
-        public static Random random;
+        public static Random random = new Random();
        [TearDown]
        public void removeAllRegions()
        {
            // Clean up all the regions.
-            foreach (RegionProfileData region in db.GetRegionsByName("", 100))
+            List<RegionProfileData> regions = db.GetRegionsByName("", 100);
+            if (regions != null)
            {
-                db.DeleteProfile(region.Uuid.ToString());
+                foreach (RegionProfileData region in regions)
+                {
+                    db.DeleteProfile(region.Uuid.ToString());
+                }
            }
        }
        public void SuperInit()
        {
-            try
+            OpenSim.Tests.Common.TestLogging.LogToConsole();
-            {
-                XmlConfigurator.Configure();
-            }
-            catch (Exception)
-            {
-                // I don't care, just leave log4net off
-            }
            region1 = UUID.Random();
            region2 = UUID.Random();
            region3 = UUID.Random();
-            random = new Random();
        }
        protected RegionProfileData createRegion(UUID regionUUID, string regionName)
        {
            RegionProfileData reg = new RegionProfileData();
+            new PropertyScrambler<RegionProfileData>().Scramble(reg);
            reg.Uuid = regionUUID;
            reg.RegionName = regionName;
-            reg.RegionHandle = (ulong) random.Next();
-            reg.RegionLocX = (uint) random.Next();
-            reg.RegionLocY = (uint) random.Next();
-            reg.RegionLocZ = (uint) random.Next();
-            reg.RegionSendKey = RandomName();
-            reg.RegionRecvKey = RandomName();
-            reg.RegionSecret = RandomName();
-            reg.RegionOnline = false;
-            reg.ServerIP = RandomName();
-            reg.ServerPort = (uint) random.Next();
-            reg.ServerURI = RandomName();
-            reg.ServerHttpPort = (uint) random.Next();
-            reg.ServerRemotingPort = (uint) random.Next();
-            reg.NorthOverrideHandle = (ulong) random.Next();
-            reg.SouthOverrideHandle = (ulong) random.Next();
-            reg.EastOverrideHandle = (ulong) random.Next();
-            reg.WestOverrideHandle = (ulong) random.Next();
-            reg.RegionDataURI = RandomName();
-            reg.RegionAssetURI = RandomName();
-            reg.RegionAssetSendKey = RandomName();
-            reg.RegionAssetRecvKey = RandomName();
-            reg.RegionUserURI = RandomName();
-            reg.RegionUserSendKey = RandomName();
-            reg.RegionUserRecvKey = RandomName();
-            reg.RegionMapTextureID = UUID.Random();
-            reg.Owner_uuid = UUID.Random();
-            reg.OriginUUID = UUID.Random();
            db.AddProfile(reg);
@@ -119,47 +85,12 @@ namespace OpenSim.Data.Tests
        }
        [Test]
-        public void T999_StillNull()
-        {
-            Assert.That(db.GetProfileByUUID(zero),Is.Null);
-        }
-        [Test]
        public void T011_AddRetrieveCompleteTest()
        {
            RegionProfileData newreg = createRegion(region2, "|<Goth@m Ci1y>|");
            RegionProfileData retreg = db.GetProfileByUUID(region2);
-            Assert.That(retreg.RegionName, Is.EqualTo(newreg.RegionName), "Assert.That(retreg.RegionName, Is.EqualTo(newreg.RegionName))");
+            Assert.That(retreg, Constraints.PropertyCompareConstraint(newreg).IgnoreProperty(x => x.RegionOnline));
-            Assert.That(retreg.Uuid, Is.EqualTo(region2), "Assert.That(retreg.Uuid, Is.EqualTo(region2))");
-            Assert.That(retreg.RegionHandle, Is.EqualTo(newreg.RegionHandle), "Assert.That(retreg.RegionHandle, Is.EqualTo(newreg.RegionHandle))");
-            Assert.That(retreg.RegionLocX, Is.EqualTo(newreg.RegionLocX), "Assert.That(retreg.RegionLocX, Is.EqualTo(newreg.RegionLocX))");
-            Assert.That(retreg.RegionLocY, Is.EqualTo(newreg.RegionLocY), "Assert.That(retreg.RegionLocY, Is.EqualTo(newreg.RegionLocY))");
-            Assert.That(retreg.RegionLocZ, Is.EqualTo(newreg.RegionLocZ), "Assert.That(retreg.RegionLocZ, Is.EqualTo(newreg.RegionLocZ))");
-            Assert.That(retreg.RegionSendKey, Is.EqualTo(newreg.RegionSendKey), "Assert.That(retreg.RegionSendKey, Is.EqualTo(newreg.RegionSendKey))");
-            Assert.That(retreg.RegionRecvKey, Is.EqualTo(newreg.RegionRecvKey), "Assert.That(retreg.RegionRecvKey, Is.EqualTo(newreg.RegionRecvKey))");
-            Assert.That(retreg.RegionSecret, Is.EqualTo(newreg.RegionSecret), "Assert.That(retreg.RegionSecret, Is.EqualTo(newreg.RegionSecret))");
-            Assert.That(retreg.RegionOnline, Is.EqualTo(newreg.RegionOnline), "Assert.That(retreg.RegionOnline, Is.EqualTo(newreg.RegionOnline))");
-            Assert.That(retreg.OriginUUID, Is.EqualTo(newreg.OriginUUID), "Assert.That(retreg.OriginUUID, Is.EqualTo(newreg.OriginUUID))");
-            Assert.That(retreg.ServerIP, Is.EqualTo(newreg.ServerIP), "Assert.That(retreg.ServerIP, Is.EqualTo(newreg.ServerIP))");
-            Assert.That(retreg.ServerPort, Is.EqualTo(newreg.ServerPort), "Assert.That(retreg.ServerPort, Is.EqualTo(newreg.ServerPort))");
-            Assert.That(retreg.ServerURI, Is.EqualTo(newreg.ServerURI), "Assert.That(retreg.ServerURI, Is.EqualTo(newreg.ServerURI))");
-            Assert.That(retreg.ServerHttpPort, Is.EqualTo(newreg.ServerHttpPort), "Assert.That(retreg.ServerHttpPort, Is.EqualTo(newreg.ServerHttpPort))");
-            Assert.That(retreg.ServerRemotingPort, Is.EqualTo(newreg.ServerRemotingPort), "Assert.That(retreg.ServerRemotingPort, Is.EqualTo(newreg.ServerRemotingPort))");
-            Assert.That(retreg.NorthOverrideHandle, Is.EqualTo(newreg.NorthOverrideHandle), "Assert.That(retreg.NorthOverrideHandle, Is.EqualTo(newreg.NorthOverrideHandle))");
-            Assert.That(retreg.SouthOverrideHandle, Is.EqualTo(newreg.SouthOverrideHandle), "Assert.That(retreg.SouthOverrideHandle, Is.EqualTo(newreg.SouthOverrideHandle))");
-            Assert.That(retreg.EastOverrideHandle, Is.EqualTo(newreg.EastOverrideHandle), "Assert.That(retreg.EastOverrideHandle, Is.EqualTo(newreg.EastOverrideHandle))");
-            Assert.That(retreg.WestOverrideHandle, Is.EqualTo(newreg.WestOverrideHandle), "Assert.That(retreg.WestOverrideHandle, Is.EqualTo(newreg.WestOverrideHandle))");
-            Assert.That(retreg.RegionDataURI, Is.EqualTo(newreg.RegionDataURI), "Assert.That(retreg.RegionDataURI, Is.EqualTo(newreg.RegionDataURI))");
-            Assert.That(retreg.RegionAssetURI, Is.EqualTo(newreg.RegionAssetURI), "Assert.That(retreg.RegionAssetURI, Is.EqualTo(newreg.RegionAssetURI))");
-            Assert.That(retreg.RegionAssetSendKey, Is.EqualTo(newreg.RegionAssetSendKey), "Assert.That(retreg.RegionAssetSendKey, Is.EqualTo(newreg.RegionAssetSendKey))");
-            Assert.That(retreg.RegionAssetRecvKey, Is.EqualTo(newreg.RegionAssetRecvKey), "Assert.That(retreg.RegionAssetRecvKey, Is.EqualTo(newreg.RegionAssetRecvKey))");
-            Assert.That(retreg.RegionUserURI, Is.EqualTo(newreg.RegionUserURI), "Assert.That(retreg.RegionUserURI, Is.EqualTo(newreg.RegionUserURI))");
-            Assert.That(retreg.RegionUserSendKey, Is.EqualTo(newreg.RegionUserSendKey), "Assert.That(retreg.RegionUserSendKey, Is.EqualTo(newreg.RegionUserSendKey))");
-            Assert.That(retreg.RegionUserRecvKey, Is.EqualTo(newreg.RegionUserRecvKey), "Assert.That(retreg.RegionUserRecvKey, Is.EqualTo(newreg.RegionUserRecvKey))");
-            Assert.That(retreg.RegionMapTextureID, Is.EqualTo(newreg.RegionMapTextureID), "Assert.That(retreg.RegionMapTextureID, Is.EqualTo(newreg.RegionMapTextureID))");
-            Assert.That(retreg.Owner_uuid, Is.EqualTo(newreg.Owner_uuid), "Assert.That(retreg.Owner_uuid, Is.EqualTo(newreg.Owner_uuid))");
-            Assert.That(retreg.OriginUUID, Is.EqualTo(newreg.OriginUUID), "Assert.That(retreg.OriginUUID, Is.EqualTo(newreg.OriginUUID))");
            retreg = db.GetProfileByHandle(newreg.RegionHandle);
            Assert.That(retreg.Uuid, Is.EqualTo(region2), "Assert.That(retreg.Uuid, Is.EqualTo(region2))");
@@ -220,6 +151,12 @@ namespace OpenSim.Data.Tests
            Assert.That(listreg[1].Uuid, Is.EqualTo(region1) | Is.EqualTo(region2), "Assert.That(listreg[1].Uuid, Is.EqualTo(region1) | Is.EqualTo(region2))");
        }
+        [Test]
+        public void T999_StillNull()
+        {
+            Assert.That(db.GetProfileByUUID(zero), Is.Null);
+        }
        protected static string RandomName()
        {
            StringBuilder name = new StringBuilder();
diff --git a/OpenSim/Data/Tests/BasicInventoryTest.cs b/OpenSim/Data/Tests/BasicInventoryTest.cs
index e13ed89..900186b 100644
--- a/OpenSim/Data/Tests/BasicInventoryTest.cs
+++ b/OpenSim/Data/Tests/BasicInventoryTest.cs
@@ -66,14 +66,7 @@ namespace OpenSim.Data.Tests
        public void SuperInit()
        {
-            try
+            OpenSim.Tests.Common.TestLogging.LogToConsole();
-            {
-                XmlConfigurator.Configure();
-            }
-            catch (Exception)
-            {
-                // I don't care, just leave log4net off
-            }
            folder1 = UUID.Random();
            folder2 = UUID.Random();
@@ -115,16 +108,6 @@ namespace OpenSim.Data.Tests
            Assert.That(db.getUserRootFolder(owner1), Is.Null);
        }
-        [Test]
-        public void T999_StillNull()
-        {
-            // 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);
-            Assert.That(db.getUserRootFolder(zero), Is.Null);
-            Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0))");
-        }
        // 01x - folder tests
        [Test]
        public void T010_FolderNonParent()
@@ -248,7 +231,7 @@ namespace OpenSim.Data.Tests
        }
        [Test]
-        public void T103UpdateItem()
+        public void T103_UpdateItem()
        {
            // TODO: probably shouldn't have the ability to have an
            // owner of an item in a folder not owned by the user
@@ -265,6 +248,71 @@ namespace OpenSim.Data.Tests
            Assert.That(i1.Owner, Is.EqualTo(owner2), "Assert.That(i1.Owner, Is.EqualTo(owner2))");
        }
+        [Test]
+        public void T104_RandomUpdateItem()
+        {
+            PropertyScrambler<InventoryFolderBase> folderScrambler =
+                new PropertyScrambler<InventoryFolderBase>()
+                    .DontScramble(x => x.Owner)
+                    .DontScramble(x => x.ParentID)
+                    .DontScramble(x => x.ID);
+            UUID owner = UUID.Random();
+            UUID folder = UUID.Random();
+            UUID rootId = UUID.Random();
+            UUID rootAsset = UUID.Random();
+            InventoryFolderBase f1 = NewFolder(folder, zero, owner, name1);
+            folderScrambler.Scramble(f1);
+            db.addInventoryFolder(f1);
+            InventoryFolderBase f1a = db.getUserRootFolder(owner);
+            Assert.That(f1a, Constraints.PropertyCompareConstraint(f1));
+            folderScrambler.Scramble(f1a);
+            db.updateInventoryFolder(f1a);
+            InventoryFolderBase f1b = db.getUserRootFolder(owner);
+            Assert.That(f1b, Constraints.PropertyCompareConstraint(f1a));
+            //Now we have a valid folder to insert into, we can insert the item.
+            PropertyScrambler<InventoryItemBase> inventoryScrambler =
+                new PropertyScrambler<InventoryItemBase>()
+                    .DontScramble(x => x.ID)
+                    .DontScramble(x => x.AssetID)
+                    .DontScramble(x => x.Owner)
+                    .DontScramble(x => x.Folder);
+            InventoryItemBase root = NewItem(rootId, folder, owner, iname1, rootAsset);
+            inventoryScrambler.Scramble(root);
+            db.addInventoryItem(root);
+            InventoryItemBase expected = db.getInventoryItem(rootId);
+            Assert.That(expected, Constraints.PropertyCompareConstraint(root)
+                                    .IgnoreProperty(x => x.InvType)
+                                    .IgnoreProperty(x => x.CreatorIdAsUuid)
+                                    .IgnoreProperty(x => x.Description)
+                                    .IgnoreProperty(x => x.CreatorId));
+            inventoryScrambler.Scramble(expected);
+            db.updateInventoryItem(expected);
+            InventoryItemBase actual = db.getInventoryItem(rootId);
+            Assert.That(actual, Constraints.PropertyCompareConstraint(expected)
+                                    .IgnoreProperty(x => x.InvType)
+                                    .IgnoreProperty(x => x.CreatorIdAsUuid)
+                                    .IgnoreProperty(x => x.Description)
+                                    .IgnoreProperty(x => x.CreatorId));
+        }
+        [Test]
+        public void T999_StillNull()
+        {
+            // 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);
+            Assert.That(db.getUserRootFolder(zero), Is.Null);
+            Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0), "Assert.That(db.getInventoryInFolder(zero).Count, Is.EqualTo(0))");
+        }
        private InventoryItemBase NewItem(UUID id, UUID parent, UUID owner, string name, UUID asset)
        {
            InventoryItemBase i = new InventoryItemBase();
diff --git a/OpenSim/Data/Tests/BasicRegionTest.cs b/OpenSim/Data/Tests/BasicRegionTest.cs
index 836da78..8474921 100644
--- a/OpenSim/Data/Tests/BasicRegionTest.cs
+++ b/OpenSim/Data/Tests/BasicRegionTest.cs
@@ -71,14 +71,7 @@ namespace OpenSim.Data.Tests
        public void SuperInit()
        {
-            try
+            OpenSim.Tests.Common.TestLogging.LogToConsole();
-            {
-                XmlConfigurator.Configure();
-            }
-            catch (Exception)
-            {
-                // I don't care, just leave log4net off
-            }
            region1 = UUID.Random();
            region3 = UUID.Random();
@@ -532,6 +525,62 @@ namespace OpenSim.Data.Tests
                Assert.That(cursop.Acceleration,Is.EqualTo(parts[i].Acceleration), "Assert.That(cursop.Acceleration,Is.EqualTo(parts[i].Acceleration))");
            }
        }
+        [Test]
+        public void T016_RandomSogWithSceneParts()
+        {
+            PropertyScrambler<SceneObjectPart> scrambler =
+                new PropertyScrambler<SceneObjectPart>()
+                    .DontScramble(x => x.UUID);
+            UUID tmpSog = UUID.Random();
+            UUID tmp1 = UUID.Random();
+            UUID tmp2 = UUID.Random();
+            UUID tmp3 = UUID.Random();
+            UUID newregion = UUID.Random();
+            SceneObjectPart p1 = new SceneObjectPart();
+            SceneObjectPart p2 = new SceneObjectPart();
+            SceneObjectPart p3 = new SceneObjectPart();
+            p1.Shape = PrimitiveBaseShape.Default;
+            p2.Shape = PrimitiveBaseShape.Default;
+            p3.Shape = PrimitiveBaseShape.Default;
+            p1.UUID = tmp1;
+            p2.UUID = tmp2;
+            p3.UUID = tmp3;
+            scrambler.Scramble(p1);
+            scrambler.Scramble(p2);
+            scrambler.Scramble(p3);
+            SceneObjectGroup sog = NewSOG("Sop 0", tmpSog, newregion);
+            PropertyScrambler<SceneObjectGroup> sogScrambler =
+                new PropertyScrambler<SceneObjectGroup>()
+                    .DontScramble(x => x.UUID);
+            sogScrambler.Scramble(sog);
+            sog.UUID = tmpSog;
+            sog.AddPart(p1);
+            sog.AddPart(p2);
+            sog.AddPart(p3);
+            SceneObjectPart[] parts = sog.GetParts();
+            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))");
+            SceneObjectGroup newsog = sogs[0];
+            SceneObjectPart[] newparts = newsog.GetParts();
+            Assert.That(newparts.Length, Is.EqualTo(4), "Assert.That(newparts.Length,Is.EqualTo(4))");
+            Assert.That(newsog, Constraints.PropertyCompareConstraint(sog)
+                .IgnoreProperty(x=>x.LocalId)
+                .IgnoreProperty(x=>x.HasGroupChanged)
+                .IgnoreProperty(x=>x.IsSelected)
+                .IgnoreProperty(x=>x.RegionHandle)
+                .IgnoreProperty(x=>x.RegionUUID)
+                .IgnoreProperty(x=>x.Scene)
+                .IgnoreProperty(x=>x.Children)
+                .IgnoreProperty(x=>x.RootPart));
+        }
        
        [Test]
        public void T020_PrimInventoryEmpty()
diff --git a/OpenSim/Data/Tests/BasicUserTest.cs b/OpenSim/Data/Tests/BasicUserTest.cs
index 4e4ddc8..f9feb9b 100644
--- a/OpenSim/Data/Tests/BasicUserTest.cs
+++ b/OpenSim/Data/Tests/BasicUserTest.cs
@@ -71,14 +71,7 @@ namespace OpenSim.Data.Tests
        public void SuperInit()
        {
-            try
+            OpenSim.Tests.Common.TestLogging.LogToConsole();
-            {
-                XmlConfigurator.Configure();
-            }
-            catch (Exception)
-            {
-                // I don't care, just leave log4net off
-            }
            random = new Random();
            user1 = UUID.Random();
            user2 = UUID.Random();
@@ -118,13 +111,6 @@ namespace OpenSim.Data.Tests
        }
        [Test]
-        public void T999_StillNull()
-        {
-            Assert.That(db.GetUserByUUID(zero), Is.Null);
-            Assert.That(db.GetAgentByUUID(zero), Is.Null);
-        }
-        [Test]
        public void T010_CreateUser()
        {
            UserProfileData u1 = NewUser(user1,fname1,lname1);
@@ -396,6 +382,22 @@ namespace OpenSim.Data.Tests
            Assert.That(customtype,Is.EqualTo(u1a.CustomType), "Assert.That(customtype,Is.EqualTo(u1a.CustomType))");
            Assert.That(partner,Is.EqualTo(u1a.Partner), "Assert.That(partner,Is.EqualTo(u1a.Partner))");
        }
+        [Test]
+        public void T017_UserUpdateRandomPersistency()
+        {
+            UUID id = user5;
+            UserProfileData u = db.GetUserByUUID(id);
+            new PropertyScrambler<UserProfileData>().DontScramble(x=>x.ID).Scramble(u);
+            
+            db.UpdateUserProfile(u);
+            UserProfileData u1a = db.GetUserByUUID(id);
+            Assert.That(u1a, Constraints.PropertyCompareConstraint(u)
+                .IgnoreProperty(x=>x.HomeRegionX)
+                .IgnoreProperty(x=>x.HomeRegionY)
+                .IgnoreProperty(x=>x.RootInventoryFolderID)
+                );
+        }
        
        [Test]
        public void T020_CreateAgent()
@@ -660,6 +662,13 @@ namespace OpenSim.Data.Tests
            Assert.That(avatarheight,Is.EqualTo(app.AvatarHeight), "Assert.That(avatarheight,Is.EqualTo(app.AvatarHeight))");
        }
+        [Test]
+        public void T999_StillNull()
+        {
+            Assert.That(db.GetUserByUUID(zero), Is.Null);
+            Assert.That(db.GetAgentByUUID(zero), Is.Null);
+        }
        public UserProfileData NewUser(UUID id,string fname,string lname)
        {
            UserProfileData u = new UserProfileData();
diff --git a/OpenSim/Data/Tests/PropertyCompareConstraint.cs b/OpenSim/Data/Tests/PropertyCompareConstraint.cs
index 678501e..06ca53e 100644
--- a/OpenSim/Data/Tests/PropertyCompareConstraint.cs
+++ b/OpenSim/Data/Tests/PropertyCompareConstraint.cs
@@ -1,3 +1,30 @@
+/*
+ * 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;
 using System.Collections.Generic;
@@ -42,6 +69,28 @@ namespace OpenSim.Data.Tests
        private bool ObjectCompare(object expected, object actual, Stack<string> propertyNames)
        {
+            //If they are both null, they are equal
+            if (actual == null && expected == null)
+                return true;
+            //If only one is null, then they aren't
+            if (actual == null || expected == null)
+            {
+                failingPropertyName = string.Join(".", propertyNames.Reverse().ToArray());
+                failingActual = actual;
+                failingExpected = expected;
+                return false;
+            }
+            //prevent loops...
+            if (propertyNames.Count > 50)
+            {
+                failingPropertyName = string.Join(".", propertyNames.Reverse().ToArray());
+                failingActual = actual;
+                failingExpected = expected;
+                return false;
+            }
            if (actual.GetType() != expected.GetType())
            {
                propertyNames.Push("GetType()");
@@ -52,7 +101,7 @@ namespace OpenSim.Data.Tests
                return false;
            }
-            if(actual.GetType() == typeof(Color))
+            if (actual.GetType() == typeof(Color))
            {
                Color actualColor = (Color) actual;
                Color expectedColor = (Color) expected;
@@ -95,65 +144,69 @@ namespace OpenSim.Data.Tests
                return true;
            }
-            //Skip static properties.  I had a nasty problem comparing colors because of all of the public static colors.
+            IComparable comp = actual as IComparable;
-            PropertyInfo[] properties = expected.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance);
+            if (comp != null)
-            foreach (var property in properties)
            {
-                if (ignores.Contains(property.Name))
+                if (comp.CompareTo(expected) != 0)
-                    continue;
+                {
+                    failingPropertyName = string.Join(".", propertyNames.Reverse().ToArray());
-                object actualValue = property.GetValue(actual, null);
+                    failingActual = actual;
-                object expectedValue = property.GetValue(expected, null);
+                    failingExpected = expected;
+                    return false;
+                }
+                return true;
+            }
-                //If they are both null, they are equal
+            //Now try the much more annoying IComparable<T>
-                if (actualValue == null && expectedValue == null)
+            Type icomparableInterface = actual.GetType().GetInterface("IComparable`1");
-                    continue;
+            if (icomparableInterface != null)
+            {
+                int result = (int)icomparableInterface.GetMethod("CompareTo").Invoke(actual, new[] { expected });
+                if (result != 0)
+                {
+                    failingPropertyName = string.Join(".", propertyNames.Reverse().ToArray());
+                    failingActual = actual;
+                    failingExpected = expected;
+                    return false;
+                }
+                return true;
+            }
-                //If only one is null, then they aren't
+            IEnumerable arr = actual as IEnumerable;
-                if (actualValue == null || expectedValue == null)
+            if (arr != null)
+            {
+                List<object> actualList = arr.Cast<object>().ToList();
+                List<object> expectedList = ((IEnumerable)expected).Cast<object>().ToList();
+                if (actualList.Count != expectedList.Count)
                {
-                    propertyNames.Push(property.Name);
+                    propertyNames.Push("Count");
                    failingPropertyName = string.Join(".", propertyNames.Reverse().ToArray());
+                    failingActual = actualList.Count;
+                    failingExpected = expectedList.Count;
                    propertyNames.Pop();
-                    failingActual = actualValue;
-                    failingExpected = expectedValue;
                    return false;
                }
+                //actualList and expectedList should be the same size.
-                IComparable comp = actualValue as IComparable;
+                for (int i = 0; i < actualList.Count; i++)
-                if (comp != null)
                {
-                    if (comp.CompareTo(expectedValue) != 0)
+                    propertyNames.Push("[" + i + "]");
-                    {
+                    if (!ObjectCompare(expectedList[i], actualList[i], propertyNames))
-                        propertyNames.Push(property.Name);
-                        failingPropertyName = string.Join(".", propertyNames.Reverse().ToArray());
-                        propertyNames.Pop();
-                        failingActual = actualValue;
-                        failingExpected = expectedValue;
                        return false;
-                    }
+                    propertyNames.Pop();
-                    continue;
                }
+                //Everything seems okay...
+                return true;
+            }
-                IEnumerable arr = actualValue as IEnumerable;
+            //Skip static properties.  I had a nasty problem comparing colors because of all of the public static colors.
-                if (arr != null)
+            PropertyInfo[] properties = expected.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance);
-                {
+            foreach (var property in properties)
-                    List<object> actualList = arr.Cast<object>().ToList();
+            {
-                    List<object> expectedList = ((IEnumerable)expectedValue).Cast<object>().ToList();
+                if (ignores.Contains(property.Name))
-                    if (actualList.Count != expectedList.Count)
-                    {
-                        propertyNames.Push(property.Name);
-                        propertyNames.Push("Count");
-                        failingPropertyName = string.Join(".", propertyNames.Reverse().ToArray());
-                        failingActual = actualList.Count;
-                        failingExpected = expectedList.Count;
-                        propertyNames.Pop();
-                        propertyNames.Pop();
-                    }
-                    //Todo: A value-wise comparison of all of the values.
-                    //Everything seems okay...
                    continue;
-                }
+                object actualValue = property.GetValue(actual, null);
+                object expectedValue = property.GetValue(expected, null);
                propertyNames.Push(property.Name);
                if (!ObjectCompare(expectedValue, actualValue, propertyNames))
@@ -196,15 +249,7 @@ namespace OpenSim.Data.Tests
            {
                //If the inside of the lambda is the access to x, we've hit the end of the chain.
                //   We should track by the fully scoped parameter name, but this is the first rev of doing this.
-                if (((MemberExpression)express).Expression is ParameterExpression)
+                ignores.Add(((MemberExpression)express).Member.Name);
-                {
-                    ignores.Add(((MemberExpression)express).Member.Name);
-                }
-                else
-                {
-                    //Otherwise there could be more parameters inside...
-                    PullApartExpression(((MemberExpression)express).Expression);
-                }
            }
        }
    }
@@ -243,7 +288,7 @@ namespace OpenSim.Data.Tests
        {
            HasInt actual = new HasInt { TheValue = 5 };
            HasInt expected = new HasInt { TheValue = 4 };
-            var constraint = Constraints.PropertyCompareConstraint(expected).IgnoreProperty(x=>x.TheValue);
+            var constraint = Constraints.PropertyCompareConstraint(expected).IgnoreProperty(x => x.TheValue);
            Assert.That(constraint.Matches(actual), Is.True);
        }
@@ -285,6 +330,28 @@ namespace OpenSim.Data.Tests
        }
        [Test]
+        public void UUIDShouldMatch()
+        {
+            UUID uuid1 = UUID.Random();
+            UUID uuid2 = UUID.Parse(uuid1.ToString());
+            var constraint = Constraints.PropertyCompareConstraint(uuid1);
+            Assert.That(constraint.Matches(uuid2), Is.True);
+        }
+        [Test]
+        public void UUIDShouldNotMatch()
+        {
+            UUID uuid1 = UUID.Random();
+            UUID uuid2 = UUID.Random();
+            var constraint = Constraints.PropertyCompareConstraint(uuid1);
+            Assert.That(constraint.Matches(uuid2), Is.False);
+        }
+        [Test]
        public void TestColors()
        {
            Color actual = Color.Red;
@@ -294,5 +361,53 @@ namespace OpenSim.Data.Tests
            Assert.That(constraint.Matches(actual), Is.True);
        }
+        [Test]
+        public void ShouldCompareLists()
+        {
+            List<int> expected = new List<int> { 1, 2, 3 };
+            List<int> actual = new List<int> { 1, 2, 3 };
+            var constraint = Constraints.PropertyCompareConstraint(expected);
+            Assert.That(constraint.Matches(actual), Is.True);
+        }
+        [Test]
+        public void ShouldFailToCompareListsThatAreDifferent()
+        {
+            List<int> expected = new List<int> { 1, 2, 3 };
+            List<int> actual = new List<int> { 1, 2, 4 };
+            var constraint = Constraints.PropertyCompareConstraint(expected);
+            Assert.That(constraint.Matches(actual), Is.False);
+        }
+        [Test]
+        public void ShouldFailToCompareListsThatAreDifferentLengths()
+        {
+            List<int> expected = new List<int> { 1, 2, 3 };
+            List<int> actual = new List<int> { 1, 2 };
+            var constraint = Constraints.PropertyCompareConstraint(expected);
+            Assert.That(constraint.Matches(actual), Is.False);
+        }
+        public class Recursive
+        {
+            public Recursive Other { get; set; }
+        }
+        [Test]
+        public void ErrorsOutOnRecursive()
+        {
+            Recursive parent = new Recursive();
+            Recursive child = new Recursive();
+            parent.Other = child;
+            child.Other = parent;
+            var constraint = Constraints.PropertyCompareConstraint(child);
+            Assert.That(constraint.Matches(child), Is.False);
+        }
    }
 }
 \ No newline at end of file
diff --git a/OpenSim/Data/Tests/PropertyScrambler.cs b/OpenSim/Data/Tests/PropertyScrambler.cs
new file mode 100644
index 0000000..72aaff1
--- /dev/null
+++ b/OpenSim/Data/Tests/PropertyScrambler.cs
@@ -0,0 +1,186 @@
+/*
+ * 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;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Text;
+using NUnit.Framework;
+using NUnit.Framework.SyntaxHelpers;
+using OpenMetaverse;
+using OpenSim.Framework;
+namespace OpenSim.Data.Tests
+{
+    //This is generic so that the lambda expressions will work right in IDEs.
+    public class PropertyScrambler<T>
+    {
+        readonly System.Collections.Generic.List<string> membersToNotScramble = new List<string>();
+        
+        private void AddExpressionToNotScrableList(Expression expression)
+        {
+            UnaryExpression unaryExpression = expression as UnaryExpression;
+            if (unaryExpression != null)
+            {
+                AddExpressionToNotScrableList(unaryExpression.Operand);
+                return;
+            }
+            MemberExpression memberExpression = expression as MemberExpression;
+            if (memberExpression != null)
+            {
+                if (!(memberExpression.Member is PropertyInfo))
+                {
+                    throw new NotImplementedException("I don't know how deal with a MemberExpression that is a " + expression.Type);
+                }
+                membersToNotScramble.Add(memberExpression.Member.Name);
+                return;
+            }
+            throw new NotImplementedException("I don't know how to parse a " + expression.Type);
+        }
+        public PropertyScrambler<T> DontScramble(Expression<Func<T, object>> expression)
+        {
+            AddExpressionToNotScrableList(expression.Body);
+            return this;
+        }
+        public void Scramble(T obj)
+        {
+            internalScramble(obj);
+        }
+        private void internalScramble(object obj)
+        {
+            PropertyInfo[] properties = obj.GetType().GetProperties();
+            foreach (var property in properties)
+            {
+                //Skip indexers of classes.  We will assume that everything that has an indexer
+                //  is also IEnumberable.  May not always be true, but should be true normally.
+                if (property.GetIndexParameters().Length > 0)
+                    continue;
+                RandomizeProperty(obj, property, null);
+            }
+            //Now if it implments IEnumberable, it's probably some kind of list, so we should randomize
+            //  everything inside of it.
+            IEnumerable enumerable = obj as IEnumerable;
+            if (enumerable != null)
+            {
+                foreach (object value in enumerable)
+                {
+                    internalScramble(value);
+                }
+            }
+        }
+        private readonly Random random = new Random();
+        private void RandomizeProperty(object obj, PropertyInfo property, object[] index)
+        {//I'd like a better way to compare, but I had lots of problems with InventoryFolderBase because the ID is inherited.
+            if (membersToNotScramble.Contains(property.Name))
+                return;
+            Type t = property.PropertyType;
+            if (!property.CanWrite)
+                return;
+            object value = property.GetValue(obj, index);
+            if (value == null)
+                return;
+            if (t == typeof(string))
+                property.SetValue(obj, RandomName(), index);
+            else if (t == typeof(UUID))
+                property.SetValue(obj, UUID.Random(), index);
+            else if (t == typeof(sbyte))
+                property.SetValue(obj, (sbyte)random.Next(sbyte.MinValue, sbyte.MaxValue), index);
+            else if (t == typeof(short))
+                property.SetValue(obj, (short)random.Next(short.MinValue, short.MaxValue), index);
+            else if (t == typeof(int))
+                property.SetValue(obj, random.Next(), index);
+            else if (t == typeof(long))
+                property.SetValue(obj, random.Next() * int.MaxValue, index);
+            else if (t == typeof(byte))
+                property.SetValue(obj, (byte)random.Next(byte.MinValue, byte.MaxValue), index);
+            else if (t == typeof(ushort))
+                property.SetValue(obj, (ushort)random.Next(ushort.MinValue, ushort.MaxValue), index);
+            else if (t == typeof(uint))
+                property.SetValue(obj, Convert.ToUInt32(random.Next()), index);
+            else if (t == typeof(ulong))
+                property.SetValue(obj, Convert.ToUInt64(random.Next()) * Convert.ToUInt64(UInt32.MaxValue), index);
+            else if (t == typeof(bool))
+                property.SetValue(obj, true, index);
+            else if (t == typeof(byte[]))
+            {
+                byte[] bytes = new byte[30];
+                random.NextBytes(bytes);
+                property.SetValue(obj, bytes, index);
+            }
+            else
+                internalScramble(value);
+        }
+        private string RandomName()
+        {
+            StringBuilder name = new StringBuilder();
+            int size = random.Next(5, 12);
+            for (int i = 0; i < size; i++)
+            {
+                char ch = Convert.ToChar(Convert.ToInt32(Math.Floor(26 * random.NextDouble() + 65)));
+                name.Append(ch);
+            }
+            return name.ToString();
+        }
+    }
+    [TestFixture]
+    public class PropertyScramblerTests
+    {
+        [Test]
+        public void TestScramble()
+        {
+            AssetBase actual = new AssetBase(UUID.Random(), "asset one");
+            new PropertyScrambler<AssetBase>().Scramble(actual);
+        }
+        [Test]
+        public void DontScramble()
+        {
+            UUID uuid = UUID.Random();
+            AssetBase asset = new AssetBase();
+            asset.FullID = uuid;
+            new PropertyScrambler<AssetBase>()
+                .DontScramble(x => x.Metadata)
+                .DontScramble(x => x.FullID)
+                .DontScramble(x => x.ID)
+                .Scramble(asset);
+            Assert.That(asset.FullID, Is.EqualTo(uuid));
+        }
+    }
+}
+\ No newline at end of file
diff --git a/OpenSim/Data/Tests/ScrambleForTesting.cs b/OpenSim/Data/Tests/ScrambleForTesting.cs
deleted file mode 100644
index c6e467f..0000000
--- a/OpenSim/Data/Tests/ScrambleForTesting.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System;
-using System.Collections;
-using System.Reflection;
-using System.Text;
-using NUnit.Framework;
-using OpenMetaverse;
-using OpenSim.Framework;
-namespace OpenSim.Data.Tests
-{
-    public static class ScrambleForTesting
-    {
-        private static readonly Random random = new Random();
-        public static void Scramble(object obj)
-        {
-            PropertyInfo[] properties = obj.GetType().GetProperties();
-            foreach (var property in properties)
-            {
-                //Skip indexers of classes.  We will assume that everything that has an indexer
-                //  is also IEnumberable.  May not always be true, but should be true normally.
-                if(property.GetIndexParameters().Length > 0)
-                    continue;
-                RandomizeProperty(obj, property, null);
-            }
-            //Now if it implments IEnumberable, it's probably some kind of list, so we should randomize
-            //  everything inside of it.
-            IEnumerable enumerable = obj as IEnumerable;
-            if(enumerable != null)
-            {
-                foreach (object value in enumerable)
-                {
-                    Scramble(value);
-                }
-            }
-        }
-        private static void RandomizeProperty(object obj, PropertyInfo property, object[] index)
-        {
-            Type t = property.PropertyType;
-            if (!property.CanWrite)
-                return;
-            object value = property.GetValue(obj, index);
-            if (value == null)
-                return;
-            if (t == typeof (string))
-                property.SetValue(obj, RandomName(), index);
-            else if (t == typeof (UUID))
-                property.SetValue(obj, UUID.Random(), index);
-            else if (t == typeof (sbyte))
-                property.SetValue(obj, (sbyte)random.Next(sbyte.MinValue, sbyte.MaxValue), index);
-            else if (t == typeof (short))
-                property.SetValue(obj, (short)random.Next(short.MinValue, short.MaxValue), index);
-            else if (t == typeof (int))
-                property.SetValue(obj, random.Next(), index);
-            else if (t == typeof (long))
-                property.SetValue(obj, random.Next() * int.MaxValue, index);
-            else if (t == typeof (byte))
-                property.SetValue(obj, (byte)random.Next(byte.MinValue, byte.MaxValue), index);
-            else if (t == typeof (ushort))
-                property.SetValue(obj, (ushort)random.Next(ushort.MinValue, ushort.MaxValue), index);
-            else if (t == typeof (uint))
-                property.SetValue(obj, Convert.ToUInt32(random.Next()), index);
-            else if (t == typeof (ulong))
-                property.SetValue(obj, Convert.ToUInt64(random.Next()) * Convert.ToUInt64(UInt32.MaxValue), index);
-            else if (t == typeof (bool))
-                property.SetValue(obj, true, index);
-            else if (t == typeof (byte[]))
-            {
-                byte[] bytes = new byte[30];
-                random.NextBytes(bytes);
-                property.SetValue(obj, bytes, index);
-            }
-            else
-                Scramble(value);
-        }
-        private static string RandomName()
-        {
-            StringBuilder name = new StringBuilder();
-            int size = random.Next(5, 12);
-            for (int i = 0; i < size; i++)
-            {
-                char ch = Convert.ToChar(Convert.ToInt32(Math.Floor(26 * random.NextDouble() + 65)));
-                name.Append(ch);
-            }
-            return name.ToString();
-        }
-    }
-    [TestFixture]
-    public class ScrableForTestingTest
-    {
-        [Test]
-        public void TestScramble()
-        {
-            AssetBase actual = new AssetBase(UUID.Random(), "asset one");
-            ScrambleForTesting.Scramble(actual);
-        }
-    }
-}
-\ No newline at end of file