From a02c3caa0d65af384b9f3e5afe233a2c8de60d48 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey <jjustincc@googlemail.com>
Date: Thu, 12 Mar 2009 18:13:51 +0000
Subject: [PATCH] * Move SceneObject tests into their proper namespace * Add
 some more debug code to narrow down where the tests are freezing

---
 .../CoreModules/World/Archiver/Tests/ArchiverTests.cs       | 6 ++++++
 .../Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs  | 4 ++--
 .../Framework/Scenes/Tests/SceneObjectLinkingTests.cs       | 2 +-
 OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs             | 3 +++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index b5a2d1342e..7aafaee7ba 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.IO;
+using System.Reflection;
 using System.Threading;
 using log4net.Config;
 using NUnit.Framework;
@@ -164,6 +165,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
             Assert.That(gotObject2File, Is.True, "No object2 file in archive");
             
             // TODO: Test presence of more files and contents of files.
+            // Temporary
+            Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod());
         }
 
         /// <summary>
@@ -302,6 +305,9 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
                 Assert.That(object2PartMerged.Name, Is.EqualTo(part2Name), "object2 names not identical after merge"); 
                 Assert.That(object2PartMerged.GroupPosition, Is.EqualTo(part2GroupPosition), "object2 group position not equal after merge");
             }
+                
+            // Temporary
+            Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod());                
         }
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index c984c7d04f..caee3a5400 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -37,13 +37,13 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Tests.Common.Mock;
 using OpenSim.Tests.Common.Setup;
 
-namespace OpenSim.Region.CoreModules.Scenes.Tests
+namespace OpenSim.Region.Framework.Scenes.Tests
 {
     /// <summary>
     /// Basic scene object tests (create, read and delete but not update).
     /// </summary>
     [TestFixture]
-    public class SceneObjectTests
+    public class SceneObjectBasicTests
     {         
         /// <summary>
         /// Test adding an object to a scene.
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index b5dbb3835b..003fef2928 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -39,7 +39,7 @@ using OpenSim.Tests.Common.Setup;
 using log4net;
 using System.Reflection;
 
-namespace OpenSim.Region.CoreModules.Scenes.Tests
+namespace OpenSim.Region.Framework.Scenes.Tests
 {
     /// <summary>
     /// Linking tests
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index bcc94261d9..5d35e35176 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using System.Net;
 using Nini.Config;
 using OpenMetaverse;
@@ -66,6 +67,8 @@ namespace OpenSim.Tests.Common.Setup
         /// <returns></returns>
         public static TestScene SetupScene(string name, UUID id, uint x, uint y, CommunicationsManager cm)
         {
+            Console.WriteLine("Setting up test scene {0}", name);
+            
             RegionInfo regInfo = new RegionInfo(x, y, new IPEndPoint(IPAddress.Loopback, 9000), "127.0.0.1");
             regInfo.RegionName = name;
             regInfo.RegionID = id;