diff options
author | Justin Clarke Casey | 2008-11-21 18:17:01 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-21 18:17:01 +0000 |
commit | e261c974704098e5d1238ef800ef49d3ec7e75b8 (patch) | |
tree | 8caa0b40509a2dc70fca1061537573ac148cbcc6 /OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs | |
parent | * minor: Remove comparison of UUID struct against null picked up as a warning (diff) | |
download | opensim-SC_OLD-e261c974704098e5d1238ef800ef49d3ec7e75b8.zip opensim-SC_OLD-e261c974704098e5d1238ef800ef49d3ec7e75b8.tar.gz opensim-SC_OLD-e261c974704098e5d1238ef800ef49d3ec7e75b8.tar.bz2 opensim-SC_OLD-e261c974704098e5d1238ef800ef49d3ec7e75b8.tar.xz |
* On delete to inventory, actually remove the group from the scene before the async stage.
* Last time I accidentally left the existing code in place that merely wiped the group from the client (but not the scene)
* Put in an incomplete 'delete object o inventory' test to assert that this happens
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs index 66ea59e..e0d6a99 100644 --- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs +++ b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs | |||
@@ -70,27 +70,35 @@ namespace OpenSim.Region.Environment.Scenes.Tests | |||
70 | } | 70 | } |
71 | 71 | ||
72 | /// <summary> | 72 | /// <summary> |
73 | /// Test removing an object from a scene. | 73 | /// Test deleting an object from a scene. |
74 | /// </summary> | 74 | /// </summary> |
75 | [Test] | 75 | [Test] |
76 | public void TestRemoveSceneObject() | 76 | public void TestDeleteSceneObject() |
77 | { | 77 | { |
78 | TestScene scene = SceneTestUtils.SetupScene(); | 78 | TestScene scene = SceneTestUtils.SetupScene(); |
79 | SceneObjectPart part = SceneTestUtils.AddSceneObject(scene); | 79 | SceneObjectPart part = SceneTestUtils.AddSceneObject(scene); |
80 | scene.DeleteSceneObject(part.ParentGroup, false); | 80 | scene.DeleteSceneObject(part.ParentGroup, false); |
81 | 81 | ||
82 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); | 82 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); |
83 | |||
84 | Assert.That(retrievedPart, Is.Null); | 83 | Assert.That(retrievedPart, Is.Null); |
85 | } | 84 | } |
86 | 85 | ||
87 | /// <summary> | 86 | /// <summary> |
88 | /// Test removing an object | 87 | /// Test deleting an object to user inventory |
89 | /// </summary> | 88 | /// </summary> |
90 | public void TestRemoveSceneObjectAsync() | 89 | [Test] |
90 | public void TestDeleteSceneObjectToUserInventory() | ||
91 | { | 91 | { |
92 | UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); | ||
93 | |||
92 | TestScene scene = SceneTestUtils.SetupScene(); | 94 | TestScene scene = SceneTestUtils.SetupScene(); |
93 | SceneObjectPart part = SceneTestUtils.AddSceneObject(scene); | 95 | SceneObjectPart part = SceneTestUtils.AddSceneObject(scene); |
96 | |||
97 | IClientAPI client = SceneTestUtils.AddRootAgent(scene, agentId); | ||
98 | scene.DeRezObject(client, part.LocalId, UUID.Zero, 9, UUID.Zero); | ||
99 | |||
100 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); | ||
101 | Assert.That(retrievedPart, Is.Null); | ||
94 | } | 102 | } |
95 | } | 103 | } |
96 | } \ No newline at end of file | 104 | } \ No newline at end of file |