Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 38 insertions, 29 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs
index 3018d94..5457dc3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs
@@ -41,12 +41,13 @@ using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common;
+using System.Threading;
 
 namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
 {
     [TestFixture]
     public class ChatModuleTests : OpenSimTestCase
-    {  
+    {
         [TestFixtureSetUp]
         public void FixtureInit()
         {
@@ -65,14 +66,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
         }
 
         private void SetupNeighbourRegions(TestScene sceneA, TestScene sceneB)
-        {            
-            // XXX: HTTP server is not (and should not be) necessary for this test, though it's absence makes the 
+        {
+            // XXX: HTTP server is not (and should not be) necessary for this test, though it's absence makes the
             // CapabilitiesModule complain when it can't set up HTTP endpoints.
-            //            BaseHttpServer httpServer = new BaseHttpServer(99999);
-            //            MainServer.AddHttpServer(httpServer);
-            //            MainServer.Instance = httpServer;
+            BaseHttpServer httpServer = new BaseHttpServer(99999);
+            MainServer.AddHttpServer(httpServer);
+            MainServer.Instance = httpServer;
 
-            // We need entity transfer modules so that when sp2 logs into the east region, the region calls 
+            // We need entity transfer modules so that when sp2 logs into the east region, the region calls
             // EntityTransferModuleto set up a child agent on the west region.
             // XXX: However, this is not an entity transfer so is misleading.
             EntityTransferModule etmA = new EntityTransferModule();
@@ -86,7 +87,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             modulesConfig.Set("SimulationServices", lscm.Name);
 
             SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm);
-            SceneHelpers.SetupSceneModules(sceneA, config, new CapabilitiesModule(), etmA, new ChatModule());           
+            SceneHelpers.SetupSceneModules(sceneA, config, new CapabilitiesModule(), etmA, new ChatModule());
             SceneHelpers.SetupSceneModules(sceneB, config, new CapabilitiesModule(), etmB, new ChatModule());
         }
 
@@ -110,8 +111,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             Vector3 sp2Position = new Vector3(250, 128, 20);
 
             SceneHelpers sh = new SceneHelpers();
-            TestScene sceneWest = sh.SetupScene("sceneWest", TestHelpers.ParseTail(0x1), 1000, 1000);            
-            TestScene sceneEast = sh.SetupScene("sceneEast", TestHelpers.ParseTail(0x2), 1001, 1000);            
+            TestScene sceneWest = sh.SetupScene("sceneWest", TestHelpers.ParseTail(0x1), 1000, 1000);
+            TestScene sceneEast = sh.SetupScene("sceneEast", TestHelpers.ParseTail(0x2), 1001, 1000);
 
             SetupNeighbourRegions(sceneWest, sceneEast);
 
@@ -123,12 +124,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             // physics is irrelevant to this test.
             sp1.Flying = true;
 
-            // When sp1 logs in to sceneEast, it sets up a child agent in sceneWest and informs the sp2 client to 
+            // When sp1 logs in to sceneEast, it sets up a child agent in sceneWest and informs the sp2 client to
             // make the connection.  For this test, will simplify this chain by making the connection directly.
             ScenePresence sp1Child = SceneHelpers.AddChildScenePresence(sceneWest, sp1Uuid);
             TestClient sp1ChildClient = (TestClient)sp1Child.ControllingClient;
 
-            sp1.AbsolutePosition = sp1Position;                
+            sp1.AbsolutePosition = sp1Position;
 
             ScenePresence sp2 = SceneHelpers.AddScenePresence(sceneWest, sp2Uuid);
             TestClient sp2Client = (TestClient)sp2.ControllingClient;
@@ -137,7 +138,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             ScenePresence sp2Child = SceneHelpers.AddChildScenePresence(sceneEast, sp2Uuid);
             TestClient sp2ChildClient = (TestClient)sp2Child.ControllingClient;
 
-            sp2.AbsolutePosition = sp2Position;           
+            sp2.AbsolutePosition = sp2Position;
 
             // We must update the scenes in order to make the root new root agents trigger position updates in their
             // children.
@@ -146,19 +147,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
 
             // Check child positions are correct.
             Assert.AreEqual(
-                new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z), 
+                new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z),
                 sp1ChildClient.SceneAgent.AbsolutePosition);
 
             Assert.AreEqual(
-                new Vector3(sp2Position.X - sceneWest.RegionInfo.RegionSizeX, sp2Position.Y, sp2Position.Z), 
+                new Vector3(sp2Position.X - sceneWest.RegionInfo.RegionSizeX, sp2Position.Y, sp2Position.Z),
                 sp2ChildClient.SceneAgent.AbsolutePosition);
 
             string receivedSp1ChatMessage = "";
             string receivedSp2ChatMessage = "";
 
-            sp1ChildClient.OnReceivedChatMessage 
+            sp1ChildClient.OnReceivedChatMessage
                 += (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedSp1ChatMessage = message;
-            sp2ChildClient.OnReceivedChatMessage 
+            sp2ChildClient.OnReceivedChatMessage
                 += (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedSp2ChatMessage = message;
 
             TestUserInRange(sp1Client, "ello darling", ref receivedSp2ChatMessage);
@@ -166,11 +167,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
 
             sp1Position = new Vector3(30, 128, 20);
             sp1.AbsolutePosition = sp1Position;
+            sceneWest.Update(1);
             sceneEast.Update(1);
+            Thread.Sleep(12000); // child updates are now time limited
+            sceneWest.Update(5);
+            sceneEast.Update(5);
 
             // Check child position is correct.
             Assert.AreEqual(
-                new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z), 
+                new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z),
                 sp1ChildClient.SceneAgent.AbsolutePosition);
 
             TestUserOutOfRange(sp1Client, "beef", ref receivedSp2ChatMessage);
@@ -197,8 +202,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             Vector3 sp2Position = new Vector3(128, 6, 20);
 
             SceneHelpers sh = new SceneHelpers();
-            TestScene sceneNorth = sh.SetupScene("sceneNorth", TestHelpers.ParseTail(0x1), 1000, 1000);            
-            TestScene sceneSouth = sh.SetupScene("sceneSouth", TestHelpers.ParseTail(0x2), 1000, 1001);            
+            TestScene sceneNorth = sh.SetupScene("sceneNorth", TestHelpers.ParseTail(0x1), 1000, 1000);
+            TestScene sceneSouth = sh.SetupScene("sceneSouth", TestHelpers.ParseTail(0x2), 1000, 1001);
 
             SetupNeighbourRegions(sceneNorth, sceneSouth);
 
@@ -210,12 +215,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             // physics is irrelevant to this test.
             sp1.Flying = true;
 
-            // When sp1 logs in to sceneEast, it sets up a child agent in sceneNorth and informs the sp2 client to 
+            // When sp1 logs in to sceneEast, it sets up a child agent in sceneNorth and informs the sp2 client to
             // make the connection.  For this test, will simplify this chain by making the connection directly.
             ScenePresence sp1Child = SceneHelpers.AddChildScenePresence(sceneSouth, sp1Uuid);
             TestClient sp1ChildClient = (TestClient)sp1Child.ControllingClient;
 
-            sp1.AbsolutePosition = sp1Position;                
+            sp1.AbsolutePosition = sp1Position;
 
             ScenePresence sp2 = SceneHelpers.AddScenePresence(sceneSouth, sp2Uuid);
             TestClient sp2Client = (TestClient)sp2.ControllingClient;
@@ -224,7 +229,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             ScenePresence sp2Child = SceneHelpers.AddChildScenePresence(sceneNorth, sp2Uuid);
             TestClient sp2ChildClient = (TestClient)sp2Child.ControllingClient;
 
-            sp2.AbsolutePosition = sp2Position;           
+            sp2.AbsolutePosition = sp2Position;
 
             // We must update the scenes in order to make the root new root agents trigger position updates in their
             // children.
@@ -233,19 +238,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
 
             // Check child positions are correct.
             Assert.AreEqual(
-                new Vector3(sp1Position.X, sp1Position.Y - sceneNorth.RegionInfo.RegionSizeY, sp1Position.Z), 
+                new Vector3(sp1Position.X, sp1Position.Y - sceneNorth.RegionInfo.RegionSizeY, sp1Position.Z),
                 sp1ChildClient.SceneAgent.AbsolutePosition);
 
             Assert.AreEqual(
-                new Vector3(sp2Position.X, sp2Position.Y + sceneSouth.RegionInfo.RegionSizeY, sp2Position.Z), 
+                new Vector3(sp2Position.X, sp2Position.Y + sceneSouth.RegionInfo.RegionSizeY, sp2Position.Z),
                 sp2ChildClient.SceneAgent.AbsolutePosition);
 
             string receivedSp1ChatMessage = "";
             string receivedSp2ChatMessage = "";
 
-            sp1ChildClient.OnReceivedChatMessage 
+            sp1ChildClient.OnReceivedChatMessage
                 += (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedSp1ChatMessage = message;
-            sp2ChildClient.OnReceivedChatMessage 
+            sp2ChildClient.OnReceivedChatMessage
                 += (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedSp2ChatMessage = message;
 
             TestUserInRange(sp1Client, "ello darling", ref receivedSp2ChatMessage);
@@ -254,16 +259,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
             sp1Position = new Vector3(30, 128, 20);
             sp1.AbsolutePosition = sp1Position;
             sceneNorth.Update(1);
+            sceneSouth.Update(1);
+            Thread.Sleep(12000); // child updates are now time limited
+            sceneNorth.Update(5);
+            sceneSouth.Update(5);
 
             // Check child position is correct.
             Assert.AreEqual(
-                new Vector3(sp1Position.X, sp1Position.Y - sceneNorth.RegionInfo.RegionSizeY, sp1Position.Z), 
+                new Vector3(sp1Position.X, sp1Position.Y - sceneNorth.RegionInfo.RegionSizeY, sp1Position.Z),
                 sp1ChildClient.SceneAgent.AbsolutePosition);
 
             TestUserOutOfRange(sp1Client, "beef", ref receivedSp2ChatMessage);
             TestUserOutOfRange(sp2Client, "lentils", ref receivedSp1ChatMessage);
         }
-    
+
         private void TestUserInRange(TestClient speakClient, string testMessage, ref string receivedMessage)
         {
             receivedMessage = "";