From 71e05a5707f1eaed098592dc1c3feb3389731634 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 28 Nov 2008 19:39:46 +0000
Subject: * test: Add a wodge of code in order to be able to slightly extend a
 test to deliver a taken object to a user inventory folder without throwing an
 exception * test doesn't actually double check for the presence of the item
 yet

---
 .../Environment/Scenes/Tests/SceneObjectTests.cs     | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 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 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
     {
         [SetUp]
         public void Init()
-        {
-            try
-            {
-                log4net.Config.XmlConfigurator.Configure();
-            }
-            catch
-            {
-                // I don't care, just leave log4net off
-            }            
+        {        
         }
                 
         /// <summary>
@@ -118,6 +110,8 @@ namespace OpenSim.Region.Environment.Scenes.Tests
         [Test]
         public void TestDeleteSceneObjectAsyncToUserInventory()
         {
+            log4net.Config.XmlConfigurator.Configure();                  
+            
             UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001");
             
             TestScene scene = SceneTestUtils.SetupScene();                
@@ -132,12 +126,16 @@ namespace OpenSim.Region.Environment.Scenes.Tests
                 Is.EqualTo(agentId));  
             
             IClientAPI client = SceneTestUtils.AddRootAgent(scene, agentId);
-            SceneTestUtils.DeleteSceneObjectAsync(scene, part, DeRezAction.TakeCopy, client);
-                                    
+                                                
             CachedUserInfo userInfo = scene.CommsManager.UserProfileCacheService.GetUserDetails(agentId);
             Assert.That(userInfo, Is.Not.Null);
+            Assert.That(userInfo.RootFolder, Is.Not.Null);
+            
+            SceneTestUtils.DeleteSceneObjectAsync(scene, part, DeRezAction.TakeCopy, userInfo.RootFolder.ID, client);
             
             // TODO: test that the object actually made it successfully into inventory
+            
+            log4net.LogManager.Shutdown();            
         }
     }
 }
\ No newline at end of file
-- 
cgit v1.1