1 files changed, 21 insertions, 4 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs
index a61b9c2..3bc8467 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs
@@ -74,17 +74,34 @@ namespace OpenSim.Region.Environment.Scenes.Tests
             sceneB.SetModuleInterfaces();
             sceneB.RegisterRegionWithGrid();
  
-            UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000041");
-            
+            UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000041");                      
             TestClient client = SceneTestUtils.AddRootAgent(sceneA, agentId);
+ 
+            ICapabilitiesModule sceneACapsModule = sceneA.RequestModuleInterface<ICapabilitiesModule>();
             
+            Assert.That(
+                sceneACapsModule.GetCapsPath(agentId), 
+                Is.EqualTo(client.CapsSeedUrl), 
+                "Incorrect caps object path set up in sceneA");
+                        
             // FIXME: This is a hack to get the test working - really the normal OpenSim mechanisms should be used.
-            client.TeleportTargetScene = sceneB;
-            
+            client.TeleportTargetScene = sceneB;            
             client.Teleport(sceneB.RegionInfo.RegionHandle, new Vector3(100, 100, 100), new Vector3(40, 40, 40));
+            
             Assert.That(sceneB.GetScenePresence(agentId), Is.Not.Null, "Client does not have an agent in sceneB");                                   
             Assert.That(sceneA.GetScenePresence(agentId), Is.Null, "Client still had an agent in sceneA");
             
+            ICapabilitiesModule sceneBCapsModule = sceneB.RequestModuleInterface<ICapabilitiesModule>();
+            
+            // Temporary assertion - caps url construction should at least be doable through a method.
+            Assert.That(
+                "http://" + sceneB.RegionInfo.ExternalHostName + ":" + sceneB.RegionInfo.HttpPort + "/CAPS/" + sceneBCapsModule.GetCapsPath(agentId) + "0000/", 
+                Is.EqualTo(client.CapsSeedUrl), 
+                "Incorrect caps object path set up in sceneB");  
+            
+            // This assertion will currently fail since we don't remove the caps paths when no longer needed
+            //Assert.That(sceneACapsModule.GetCapsPath(agentId), Is.Null, "sceneA still had a caps object path");
+            
             // TODO: Check that more of everything is as it should be
             
             // TODO: test what happens if we try to teleport to a region that doesn't exist