diff options
author | Justin Clark-Casey (justincc) | 2011-08-06 00:26:37 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-06 00:26:37 +0100 |
commit | bda1a4be4567181df6c18ce6e059ca8982bc5fa1 (patch) | |
tree | 18987d7a835a3b0cfc8f6770c5b29fb9f88959aa /OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | |
parent | extend phantom flag regression test to toggle back off (diff) | |
download | opensim-SC-bda1a4be4567181df6c18ce6e059ca8982bc5fa1.zip opensim-SC-bda1a4be4567181df6c18ce6e059ca8982bc5fa1.tar.gz opensim-SC-bda1a4be4567181df6c18ce6e059ca8982bc5fa1.tar.bz2 opensim-SC-bda1a4be4567181df6c18ce6e059ca8982bc5fa1.tar.xz |
rename test SceneSetupHelpers -> SceneHelpers for consistency
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs index a37b338..8af1b38 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs | |||
@@ -66,16 +66,16 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
66 | { | 66 | { |
67 | TestHelper.InMethod(); | 67 | TestHelper.InMethod(); |
68 | 68 | ||
69 | scene = SceneSetupHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000); | 69 | scene = SceneHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000); |
70 | scene2 = SceneSetupHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000); | 70 | scene2 = SceneHelpers.SetupScene("Neighbour x+1", UUID.Random(), 1001, 1000); |
71 | scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000); | 71 | scene3 = SceneHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000); |
72 | 72 | ||
73 | ISharedRegionModule interregionComms = new LocalSimulationConnectorModule(); | 73 | ISharedRegionModule interregionComms = new LocalSimulationConnectorModule(); |
74 | interregionComms.Initialise(new IniConfigSource()); | 74 | interregionComms.Initialise(new IniConfigSource()); |
75 | interregionComms.PostInitialise(); | 75 | interregionComms.PostInitialise(); |
76 | SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), interregionComms); | 76 | SceneHelpers.SetupSceneModules(scene, new IniConfigSource(), interregionComms); |
77 | SceneSetupHelpers.SetupSceneModules(scene2, new IniConfigSource(), interregionComms); | 77 | SceneHelpers.SetupSceneModules(scene2, new IniConfigSource(), interregionComms); |
78 | SceneSetupHelpers.SetupSceneModules(scene3, new IniConfigSource(), interregionComms); | 78 | SceneHelpers.SetupSceneModules(scene3, new IniConfigSource(), interregionComms); |
79 | 79 | ||
80 | agent1 = UUID.Random(); | 80 | agent1 = UUID.Random(); |
81 | agent2 = UUID.Random(); | 81 | agent2 = UUID.Random(); |
@@ -203,16 +203,16 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
203 | 203 | ||
204 | UUID agent1Id = UUID.Parse("00000000-0000-0000-0000-000000000001"); | 204 | UUID agent1Id = UUID.Parse("00000000-0000-0000-0000-000000000001"); |
205 | 205 | ||
206 | TestScene myScene1 = SceneSetupHelpers.SetupScene("Neighbour y", UUID.Random(), 1000, 1000); | 206 | TestScene myScene1 = SceneHelpers.SetupScene("Neighbour y", UUID.Random(), 1000, 1000); |
207 | TestScene myScene2 = SceneSetupHelpers.SetupScene("Neighbour y + 1", UUID.Random(), 1001, 1000); | 207 | TestScene myScene2 = SceneHelpers.SetupScene("Neighbour y + 1", UUID.Random(), 1001, 1000); |
208 | 208 | ||
209 | IConfigSource configSource = new IniConfigSource(); | 209 | IConfigSource configSource = new IniConfigSource(); |
210 | configSource.AddConfig("Modules").Set("EntityTransferModule", "BasicEntityTransferModule"); | 210 | configSource.AddConfig("Modules").Set("EntityTransferModule", "BasicEntityTransferModule"); |
211 | EntityTransferModule etm = new EntityTransferModule(); | 211 | EntityTransferModule etm = new EntityTransferModule(); |
212 | 212 | ||
213 | SceneSetupHelpers.SetupSceneModules(myScene1, configSource, etm); | 213 | SceneHelpers.SetupSceneModules(myScene1, configSource, etm); |
214 | 214 | ||
215 | SceneSetupHelpers.AddClient(myScene1, agent1Id); | 215 | SceneHelpers.AddClient(myScene1, agent1Id); |
216 | ScenePresence childPresence = myScene2.GetScenePresence(agent1); | 216 | ScenePresence childPresence = myScene2.GetScenePresence(agent1); |
217 | 217 | ||
218 | // TODO: Need to do a fair amount of work to allow synchronous establishment of child agents | 218 | // TODO: Need to do a fair amount of work to allow synchronous establishment of child agents |