aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs3
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs11
4 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
index bd11d97..9fb1041 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
@@ -34,6 +34,7 @@ using OpenMetaverse;
34using OpenMetaverse.Packets; 34using OpenMetaverse.Packets;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Tests.Common; 36using OpenSim.Tests.Common;
37using OpenSim.Tests.Common.Mock;
37 38
38namespace OpenSim.Region.ClientStack.LindenUDP.Tests 39namespace OpenSim.Region.ClientStack.LindenUDP.Tests
39{ 40{
diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
index 88452d2..8ec14c7 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceTests.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
72 scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000, cm); 72 scene3 = SceneSetupHelpers.SetupScene("Neighbour x-1", UUID.Random(), 999, 1000, cm);
73 73
74 ISharedRegionModule interregionComms = new RESTInterregionComms(); 74 ISharedRegionModule interregionComms = new RESTInterregionComms();
75 interregionComms.Initialise(new IniConfigSource()); 75 interregionComms.Initialise( new IniConfigSource());
76 interregionComms.PostInitialise(); 76 interregionComms.PostInitialise();
77 SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), interregionComms); 77 SceneSetupHelpers.SetupSceneModules(scene, new IniConfigSource(), interregionComms);
78 SceneSetupHelpers.SetupSceneModules(scene2, new IniConfigSource(), interregionComms); 78 SceneSetupHelpers.SetupSceneModules(scene2, new IniConfigSource(), interregionComms);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
index f290dd7..358ce22 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
@@ -35,6 +35,7 @@ using Nini.Config;
35using OpenSim.Region.ScriptEngine.Shared.Api; 35using OpenSim.Region.ScriptEngine.Shared.Api;
36using OpenMetaverse; 36using OpenMetaverse;
37using System; 37using System;
38using OpenSim.Tests.Common.Mock;
38 39
39namespace OpenSim.Region.ScriptEngine.Shared.Tests 40namespace OpenSim.Region.ScriptEngine.Shared.Tests
40{ 41{
@@ -52,7 +53,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
52 public void SetUp() 53 public void SetUp()
53 { 54 {
54 55
55 IniConfigSource initConfigSource = new IniConfigSource(); 56 IConfigSource initConfigSource = new IniConfigSource();
56 IConfig config = initConfigSource.AddConfig("XEngine"); 57 IConfig config = initConfigSource.AddConfig("XEngine");
57 config.Set("Enabled", "true"); 58 config.Set("Enabled", "true");
58 59
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index b1b32cc..f418252 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -154,7 +154,7 @@ namespace OpenSim.Tests.Common.Setup
154 TestScene testScene = new TestScene( 154 TestScene testScene = new TestScene(
155 regInfo, acm, cm, scs, sm, null, false, false, false, configSource, null); 155 regInfo, acm, cm, scs, sm, null, false, false, false, configSource, null);
156 156
157 INonSharedRegionModule capsModule = new CapabilitiesModule(); 157 INonSharedRegionModule capsModule = new CapabilitiesModule();
158 capsModule.Initialise(new IniConfigSource()); 158 capsModule.Initialise(new IniConfigSource());
159 testScene.AddRegionModule(capsModule.Name, capsModule); 159 testScene.AddRegionModule(capsModule.Name, capsModule);
160 capsModule.AddRegion(testScene); 160 capsModule.AddRegion(testScene);
@@ -163,7 +163,7 @@ namespace OpenSim.Tests.Common.Setup
163 godsModule.Initialise(testScene, new IniConfigSource()); 163 godsModule.Initialise(testScene, new IniConfigSource());
164 testScene.AddModule(godsModule.Name, godsModule); 164 testScene.AddModule(godsModule.Name, godsModule);
165 realServices = realServices.ToLower(); 165 realServices = realServices.ToLower();
166 IniConfigSource config = new IniConfigSource(); 166 IConfigSource config = new IniConfigSource();
167 167
168 // If we have a brand new scene, need to initialize shared region modules 168 // If we have a brand new scene, need to initialize shared region modules
169 if ((m_assetService == null && m_inventoryService == null) || newScene) 169 if ((m_assetService == null && m_inventoryService == null) || newScene)
@@ -198,7 +198,7 @@ namespace OpenSim.Tests.Common.Setup
198 PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); 198 PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager();
199 physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll"); 199 physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll");
200 testScene.PhysicsScene 200 testScene.PhysicsScene
201 = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", configSource, "test"); 201 = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", new IniConfigSource(), "test");
202 202
203 return testScene; 203 return testScene;
204 } 204 }
@@ -206,7 +206,7 @@ namespace OpenSim.Tests.Common.Setup
206 private static void StartAssetService(Scene testScene, bool real) 206 private static void StartAssetService(Scene testScene, bool real)
207 { 207 {
208 ISharedRegionModule assetService = new LocalAssetServicesConnector(); 208 ISharedRegionModule assetService = new LocalAssetServicesConnector();
209 IniConfigSource config = new IniConfigSource(); 209 IConfigSource config = new IniConfigSource();
210 config.AddConfig("Modules"); 210 config.AddConfig("Modules");
211 config.AddConfig("AssetService"); 211 config.AddConfig("AssetService");
212 config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector"); 212 config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector");
@@ -225,7 +225,7 @@ namespace OpenSim.Tests.Common.Setup
225 private static void StartInventoryService(Scene testScene, bool real) 225 private static void StartInventoryService(Scene testScene, bool real)
226 { 226 {
227 ISharedRegionModule inventoryService = new LocalInventoryServicesConnector(); 227 ISharedRegionModule inventoryService = new LocalInventoryServicesConnector();
228 IniConfigSource config = new IniConfigSource(); 228 IConfigSource config = new IniConfigSource();
229 config.AddConfig("Modules"); 229 config.AddConfig("Modules");
230 config.AddConfig("InventoryService"); 230 config.AddConfig("InventoryService");
231 config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector"); 231 config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector");
@@ -418,4 +418,5 @@ namespace OpenSim.Tests.Common.Setup
418 sogd.InventoryDeQueueAndDelete(); 418 sogd.InventoryDeQueueAndDelete();
419 } 419 }
420 } 420 }
421
421} 422}