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/OptionalModules | |
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/OptionalModules')
-rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs index ee52a39..1e56a08 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/Tests/GroupsModuleTests.cs | |||
@@ -50,13 +50,13 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups.Tests | |||
50 | TestHelper.InMethod(); | 50 | TestHelper.InMethod(); |
51 | // log4net.Config.XmlConfigurator.Configure(); | 51 | // log4net.Config.XmlConfigurator.Configure(); |
52 | 52 | ||
53 | TestScene scene = SceneSetupHelpers.SetupScene(); | 53 | TestScene scene = SceneHelpers.SetupScene(); |
54 | IConfigSource configSource = new IniConfigSource(); | 54 | IConfigSource configSource = new IniConfigSource(); |
55 | IConfig config = configSource.AddConfig("Groups"); | 55 | IConfig config = configSource.AddConfig("Groups"); |
56 | config.Set("Enabled", true); | 56 | config.Set("Enabled", true); |
57 | config.Set("Module", "GroupsModule"); | 57 | config.Set("Module", "GroupsModule"); |
58 | config.Set("DebugEnabled", true); | 58 | config.Set("DebugEnabled", true); |
59 | SceneSetupHelpers.SetupSceneModules( | 59 | SceneHelpers.SetupSceneModules( |
60 | scene, configSource, new object[] { new MockGroupsServicesConnector() }); | 60 | scene, configSource, new object[] { new MockGroupsServicesConnector() }); |
61 | } | 61 | } |
62 | } | 62 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs index c9dddba..c0053c9 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | |||
@@ -57,9 +57,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests | |||
57 | config.Configs["NPC"].Set("Enabled", "true"); | 57 | config.Configs["NPC"].Set("Enabled", "true"); |
58 | 58 | ||
59 | AvatarFactoryModule afm = new AvatarFactoryModule(); | 59 | AvatarFactoryModule afm = new AvatarFactoryModule(); |
60 | TestScene scene = SceneSetupHelpers.SetupScene(); | 60 | TestScene scene = SceneHelpers.SetupScene(); |
61 | SceneSetupHelpers.SetupSceneModules(scene, config, afm, new NPCModule()); | 61 | SceneHelpers.SetupSceneModules(scene, config, afm, new NPCModule()); |
62 | TestClient originalClient = SceneSetupHelpers.AddClient(scene, TestHelper.ParseTail(0x1)); | 62 | TestClient originalClient = SceneHelpers.AddClient(scene, TestHelper.ParseTail(0x1)); |
63 | // ScenePresence originalAvatar = scene.GetScenePresence(originalClient.AgentId); | 63 | // ScenePresence originalAvatar = scene.GetScenePresence(originalClient.AgentId); |
64 | 64 | ||
65 | // 8 is the index of the first baked texture in AvatarAppearance | 65 | // 8 is the index of the first baked texture in AvatarAppearance |
@@ -94,9 +94,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC.Tests | |||
94 | config.AddConfig("NPC"); | 94 | config.AddConfig("NPC"); |
95 | config.Configs["NPC"].Set("Enabled", "true"); | 95 | config.Configs["NPC"].Set("Enabled", "true"); |
96 | 96 | ||
97 | TestScene scene = SceneSetupHelpers.SetupScene(); | 97 | TestScene scene = SceneHelpers.SetupScene(); |
98 | SceneSetupHelpers.SetupSceneModules(scene, config, new NPCModule()); | 98 | SceneHelpers.SetupSceneModules(scene, config, new NPCModule()); |
99 | TestClient originalClient = SceneSetupHelpers.AddClient(scene, TestHelper.ParseTail(0x1)); | 99 | TestClient originalClient = SceneHelpers.AddClient(scene, TestHelper.ParseTail(0x1)); |
100 | // ScenePresence originalAvatar = scene.GetScenePresence(originalClient.AgentId); | 100 | // ScenePresence originalAvatar = scene.GetScenePresence(originalClient.AgentId); |
101 | 101 | ||
102 | Vector3 startPos = new Vector3(128, 128, 30); | 102 | Vector3 startPos = new Vector3(128, 128, 30); |