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.cs20
1 files changed, 9 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
index a6e4d4e..500512e 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
@@ -45,15 +45,7 @@ namespace OpenSim.Region.Environment.Scenes.Tests
45 { 45 {
46 [SetUp] 46 [SetUp]
47 public void Init() 47 public void Init()
48 { 48 {
49 try
50 {
51 log4net.Config.XmlConfigurator.Configure();
52 }
53 catch
54 {
55 // I don't care, just leave log4net off
56 }
57 } 49 }
58 50
59 /// <summary> 51 /// <summary>
@@ -118,6 +110,8 @@ namespace OpenSim.Region.Environment.Scenes.Tests
118 [Test] 110 [Test]
119 public void TestDeleteSceneObjectAsyncToUserInventory() 111 public void TestDeleteSceneObjectAsyncToUserInventory()
120 { 112 {
113 log4net.Config.XmlConfigurator.Configure();
114
121 UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); 115 UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001");
122 116
123 TestScene scene = SceneTestUtils.SetupScene(); 117 TestScene scene = SceneTestUtils.SetupScene();
@@ -132,12 +126,16 @@ namespace OpenSim.Region.Environment.Scenes.Tests
132 Is.EqualTo(agentId)); 126 Is.EqualTo(agentId));
133 127
134 IClientAPI client = SceneTestUtils.AddRootAgent(scene, agentId); 128 IClientAPI client = SceneTestUtils.AddRootAgent(scene, agentId);
135 SceneTestUtils.DeleteSceneObjectAsync(scene, part, DeRezAction.TakeCopy, client); 129
136
137 CachedUserInfo userInfo = scene.CommsManager.UserProfileCacheService.GetUserDetails(agentId); 130 CachedUserInfo userInfo = scene.CommsManager.UserProfileCacheService.GetUserDetails(agentId);
138 Assert.That(userInfo, Is.Not.Null); 131 Assert.That(userInfo, Is.Not.Null);
132 Assert.That(userInfo.RootFolder, Is.Not.Null);
133
134 SceneTestUtils.DeleteSceneObjectAsync(scene, part, DeRezAction.TakeCopy, userInfo.RootFolder.ID, client);
139 135
140 // TODO: test that the object actually made it successfully into inventory 136 // TODO: test that the object actually made it successfully into inventory
137
138 log4net.LogManager.Shutdown();
141 } 139 }
142 } 140 }
143} \ No newline at end of file 141} \ No newline at end of file