16 files changed, 41 insertions, 41 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Tests/AttachmentTests.cs b/OpenSim/Region/Framework/Scenes/Tests/AttachmentTests.cs
index 85197db..fb28397 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/AttachmentTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/AttachmentTests.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [TestFixtureSetUp]
         public void Init()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             scene = SceneHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000);
             scene2 = SceneHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000);
@@ -89,7 +89,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void T030_TestAddAttachments()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 
             ScenePresence presence = scene.GetScenePresence(agent1);
 
@@ -104,7 +104,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void T031_RemoveAttachments()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 
             ScenePresence presence = scene.GetScenePresence(agent1);
             presence.RemoveAttachment(sog1);
@@ -118,7 +118,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         //[Test]
         public void T032_CrossAttachments()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 
             ScenePresence presence = scene.GetScenePresence(agent1);
             ScenePresence presence2 = scene2.GetScenePresence(agent1);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/BorderTests.cs b/OpenSim/Region/Framework/Scenes/Tests/BorderTests.cs
index 3a0dd00..ab6311b 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/BorderTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/BorderTests.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestCross()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             List<Border> testborders = new List<Border>();
 
@@ -99,7 +99,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestCrossSquare512()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             List<Border> testborders = new List<Border>();
 
@@ -179,7 +179,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestCrossRectangle512x256()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             List<Border> testborders = new List<Border>();
 
@@ -259,7 +259,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestCrossOdd512x512w256hole()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             List<Border> testborders = new List<Border>();
             //   512____
diff --git a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
index ebf595a..a5d2b23 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/EntityManagerTests.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void T010_AddObjects()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             random = new Random();
             SceneObjectGroup found;
@@ -85,7 +85,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void T011_ThreadAddRemoveTest()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             // This test adds and removes with mutiple threads, attempting to break the 
             // uuid and localid dictionary coherence.
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
index b7ff1b1..9a60e50 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneGraphTests.cs
@@ -43,7 +43,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestDuplicateObject()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             Scene scene = SceneHelpers.SetupScene();
 
             UUID ownerId = new UUID("00000000-0000-0000-0000-000000000010");
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
index 8b4771b..ff55680 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestAddSceneObject()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 
             Scene scene = SceneHelpers.SetupScene();
 
@@ -76,7 +76,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         /// </summary>
         public void TestAddExistingSceneObjectUuid()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 
             Scene scene = SceneHelpers.SetupScene();
 
@@ -110,7 +110,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestDeleteSceneObject()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             TestScene scene = SceneHelpers.SetupScene();
             SceneObjectPart part = SceneHelpers.AddSceneObject(scene);
@@ -126,7 +126,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestDeleteSceneObjectAsync()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             //log4net.Config.XmlConfigurator.Configure();
 
             UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001");
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
index d201510..c8a9ca3 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestDeRezSceneObject()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
                         
             UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
@@ -94,7 +94,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestDeRezSceneObjectNotOwner()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
                         
             UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index b09144d..2912a46 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestLinkDelink2SceneObjects()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             bool debugtest = false; 
 
@@ -132,7 +132,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestLinkDelink2groups4SceneObjects()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             bool debugtest = false;
 
@@ -266,7 +266,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestNewSceneObjectLinkPersistence()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             //log4net.Config.XmlConfigurator.Configure();
             
             TestScene scene = SceneHelpers.SetupScene();
@@ -305,7 +305,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestDelinkPersistence()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             //log4net.Config.XmlConfigurator.Configure();
             
             TestScene scene = SceneHelpers.SetupScene();
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
index 8630476..b49c6e7 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectResizeTests.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestResizeSceneObject()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
             Scene scene = SceneHelpers.SetupScene();
@@ -72,7 +72,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestResizeSceneObjectPart()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             //log4net.Config.XmlConfigurator.Configure();
 
             Scene scene = SceneHelpers.SetupScene();
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
index c2adb2a..2a342d5 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectStatusTests.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestSetPhantom()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 
 //            Scene scene = SceneSetupHelpers.SetupScene();
             SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, UUID.Zero);
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
index e0ab1c8..e604885 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestShareWithGroup()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
                         
             UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index 8af1b38..9b5f52f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [TestFixtureSetUp]
         public void Init()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             scene = SceneHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000);
             scene2 = SceneHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000);
@@ -97,7 +97,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void T010_TestAddRootAgent()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 
             string firstName = "testfirstname";
 
@@ -135,7 +135,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void T011_TestRemoveRootAgent()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 
             scene.RemoveClient(agent1);
 
@@ -147,7 +147,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void T012_TestAddNeighbourRegion()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 
             string reason;
 
@@ -175,7 +175,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void T013_TestRemoveNeighbourRegion()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 
             ScenePresence presence = scene.GetScenePresence(agent1);
             presence.RemoveNeighbourRegion(region3);
@@ -198,7 +198,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestChildAgentEstablished()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
             
             UUID agent1Id = UUID.Parse("00000000-0000-0000-0000-000000000001");
@@ -230,7 +230,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         //[Test]
         public void T021_TestCrossToNewRegion()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 
             scene.RegisterRegionWithGrid();
             scene2.RegisterRegionWithGrid();
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
index 8ffb22e..8b8aea5 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestUpdateScene()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 
             Scene scene = SceneHelpers.SetupScene();
             scene.Update();
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index a3848a7..fb5a19f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         //[Test, LongRunning]
         public void TestSimpleNotNeighboursTeleport()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             ThreadRunResults results = new ThreadRunResults();
             results.Result = false;
             results.Message = "Test did not run";
diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
index a61832a..1abef8d 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Framework.Tests
         [Test]
         public void TestRezObjectFromInventoryItem()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
             
             Scene scene = SceneHelpers.SetupScene();
@@ -98,7 +98,7 @@ namespace OpenSim.Region.Framework.Tests
         [Test]
         public void TestMoveTaskInventoryItem()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
             
             Scene scene = SceneHelpers.SetupScene();
@@ -125,7 +125,7 @@ namespace OpenSim.Region.Framework.Tests
         [Test]
         public void TestMoveTaskInventoryItemNoParent()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
             
             Scene scene = SceneHelpers.SetupScene();
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
index f6e2827..50b1a48 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UserInventoryTests.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Framework.Tests
         [Test]
         public void TestGiveInventoryItem()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
 
             Scene scene = SceneHelpers.SetupScene();
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Framework.Tests
         [Test]
         public void TestGiveInventoryFolder()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
             
             Scene scene = SceneHelpers.SetupScene();
diff --git a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
index b0ea497..24de56e 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestCorruptAsset()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             UUID corruptAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666");
             AssetBase corruptAsset 
@@ -75,7 +75,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [Test]
         public void TestMissingAsset()
         {
-            TestHelper.InMethod();
+            TestHelpers.InMethod();
             
             UUID missingAssetUuid = UUID.Parse("00000000-0000-0000-0000-000000000666");
             IDictionary<UUID, AssetType> foundAssetUuids = new Dictionary<UUID, AssetType>();