aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-02-18 22:49:19 +0000
committerJustin Clark-Casey (justincc)2011-02-18 22:49:19 +0000
commiteb699df5f6c7a68a500e38dc994ed7c2f2aa89d9 (patch)
tree571c3c288077dafedb1f976b734406c0a80f4763
parentremove another unused test teardown method (diff)
downloadopensim-SC_OLD-eb699df5f6c7a68a500e38dc994ed7c2f2aa89d9.zip
opensim-SC_OLD-eb699df5f6c7a68a500e38dc994ed7c2f2aa89d9.tar.gz
opensim-SC_OLD-eb699df5f6c7a68a500e38dc994ed7c2f2aa89d9.tar.bz2
opensim-SC_OLD-eb699df5f6c7a68a500e38dc994ed7c2f2aa89d9.tar.xz
On SceneSetupHelpers, go back to calling ScenePresence.CompleteMovement() for the last stage of AddRootAgent() instead of SP.MakeRootAgent()
Going this extra step doesn't appear to cause any test failures. This is arguably better for test purposes, though at some stage another method may arise which does just call AddRootAgent().
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs60
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs8
2 files changed, 44 insertions, 24 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index ddff896..92c73be 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -172,25 +172,6 @@ namespace OpenSim.Region.Framework.Scenes.Tests
172 172
173 Assert.That(neighbours.Count, Is.EqualTo(2)); 173 Assert.That(neighbours.Count, Is.EqualTo(2));
174 } 174 }
175
176 public void fixNullPresence()
177 {
178 string firstName = "testfirstname";
179
180 AgentCircuitData agent = new AgentCircuitData();
181 agent.AgentID = agent1;
182 agent.firstname = firstName;
183 agent.lastname = "testlastname";
184 agent.SessionID = UUID.Zero;
185 agent.SecureSessionID = UUID.Zero;
186 agent.circuitcode = 123;
187 agent.BaseFolder = UUID.Zero;
188 agent.InventoryFolder = UUID.Zero;
189 agent.startpos = Vector3.Zero;
190 agent.CapsPath = GetRandomCapsObjectPath();
191
192 acd1 = agent;
193 }
194 175
195 [Test] 176 [Test]
196 public void T013_TestRemoveNeighbourRegion() 177 public void T013_TestRemoveNeighbourRegion()
@@ -208,6 +189,28 @@ namespace OpenSim.Region.Framework.Scenes.Tests
208 CompleteAvatarMovement 189 CompleteAvatarMovement
209 */ 190 */
210 } 191 }
192
193 /// <summary>
194 /// Test that if a root agent logs into a region, a child agent is also established in the neighbouring region
195 /// </summary>
196 /// <remarks>
197 /// Please note that unlike the other tests here, this doesn't rely on structures
198 /// </remarks>
199 [Test]
200 public void TestChildAgentEstablished()
201 {
202 UUID agent1Id = UUID.Parse("00000000-0000-0000-0000-000000000001");
203
204 TestScene myScene1 = SceneSetupHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000);
205 TestScene myScene2 = SceneSetupHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000);
206
207 SceneSetupHelpers.AddRootAgent(myScene1, agent1Id);
208 ScenePresence childPresence = myScene2.GetScenePresence(agent1);
209
210 // TODO: Need to do a fair amount of work to allow synchronous establishment of child agents
211// Assert.That(childPresence, Is.Not.Null);
212// Assert.That(childPresence.IsChildAgent, Is.True);
213 }
211 214
212 // I'm commenting this test, because this is not supposed to happen here 215 // I'm commenting this test, because this is not supposed to happen here
213 //[Test] 216 //[Test]
@@ -330,7 +333,26 @@ namespace OpenSim.Region.Framework.Scenes.Tests
330 Assert.That(presence2.IsChildAgent, Is.True, "Did not return from region as expected."); 333 Assert.That(presence2.IsChildAgent, Is.True, "Did not return from region as expected.");
331 Assert.That(presence.IsChildAgent, Is.False, "Presence was not made root in old region again."); 334 Assert.That(presence.IsChildAgent, Is.False, "Presence was not made root in old region again.");
332 } 335 }
336
337 public void fixNullPresence()
338 {
339 string firstName = "testfirstname";
333 340
341 AgentCircuitData agent = new AgentCircuitData();
342 agent.AgentID = agent1;
343 agent.firstname = firstName;
344 agent.lastname = "testlastname";
345 agent.SessionID = UUID.Zero;
346 agent.SecureSessionID = UUID.Zero;
347 agent.circuitcode = 123;
348 agent.BaseFolder = UUID.Zero;
349 agent.InventoryFolder = UUID.Zero;
350 agent.startpos = Vector3.Zero;
351 agent.CapsPath = GetRandomCapsObjectPath();
352
353 acd1 = agent;
354 }
355
334 public static string GetRandomCapsObjectPath() 356 public static string GetRandomCapsObjectPath()
335 { 357 {
336 UUID caps = UUID.Random(); 358 UUID caps = UUID.Random();
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 8b16496..d199e42 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -504,12 +504,10 @@ namespace OpenSim.Tests.Common.Setup
504 TestClient client = new TestClient(agentData, scene); 504 TestClient client = new TestClient(agentData, scene);
505 scene.AddNewClient(client); 505 scene.AddNewClient(client);
506 506
507 // Stage 3: Invoke agent crossing, which converts the child agent into a root agent (with appearance, 507 // Stage 3: Complete the entrance into the region. This converts the child agent into a root agent.
508 // inventory, etc.)
509 //scene.AgentCrossing(agentData.AgentID, new Vector3(90, 90, 90), false); OBSOLETE
510
511 ScenePresence scp = scene.GetScenePresence(agentData.AgentID); 508 ScenePresence scp = scene.GetScenePresence(agentData.AgentID);
512 scp.MakeRootAgent(new Vector3(90, 90, 90), true); 509 scp.CompleteMovement(client);
510 //scp.MakeRootAgent(new Vector3(90, 90, 90), true);
513 511
514 return client; 512 return client;
515 } 513 }