OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor: move test modules set up code to common function

0.6.3-post-fixes
Justin Clarke Casey 2009-01-23 17:55:29 +00:00
parent ee3c61247e
commit f8aea3724d
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Environment/Scenes/Tests/StandaloneTeleportTests.cs
View File

@ -61,18 +61,12 @@ namespace OpenSim.Region.Environment.Scenes.Tests
// shared module // shared module
IRegionModule interregionComms = new RESTInterregionComms(); IRegionModule interregionComms = new RESTInterregionComms();
// TODO: Clean this up Scene sceneA = SceneSetupHelpers.SetupScene("sceneA", sceneAId, 1000, 1000, cm);
Scene sceneA = SceneSetupHelpers.SetupScene("sceneA", sceneAId, 1000, 1000, cm); SceneSetupHelpers.SetupSceneModules(sceneA, new IniConfigSource(), interregionComms);
interregionComms.Initialise(sceneA, new IniConfigSource());
sceneA.AddModule(interregionComms.Name, interregionComms);
sceneA.SetModuleInterfaces();
sceneA.RegisterRegionWithGrid(); sceneA.RegisterRegionWithGrid();
// TODO: Clean this up
Scene sceneB = SceneSetupHelpers.SetupScene("sceneB", sceneBId, 1010, 1010, cm); Scene sceneB = SceneSetupHelpers.SetupScene("sceneB", sceneBId, 1010, 1010, cm);
interregionComms.Initialise(sceneB, new IniConfigSource()); SceneSetupHelpers.SetupSceneModules(sceneB, new IniConfigSource(), interregionComms);
sceneB.AddModule(interregionComms.Name, interregionComms);
sceneB.SetModuleInterfaces();
sceneB.RegisterRegionWithGrid(); sceneB.RegisterRegionWithGrid();
UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000041"); UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000041");

17
OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
View File

@ -98,6 +98,23 @@ namespace OpenSim.Tests.Common.Setup
return testScene; return testScene;
} }
/// <summary>
/// Setup the given modules for a given scene.
/// </summary>
/// <param name="scene"></param>
/// <param name="config"></param>
/// <param name="modules"></param>
public static void SetupSceneModules(Scene scene, IConfigSource config, params IRegionModule[] modules)
{
foreach (IRegionModule module in modules)
{
module.Initialise(scene, config);
scene.AddModule(module.Name, module);
}
scene.SetModuleInterfaces();
}
/// <summary> /// <summary>
/// Generate some standard agent connection data. /// Generate some standard agent connection data.
/// </summary> /// </summary>