From e261c974704098e5d1238ef800ef49d3ec7e75b8 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 21 Nov 2008 18:17:01 +0000
Subject: * 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
---
.../Environment/Scenes/Tests/SceneObjectTests.cs | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
(limited to 'OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs')
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
}
///
- /// Test removing an object from a scene.
+ /// Test deleting an object from a scene.
///
[Test]
- public void TestRemoveSceneObject()
+ public void TestDeleteSceneObject()
{
TestScene scene = SceneTestUtils.SetupScene();
SceneObjectPart part = SceneTestUtils.AddSceneObject(scene);
scene.DeleteSceneObject(part.ParentGroup, false);
- SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
-
+ SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
Assert.That(retrievedPart, Is.Null);
}
///
- /// Test removing an object
+ /// Test deleting an object to user inventory
///
- public void TestRemoveSceneObjectAsync()
+ [Test]
+ public void TestDeleteSceneObjectToUserInventory()
{
+ UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001");
+
TestScene scene = SceneTestUtils.SetupScene();
- SceneObjectPart part = SceneTestUtils.AddSceneObject(scene);
+ SceneObjectPart part = SceneTestUtils.AddSceneObject(scene);
+
+ IClientAPI client = SceneTestUtils.AddRootAgent(scene, agentId);
+ scene.DeRezObject(client, part.LocalId, UUID.Zero, 9, UUID.Zero);
+
+ SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId);
+ Assert.That(retrievedPart, Is.Null);
}
}
}
\ No newline at end of file
--
cgit v1.1