aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Tests
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-02-13 20:12:11 +0000
committerJustin Clarke Casey2009-02-13 20:12:11 +0000
commitb71d68c9bc79264d8011e9ce7df417e4ff1f3cb8 (patch)
tree897a3911b2ea50bc97f1bfa60d31c0608f976f35 /OpenSim/Region/Framework/Scenes/Tests
parent* refactor: move alert commands from Scene to DialogModule (diff)
downloadopensim-SC_OLD-b71d68c9bc79264d8011e9ce7df417e4ff1f3cb8.zip
opensim-SC_OLD-b71d68c9bc79264d8011e9ce7df417e4ff1f3cb8.tar.gz
opensim-SC_OLD-b71d68c9bc79264d8011e9ce7df417e4ff1f3cb8.tar.bz2
opensim-SC_OLD-b71d68c9bc79264d8011e9ce7df417e4ff1f3cb8.tar.xz
* Change static field "initialized" in RestInterregionComms to an instance field
* This was the cause of teleport tests interfering with each other
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs20
1 files changed, 9 insertions, 11 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
index e092334..64b3d67 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/StandaloneTeleportTests.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
51 [Test] 51 [Test]
52 public void TestSimpleNotNeighboursTeleport() 52 public void TestSimpleNotNeighboursTeleport()
53 { 53 {
54 //log4net.Config.XmlConfigurator.Configure(); 54 log4net.Config.XmlConfigurator.Configure();
55 55
56 UUID sceneAId = UUID.Parse("00000000-0000-0000-0000-000000000100"); 56 UUID sceneAId = UUID.Parse("00000000-0000-0000-0000-000000000100");
57 UUID sceneBId = UUID.Parse("00000000-0000-0000-0000-000000000200"); 57 UUID sceneBId = UUID.Parse("00000000-0000-0000-0000-000000000200");
@@ -80,20 +80,18 @@ namespace OpenSim.Region.Framework.Scenes.Tests
80 80
81 // FIXME: This is a hack to get the test working - really the normal OpenSim mechanisms should be used. 81 // FIXME: This is a hack to get the test working - really the normal OpenSim mechanisms should be used.
82 client.TeleportTargetScene = sceneB; 82 client.TeleportTargetScene = sceneB;
83 // Commenting this out for now -- Diva 83 client.Teleport(sceneB.RegionInfo.RegionHandle, new Vector3(100, 100, 100), new Vector3(40, 40, 40));
84 //client.Teleport(sceneB.RegionInfo.RegionHandle, new Vector3(100, 100, 100), new Vector3(40, 40, 40));
85 84
86 //Assert.That(sceneB.GetScenePresence(agentId), Is.Not.Null, "Client does not have an agent in sceneB"); 85 Assert.That(sceneB.GetScenePresence(agentId), Is.Not.Null, "Client does not have an agent in sceneB");
87 //Assert.That(sceneA.GetScenePresence(agentId), Is.Null, "Client still had an agent in sceneA"); 86 Assert.That(sceneA.GetScenePresence(agentId), Is.Null, "Client still had an agent in sceneA");
88 87
89 //ICapabilitiesModule sceneBCapsModule = sceneB.RequestModuleInterface<ICapabilitiesModule>(); 88 ICapabilitiesModule sceneBCapsModule = sceneB.RequestModuleInterface<ICapabilitiesModule>();
90 89
91 // Temporary assertion - caps url construction should at least be doable through a method. 90 // Temporary assertion - caps url construction should at least be doable through a method.
92 //Assert.That( 91 Assert.That(
93 // "http://" + sceneB.RegionInfo.ExternalHostName + ":" + sceneB.RegionInfo.HttpPort + "/CAPS/" + sceneBCapsModule.GetCapsPath(agentId) + "0000/", 92 "http://" + sceneB.RegionInfo.ExternalHostName + ":" + sceneB.RegionInfo.HttpPort + "/CAPS/" + sceneBCapsModule.GetCapsPath(agentId) + "0000/",
94 // Is.EqualTo(client.CapsSeedUrl), 93 Is.EqualTo(client.CapsSeedUrl),
95 // "Incorrect caps object path set up in sceneB"); 94 "Incorrect caps object path set up in sceneB");
96 // ---- up to here -- Diva
97 95
98 // This assertion will currently fail since we don't remove the caps paths when no longer needed 96 // This assertion will currently fail since we don't remove the caps paths when no longer needed
99 //Assert.That(sceneACapsModule.GetCapsPath(agentId), Is.Null, "sceneA still had a caps object path"); 97 //Assert.That(sceneACapsModule.GetCapsPath(agentId), Is.Null, "sceneA still had a caps object path");