Merge branch 'master' into careminster

1 files changed, 30 insertions, 5 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs
index 10c78b5..7a3b362 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectSpatialTests.cs
@@ -44,22 +44,47 @@ namespace OpenSim.Region.Framework.Scenes.Tests
     [TestFixture]
     public class SceneObjectSpatialTests
     {
+        TestScene m_scene;
+        UUID m_ownerId = TestHelpers.ParseTail(0x1);
+
+        [SetUp]
+        public void SetUp()
+        {
+            m_scene = SceneHelpers.SetupScene();
+        }
+
+        [Test]
+        public void TestGetSceneObjectGroupPosition()
+        {
+            TestHelpers.InMethod();
+
+            Vector3 position = new Vector3(10, 20, 30);
+
+            SceneObjectGroup so
+                = SceneHelpers.CreateSceneObject(1, m_ownerId, "obj1", 0x10);
+            so.AbsolutePosition = position;
+            m_scene.AddNewSceneObject(so, false);
+
+            Assert.That(so.AbsolutePosition, Is.EqualTo(position));
+        }
+
         [Test]
         public void TestGetRootPartPosition()
         {
             TestHelpers.InMethod();
 
-            Scene scene = SceneHelpers.SetupScene();
-            UUID ownerId = TestHelpers.ParseTail(0x1);
             Vector3 partPosition = new Vector3(10, 20, 30);
 
             SceneObjectGroup so
-                = SceneHelpers.CreateSceneObject(1, ownerId, "obj1", 0x10);
+                = SceneHelpers.CreateSceneObject(1, m_ownerId, "obj1", 0x10);
             so.AbsolutePosition = partPosition;
-            scene.AddNewSceneObject(so, false);
+            m_scene.AddNewSceneObject(so, false);
 
-            Assert.That(so.AbsolutePosition, Is.EqualTo(partPosition));
             Assert.That(so.RootPart.AbsolutePosition, Is.EqualTo(partPosition));
+            Assert.That(so.RootPart.GroupPosition, Is.EqualTo(partPosition));
+            Assert.That(so.RootPart.GetWorldPosition(), Is.EqualTo(partPosition));
+            Assert.That(so.RootPart.RelativePosition, Is.EqualTo(partPosition));
+            Assert.That(so.RootPart.OffsetPosition, Is.EqualTo(Vector3.Zero));
         }
     }
 }
\ No newline at end of file