aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
diff options
context:
space:
mode:
authoronefang2019-09-11 16:36:50 +1000
committeronefang2019-09-11 16:36:50 +1000
commit50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch)
tree52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
parentRenamed branch to SledjChisl. (diff)
parentBump to release flavour, build 0. (diff)
downloadopensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip
opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz
opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2
opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs37
1 files changed, 19 insertions, 18 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
index aadf7c6..4ec69cd 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs
@@ -42,7 +42,7 @@ using OpenSim.Tests.Common;
42namespace OpenSim.Region.Framework.Scenes.Tests 42namespace OpenSim.Region.Framework.Scenes.Tests
43{ 43{
44 [TestFixture] 44 [TestFixture]
45 public class SceneObjectUserGroupTests : OpenSimTestCase 45 public class SceneObjectUserGroupTests
46 { 46 {
47 /// <summary> 47 /// <summary>
48 /// Test share with group object functionality 48 /// Test share with group object functionality
@@ -52,31 +52,32 @@ namespace OpenSim.Region.Framework.Scenes.Tests
52 public void TestShareWithGroup() 52 public void TestShareWithGroup()
53 { 53 {
54 TestHelpers.InMethod(); 54 TestHelpers.InMethod();
55 55// log4net.Config.XmlConfigurator.Configure();
56
56 UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001"); 57 UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001");
57 58
58 TestScene scene = new SceneHelpers().SetupScene(); 59 TestScene scene = new SceneHelpers().SetupScene();
59 IConfigSource configSource = new IniConfigSource(); 60 IConfigSource configSource = new IniConfigSource();
60 61
61 IConfig startupConfig = configSource.AddConfig("Startup"); 62 IConfig startupConfig = configSource.AddConfig("Startup");
62 startupConfig.Set("serverside_object_permissions", true); 63 startupConfig.Set("serverside_object_permissions", true);
63 64
64 IConfig groupsConfig = configSource.AddConfig("Groups"); 65 IConfig groupsConfig = configSource.AddConfig("Groups");
65 groupsConfig.Set("Enabled", true); 66 groupsConfig.Set("Enabled", true);
66 groupsConfig.Set("Module", "GroupsModule"); 67 groupsConfig.Set("Module", "GroupsModule");
67 groupsConfig.Set("DebugEnabled", true); 68 groupsConfig.Set("DebugEnabled", true);
68 69
69 SceneHelpers.SetupSceneModules( 70 SceneHelpers.SetupSceneModules(
70 scene, configSource, new object[] 71 scene, configSource, new object[]
71 { new PermissionsModule(), 72 { new DefaultPermissionsModule(),
72 new GroupsModule(), 73 new GroupsModule(),
73 new MockGroupsServicesConnector() }); 74 new MockGroupsServicesConnector() });
74 75
75 IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient; 76 IClientAPI client = SceneHelpers.AddScenePresence(scene, userId).ControllingClient;
76 77
77 IGroupsModule groupsModule = scene.RequestModuleInterface<IGroupsModule>(); 78 IGroupsModule groupsModule = scene.RequestModuleInterface<IGroupsModule>();
78 79
79 groupsModule.CreateGroup(client, "group1", "To boldly go", true, UUID.Zero, 5, true, true, true); 80 groupsModule.CreateGroup(client, "group1", "To boldly go", true, UUID.Zero, 5, true, true, true);
80 } 81 }
81 } 82 }
82} \ No newline at end of file 83}