diff options
author | Justin Clarke Casey | 2009-01-23 17:32:38 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-01-23 17:32:38 +0000 |
commit | ee3c61247e61d03ee252f373144d5c6bfecb9d6f (patch) | |
tree | 2ef31475b79dcfdcf034e3ff3404425ac8aecb15 /OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs | |
parent | * minor: remove serialization and deserializationg sog log messages for now (diff) | |
download | opensim-SC-ee3c61247e61d03ee252f373144d5c6bfecb9d6f.zip opensim-SC-ee3c61247e61d03ee252f373144d5c6bfecb9d6f.tar.gz opensim-SC-ee3c61247e61d03ee252f373144d5c6bfecb9d6f.tar.bz2 opensim-SC-ee3c61247e61d03ee252f373144d5c6bfecb9d6f.tar.xz |
* refactor: move scene setup code into common test code assembly
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs b/OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs index 3bc8467..f1ad508 100644 --- a/OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs +++ b/OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs | |||
@@ -35,6 +35,7 @@ using OpenSim.Region.Environment; | |||
35 | using OpenSim.Region.Environment.Interfaces; | 35 | using OpenSim.Region.Environment.Interfaces; |
36 | using OpenSim.Region.Environment.Modules.Communications.REST; | 36 | using OpenSim.Region.Environment.Modules.Communications.REST; |
37 | using OpenSim.Tests.Common.Mock; | 37 | using OpenSim.Tests.Common.Mock; |
38 | using OpenSim.Tests.Common.Setup; | ||
38 | 39 | ||
39 | namespace OpenSim.Region.Environment.Scenes.Tests | 40 | namespace OpenSim.Region.Environment.Scenes.Tests |
40 | { | 41 | { |
@@ -61,21 +62,21 @@ namespace OpenSim.Region.Environment.Scenes.Tests | |||
61 | IRegionModule interregionComms = new RESTInterregionComms(); | 62 | IRegionModule interregionComms = new RESTInterregionComms(); |
62 | 63 | ||
63 | // TODO: Clean this up | 64 | // TODO: Clean this up |
64 | Scene sceneA = SceneTestUtils.SetupScene("sceneA", sceneAId, 1000, 1000, cm); | 65 | Scene sceneA = SceneSetupHelpers.SetupScene("sceneA", sceneAId, 1000, 1000, cm); |
65 | interregionComms.Initialise(sceneA, new IniConfigSource()); | 66 | interregionComms.Initialise(sceneA, new IniConfigSource()); |
66 | sceneA.AddModule(interregionComms.Name, interregionComms); | 67 | sceneA.AddModule(interregionComms.Name, interregionComms); |
67 | sceneA.SetModuleInterfaces(); | 68 | sceneA.SetModuleInterfaces(); |
68 | sceneA.RegisterRegionWithGrid(); | 69 | sceneA.RegisterRegionWithGrid(); |
69 | 70 | ||
70 | // TODO: Clean this up | 71 | // TODO: Clean this up |
71 | Scene sceneB = SceneTestUtils.SetupScene("sceneB", sceneBId, 1010, 1010, cm); | 72 | Scene sceneB = SceneSetupHelpers.SetupScene("sceneB", sceneBId, 1010, 1010, cm); |
72 | interregionComms.Initialise(sceneB, new IniConfigSource()); | 73 | interregionComms.Initialise(sceneB, new IniConfigSource()); |
73 | sceneB.AddModule(interregionComms.Name, interregionComms); | 74 | sceneB.AddModule(interregionComms.Name, interregionComms); |
74 | sceneB.SetModuleInterfaces(); | 75 | sceneB.SetModuleInterfaces(); |
75 | sceneB.RegisterRegionWithGrid(); | 76 | sceneB.RegisterRegionWithGrid(); |
76 | 77 | ||
77 | UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000041"); | 78 | UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000041"); |
78 | TestClient client = SceneTestUtils.AddRootAgent(sceneA, agentId); | 79 | TestClient client = SceneSetupHelpers.AddRootAgent(sceneA, agentId); |
79 | 80 | ||
80 | ICapabilitiesModule sceneACapsModule = sceneA.RequestModuleInterface<ICapabilitiesModule>(); | 81 | ICapabilitiesModule sceneACapsModule = sceneA.RequestModuleInterface<ICapabilitiesModule>(); |
81 | 82 | ||