Merge branch 'master' into careminster-presence-refactor

2 files changed, 50 insertions, 5 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index 78f2ae3..4baa22c 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -49,18 +49,62 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         /// <summary>
         /// Test adding an object to a scene.
         /// </summary>
-        [Test, LongRunning]
+        [Test]
         public void TestAddSceneObject()
         {
             TestHelper.InMethod();
 
             Scene scene = SceneSetupHelpers.SetupScene();
-            SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
-            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
+
+            string objName = "obj1";
+            UUID objUuid = new UUID("00000000-0000-0000-0000-000000000001");
+
+            SceneObjectPart part
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                    { Name = objName, UUID = objUuid };
+
+            Assert.That(scene.AddNewSceneObject(new SceneObjectGroup(part), false), Is.True);
+            
+            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(objUuid);
+            
+            //m_log.Debug("retrievedPart : {0}", retrievedPart);
+            // If the parts have the same UUID then we will consider them as one and the same
+            Assert.That(retrievedPart.Name, Is.EqualTo(objName));
+            Assert.That(retrievedPart.UUID, Is.EqualTo(objUuid));
+        }
+
+        [Test]
+        /// <summary>
+        /// It shouldn't be possible to add a scene object if one with that uuid already exists in the scene.
+        /// </summary>
+        public void TestAddExistingSceneObjectUuid()
+        {
+            TestHelper.InMethod();
+
+            Scene scene = SceneSetupHelpers.SetupScene();
+
+            string obj1Name = "Alfred";
+            string obj2Name = "Betty";
+            UUID objUuid = new UUID("00000000-0000-0000-0000-000000000001");
+
+            SceneObjectPart part1
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                    { Name = obj1Name, UUID = objUuid };
+
+            Assert.That(scene.AddNewSceneObject(new SceneObjectGroup(part1), false), Is.True);
+
+            SceneObjectPart part2
+                = new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default, Vector3.Zero, Quaternion.Identity, Vector3.Zero) 
+                    { Name = obj2Name, UUID = objUuid };
+
+            Assert.That(scene.AddNewSceneObject(new SceneObjectGroup(part2), false), Is.False);
+            
+            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(objUuid);
             
             //m_log.Debug("retrievedPart : {0}", retrievedPart);
             // If the parts have the same UUID then we will consider them as one and the same
-            Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID));
+            Assert.That(retrievedPart.Name, Is.EqualTo(obj1Name));
+            Assert.That(retrievedPart.UUID, Is.EqualTo(objUuid));
         }
         
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
index 8b80ebe..5e6124b 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
@@ -58,7 +58,8 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             TestHelper.InMethod();
             
             UUID corruptAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666");
-            AssetBase corruptAsset = AssetHelpers.CreateAsset(corruptAssetUuid, "CORRUPT ASSET", UUID.Zero);
+            AssetBase corruptAsset 
+                = AssetHelpers.CreateAsset(corruptAssetUuid, AssetType.Notecard, "CORRUPT ASSET", UUID.Zero);
             m_assetService.Store(corruptAsset);
 
             IDictionary<UUID, AssetType> foundAssetUuids = new Dictionary<UUID, AssetType>();