aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs11
1 files changed, 5 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
index ae879bb..ed2eb79 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
@@ -112,7 +112,6 @@ namespace OpenSim.Region.Environment.Scenes.Tests
112 SceneObjectPart part2 = SceneSetupHelpers.AddSceneObject(scene); 112 SceneObjectPart part2 = SceneSetupHelpers.AddSceneObject(scene);
113 SceneObjectGroup grp2 = part2.ParentGroup; 113 SceneObjectGroup grp2 = part2.ParentGroup;
114 114
115
116 grp1.AbsolutePosition = new Vector3(10, 10, 10); 115 grp1.AbsolutePosition = new Vector3(10, 10, 10);
117 grp2.AbsolutePosition = Vector3.Zero; 116 grp2.AbsolutePosition = Vector3.Zero;
118 117
@@ -129,6 +128,10 @@ namespace OpenSim.Region.Environment.Scenes.Tests
129 // Link grp2 to grp1. part2 becomes child prim to grp1. grp2 is eliminated. 128 // Link grp2 to grp1. part2 becomes child prim to grp1. grp2 is eliminated.
130 grp1.LinkToGroup(grp2); 129 grp1.LinkToGroup(grp2);
131 130
131 // FIXME: Can't to these tests yet since group 2 still has the parts attached! We can't yet detach since
132 // it might cause SOG.ProcessBackup() to fail due to the race condition. This really needs to be fixed.
133 //Assert.That(grp2.IsDeleted, "SOG 2 was not registered as deleted after link.");
134 //Assert.That(grp2.Children.Count, Is.EqualTo(0), "Group 2 still contained children after delink.");
132 Assert.That(grp1.Children.Count == 2); 135 Assert.That(grp1.Children.Count == 2);
133 136
134 if (debugtest) 137 if (debugtest)
@@ -170,8 +173,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests
170 if (debugtest) 173 if (debugtest)
171 System.Console.WriteLine("Group2: Prim2: OffsetPosition:{0}, OffsetRotation:{1}", part2.AbsolutePosition, part2.RotationOffset); 174 System.Console.WriteLine("Group2: Prim2: OffsetPosition:{0}, OffsetRotation:{1}", part2.AbsolutePosition, part2.RotationOffset);
172 175
173 Assert.That(part2.AbsolutePosition == Vector3.Zero); 176 Assert.That(part2.AbsolutePosition == Vector3.Zero);
174
175 } 177 }
176 178
177 [Test] 179 [Test]
@@ -189,7 +191,6 @@ namespace OpenSim.Region.Environment.Scenes.Tests
189 SceneObjectPart part4 = SceneSetupHelpers.AddSceneObject(scene); 191 SceneObjectPart part4 = SceneSetupHelpers.AddSceneObject(scene);
190 SceneObjectGroup grp4 = part4.ParentGroup; 192 SceneObjectGroup grp4 = part4.ParentGroup;
191 193
192
193 grp1.AbsolutePosition = new Vector3(10, 10, 10); 194 grp1.AbsolutePosition = new Vector3(10, 10, 10);
194 grp2.AbsolutePosition = Vector3.Zero; 195 grp2.AbsolutePosition = Vector3.Zero;
195 grp3.AbsolutePosition = new Vector3(20, 20, 20); 196 grp3.AbsolutePosition = new Vector3(20, 20, 20);
@@ -228,7 +229,6 @@ namespace OpenSim.Region.Environment.Scenes.Tests
228 Assert.That(grp1.Children.Count == 2); 229 Assert.That(grp1.Children.Count == 2);
229 Assert.That(grp3.Children.Count == 2); 230 Assert.That(grp3.Children.Count == 2);
230 231
231
232 if (debugtest) 232 if (debugtest)
233 { 233 {
234 System.Console.WriteLine("--------After Link-------"); 234 System.Console.WriteLine("--------After Link-------");
@@ -297,7 +297,6 @@ namespace OpenSim.Region.Environment.Scenes.Tests
297 && (part4.RotationOffset.Y - compareQuaternion.Y < 0.00003) 297 && (part4.RotationOffset.Y - compareQuaternion.Y < 0.00003)
298 && (part4.RotationOffset.Z - compareQuaternion.Z < 0.00003) 298 && (part4.RotationOffset.Z - compareQuaternion.Z < 0.00003)
299 && (part4.RotationOffset.W - compareQuaternion.W < 0.00003)); 299 && (part4.RotationOffset.W - compareQuaternion.W < 0.00003));
300
301 } 300 }
302 301
303 /// <summary> 302 /// <summary>