diff options
Diffstat (limited to 'OpenSim/Tests')
-rw-r--r-- | OpenSim/Tests/Common/Helpers/SceneHelpers.cs | 5 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestScene.cs | 4 | ||||
-rw-r--r-- | OpenSim/Tests/Common/OpenSimTestCase.cs | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs index a26e844..27705bd 100644 --- a/OpenSim/Tests/Common/Helpers/SceneHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs | |||
@@ -151,12 +151,9 @@ namespace OpenSim.Tests.Common | |||
151 | PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); | 151 | PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager(); |
152 | physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.PhysicsModule.BasicPhysics.dll"); | 152 | physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.PhysicsModule.BasicPhysics.dll"); |
153 | Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ); | 153 | Vector3 regionExtent = new Vector3( regInfo.RegionSizeX, regInfo.RegionSizeY, regInfo.RegionSizeZ); |
154 | PhysicsScene physicsScene | ||
155 | = physicsPluginManager.GetPhysicsScene( | ||
156 | "basicphysics", "ZeroMesher", new IniConfigSource(), "test", regionExtent); | ||
157 | 154 | ||
158 | TestScene testScene = new TestScene( | 155 | TestScene testScene = new TestScene( |
159 | regInfo, m_acm, physicsScene, SimDataService, m_estateDataService, configSource, null); | 156 | regInfo, m_acm, SimDataService, m_estateDataService, configSource, null); |
160 | 157 | ||
161 | INonSharedRegionModule godsModule = new GodsModule(); | 158 | INonSharedRegionModule godsModule = new GodsModule(); |
162 | godsModule.Initialise(new IniConfigSource()); | 159 | godsModule.Initialise(new IniConfigSource()); |
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs index 08cfff2..951f103 100644 --- a/OpenSim/Tests/Common/Mock/TestScene.cs +++ b/OpenSim/Tests/Common/Mock/TestScene.cs | |||
@@ -41,10 +41,10 @@ namespace OpenSim.Tests.Common | |||
41 | public class TestScene : Scene | 41 | public class TestScene : Scene |
42 | { | 42 | { |
43 | public TestScene( | 43 | public TestScene( |
44 | RegionInfo regInfo, AgentCircuitManager authen, PhysicsScene physicsScene, | 44 | RegionInfo regInfo, AgentCircuitManager authen, |
45 | ISimulationDataService simDataService, IEstateDataService estateDataService, | 45 | ISimulationDataService simDataService, IEstateDataService estateDataService, |
46 | IConfigSource config, string simulatorVersion) | 46 | IConfigSource config, string simulatorVersion) |
47 | : base(regInfo, authen, physicsScene, simDataService, estateDataService, | 47 | : base(regInfo, authen, simDataService, estateDataService, |
48 | config, simulatorVersion) | 48 | config, simulatorVersion) |
49 | { | 49 | { |
50 | } | 50 | } |
diff --git a/OpenSim/Tests/Common/OpenSimTestCase.cs b/OpenSim/Tests/Common/OpenSimTestCase.cs index c1415af..9fea348 100644 --- a/OpenSim/Tests/Common/OpenSimTestCase.cs +++ b/OpenSim/Tests/Common/OpenSimTestCase.cs | |||
@@ -38,7 +38,7 @@ namespace OpenSim.Tests.Common | |||
38 | [SetUp] | 38 | [SetUp] |
39 | public virtual void SetUp() | 39 | public virtual void SetUp() |
40 | { | 40 | { |
41 | // TestHelpers.InMethod(); | 41 | //TestHelpers.InMethod(); |
42 | // Disable logging for each test so that one where logging is enabled doesn't cause all subsequent tests | 42 | // Disable logging for each test so that one where logging is enabled doesn't cause all subsequent tests |
43 | // to have logging on if it failed with an exception. | 43 | // to have logging on if it failed with an exception. |
44 | TestHelpers.DisableLogging(); | 44 | TestHelpers.DisableLogging(); |