OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Extend regression TestInterRegionChatDistanceEastWest() to test in range chat both ways.

bullet-2.82
Justin Clark-Casey (justincc) 2014-05-22 19:55:34 +01:00
parent 65a135f4d3
commit 15b50ae737
1 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
OpenSim/Region/CoreModules/Avatar/Chat/Tests/ChatModuleTests.cs
View File

@ -119,39 +119,60 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat.Tests
// TODO: May need to create special complete no-op test physics module rather than basic physics, since // TODO: May need to create special complete no-op test physics module rather than basic physics, since
// physics is irrelevant to this test. // physics is irrelevant to this test.
sp1.Flying = true; sp1.Flying = true;
// 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); ScenePresence sp2 = SceneHelpers.AddScenePresence(sceneWest, sp2Uuid);
TestClient sp2Client = (TestClient)sp2.ControllingClient; TestClient sp2Client = (TestClient)sp2.ControllingClient;
// When sp2 logs in to sceneWest, it sets up a child agent in sceneEast and informs the sp2 client to
// make the connection. For this test, will simplify this chain by making the connection separately here.
ScenePresence sp2Child = SceneHelpers.AddChildScenePresence(sceneEast, sp2Uuid);
sp2.Flying = true; sp2.Flying = true;
sp2.AbsolutePosition = sp2Position;
ScenePresence sp2Child = SceneHelpers.AddChildScenePresence(sceneEast, sp2Uuid);
TestClient sp2ChildClient = (TestClient)sp2Child.ControllingClient; TestClient sp2ChildClient = (TestClient)sp2Child.ControllingClient;
// We must update the scene in order to make the new root agent sp2 in sceneWest trigger a position update to its sp2.AbsolutePosition = sp2Position;
// child in sceneEast.
sceneWest.Update(1); // We must update the scenes in order to make the root new root agents trigger position updates in their
// children.
sceneWest.Update(1);
sceneEast.Update(1);
// Check child positions are correct.
Assert.AreEqual(
new Vector3(sp1Position.X + sceneEast.RegionInfo.RegionSizeX, sp1Position.Y, sp1Position.Z),
sp1ChildClient.SceneAgent.AbsolutePosition);
// Check child position is correct.
Assert.AreEqual( 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); sp2ChildClient.SceneAgent.AbsolutePosition);
// Check chat received // Check chat from sp1
string receivedChatMessage = ""; {
string receivedChatMessage = "";
sp2ChildClient.OnReceivedChatMessage sp2ChildClient.OnReceivedChatMessage
+= (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedChatMessage = message; += (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedChatMessage = message;
string testMessage = "'ello darling"; string testMessage = "'ello darling";
sp1Client.Chat(0, ChatTypeEnum.Say, testMessage); sp1Client.Chat(0, ChatTypeEnum.Say, testMessage);
}
Assert.AreEqual(testMessage, receivedChatMessage);
// Check chat from sp2
{
string receivedChatMessage = "";
sp1ChildClient.OnReceivedChatMessage
+= (message, type, fromPos, fromName, fromAgentID, ownerID, source, audible) => receivedChatMessage = message;
string testMessage = "fantastic cats";
sp2Client.Chat(0, ChatTypeEnum.Say, testMessage);
Assert.AreEqual(testMessage, receivedChatMessage);
}
} }
} }
} }