1 files changed, 47 insertions, 11 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index 1ea2329..80f198d 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -52,22 +52,25 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             TestHelpers.InMethod();
 
             Scene scene = SceneHelpers.SetupScene();
+            int partsToTestCount = 3;
 
-            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 };
+            SceneObjectGroup so
+                = SceneHelpers.CreateSceneObject(partsToTestCount, TestHelpers.ParseTail(0x1), "obj1", 0x10);
+            SceneObjectPart[] parts = so.Parts;
 
-            Assert.That(scene.AddNewSceneObject(new SceneObjectGroup(part), false), Is.True);
-            
-            SceneObjectPart retrievedPart = scene.GetSceneObjectPart(objUuid);
+            Assert.That(scene.AddNewSceneObject(so, false), Is.True);
+            SceneObjectGroup retrievedSo = scene.GetSceneObjectGroup(so.UUID);
+            SceneObjectPart[] retrievedParts = retrievedSo.Parts;
             
             //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));
+            Assert.That(retrievedSo.PrimCount, Is.EqualTo(partsToTestCount));
+
+            for (int i = 0; i < partsToTestCount; i++)
+            {
+                Assert.That(retrievedParts[i].Name, Is.EqualTo(parts[i].Name));
+                Assert.That(retrievedParts[i].UUID, Is.EqualTo(parts[i].UUID));
+            }
         }
 
         [Test]
@@ -103,6 +106,39 @@ namespace OpenSim.Region.Framework.Scenes.Tests
             Assert.That(retrievedPart.Name, Is.EqualTo(obj1Name));
             Assert.That(retrievedPart.UUID, Is.EqualTo(objUuid));
         }
+
+        /// <summary>
+        /// Test retrieving a scene object via the local id of one of its parts.
+        /// </summary>
+        [Test]
+        public void TestGetSceneObjectByPartLocalId()
+        {
+            TestHelpers.InMethod();
+
+            Scene scene = SceneHelpers.SetupScene();
+            int partsToTestCount = 3;
+
+            SceneObjectGroup so
+                = SceneHelpers.CreateSceneObject(partsToTestCount, TestHelpers.ParseTail(0x1), "obj1", 0x10);
+            SceneObjectPart[] parts = so.Parts;
+
+            scene.AddNewSceneObject(so, false);
+
+            // Test getting via the root part's local id
+            Assert.That(scene.GetGroupByPrim(so.LocalId), Is.Not.Null);
+
+            // Test getting via a non root part's local id
+            Assert.That(scene.GetGroupByPrim(parts[partsToTestCount - 1].LocalId), Is.Not.Null);
+
+            // Test that we don't get back an object for a local id that doesn't exist
+            Assert.That(scene.GetGroupByPrim(999), Is.Null);
+
+            // Now delete the scene object and check again
+            scene.DeleteSceneObject(so, false);
+
+            Assert.That(scene.GetGroupByPrim(so.LocalId), Is.Null);
+            Assert.That(scene.GetGroupByPrim(parts[partsToTestCount - 1].LocalId), Is.Null);
+        }
         
         /// <summary>
         /// Test deleting an object from a scene.