From 641c636790f3e4421e089a44e6b00fed338726eb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 9 May 2013 16:43:16 +0100
Subject: minor: Simplify test setup in SceneObjectDeRezTests since permissions
module doesn't need different configuration anymore
---
.../Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs')
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
index 52ad538..bde15cd 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
@@ -59,15 +59,11 @@ namespace OpenSim.Region.Framework.Scenes.Tests
public void TestDeRezSceneObject()
{
TestHelpers.InMethod();
-// log4net.Config.XmlConfigurator.Configure();
UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
TestScene scene = new SceneHelpers().SetupScene();
- IConfigSource configSource = new IniConfigSource();
- IConfig config = configSource.AddConfig("Startup");
- config.Set("serverside_object_permissions", true);
- SceneHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() });
+ SceneHelpers.SetupSceneModules(scene, new object[] { new PermissionsModule() });
IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
// Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
@@ -97,8 +93,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
///
/// Test deleting an object from a scene where the deleter is not the owner
///
- ///
+ ///
/// This test assumes that the deleter is not a god.
+ ///
[Test]
public void TestDeRezSceneObjectNotOwner()
{
@@ -109,10 +106,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests
UUID objectOwnerId = UUID.Parse("20000000-0000-0000-0000-000000000001");
TestScene scene = new SceneHelpers().SetupScene();
- IConfigSource configSource = new IniConfigSource();
- IConfig config = configSource.AddConfig("Startup");
- config.Set("serverside_object_permissions", true);
- SceneHelpers.SetupSceneModules(scene, configSource, new object[] { new PermissionsModule() });
+ SceneHelpers.SetupSceneModules(scene, new object[] { new PermissionsModule() });
IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
// Turn off the timer on the async sog deleter - we'll crank it by hand for this test.
--
cgit v1.1