diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs (renamed from OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserTests.cs) | 10 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs | 87 |
2 files changed, 93 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs index b3b99f4..39116b6 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs | |||
@@ -43,13 +43,14 @@ using OpenSim.Tests.Common.Setup; | |||
43 | namespace OpenSim.Region.Framework.Scenes.Tests | 43 | namespace OpenSim.Region.Framework.Scenes.Tests |
44 | { | 44 | { |
45 | /// <summary> | 45 | /// <summary> |
46 | /// Tests manipulation of scene objects by users. | 46 | /// Tests derez of scene objects by users. |
47 | /// </summary> | 47 | /// </summary> |
48 | /// | 48 | /// <remarks> |
49 | /// This is at a level above the SceneObjectBasicTests, which act on the scene directly. | 49 | /// This is at a level above the SceneObjectBasicTests, which act on the scene directly. |
50 | /// FIXME: These tests are very incomplete - they only test for a few conditions. | 50 | /// TODO: These tests are very incomplete - they only test for a few conditions. |
51 | /// </remarks> | ||
51 | [TestFixture] | 52 | [TestFixture] |
52 | public class SceneObjectUserTests | 53 | public class SceneObjectDeRezTests |
53 | { | 54 | { |
54 | /// <summary> | 55 | /// <summary> |
55 | /// Test deleting an object from a scene. | 56 | /// Test deleting an object from a scene. |
@@ -122,6 +123,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
122 | scene.DeRezObjects(client, localIds, UUID.Zero, DeRezAction.Delete, UUID.Zero); | 123 | scene.DeRezObjects(client, localIds, UUID.Zero, DeRezAction.Delete, UUID.Zero); |
123 | sogd.InventoryDeQueueAndDelete(); | 124 | sogd.InventoryDeQueueAndDelete(); |
124 | 125 | ||
126 | // Object should still be in the scene. | ||
125 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); | 127 | SceneObjectPart retrievedPart = scene.GetSceneObjectPart(part.LocalId); |
126 | Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID)); | 128 | Assert.That(retrievedPart.UUID, Is.EqualTo(part.UUID)); |
127 | } | 129 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs new file mode 100644 index 0000000..c78038f --- /dev/null +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectUserGroupTests.cs | |||
@@ -0,0 +1,87 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Reflection; | ||
31 | using Nini.Config; | ||
32 | using NUnit.Framework; | ||
33 | using NUnit.Framework.SyntaxHelpers; | ||
34 | using OpenMetaverse; | ||
35 | using OpenSim.Framework; | ||
36 | using OpenSim.Framework.Communications; | ||
37 | using OpenSim.Region.CoreModules.Avatar.InstantMessage; | ||
38 | using OpenSim.Region.CoreModules.World.Permissions; | ||
39 | using OpenSim.Region.Framework.Interfaces; | ||
40 | using OpenSim.Region.Framework.Scenes; | ||
41 | using OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups; | ||
42 | using OpenSim.Tests.Common; | ||
43 | using OpenSim.Tests.Common.Mock; | ||
44 | using OpenSim.Tests.Common.Setup; | ||
45 | |||
46 | namespace OpenSim.Region.Framework.Scenes.Tests | ||
47 | { | ||
48 | [TestFixture] | ||
49 | public class SceneObjectUserGroupTests | ||
50 | { | ||
51 | /// <summary> | ||
52 | /// Test share with group object functionality | ||
53 | /// </summary> | ||
54 | /// <remarks>This test is not yet fully implemented</remarks> | ||
55 | [Test] | ||
56 | public void TestShareWithGroup() | ||
57 | { | ||
58 | TestHelper.InMethod(); | ||
59 | // log4net.Config.XmlConfigurator.Configure(); | ||
60 | |||
61 | UUID userId = UUID.Parse("10000000-0000-0000-0000-000000000001"); | ||
62 | |||
63 | TestScene scene = SceneSetupHelpers.SetupScene(); | ||
64 | IConfigSource configSource = new IniConfigSource(); | ||
65 | |||
66 | IConfig startupConfig = configSource.AddConfig("Startup"); | ||
67 | startupConfig.Set("serverside_object_permissions", true); | ||
68 | |||
69 | IConfig groupsConfig = configSource.AddConfig("Groups"); | ||
70 | groupsConfig.Set("Enabled", true); | ||
71 | groupsConfig.Set("Module", "GroupsModule"); | ||
72 | groupsConfig.Set("DebugEnabled", true); | ||
73 | |||
74 | SceneSetupHelpers.SetupSceneModules( | ||
75 | scene, configSource, new object[] | ||
76 | { new PermissionsModule(), | ||
77 | new GroupsModule(), | ||
78 | new MockGroupsServicesConnector() }); | ||
79 | |||
80 | TestClient client = SceneSetupHelpers.AddRootAgent(scene, userId); | ||
81 | |||
82 | IGroupsModule groupsModule = scene.RequestModuleInterface<IGroupsModule>(); | ||
83 | |||
84 | groupsModule.CreateGroup(client, "group1", "To boldly go", true, UUID.Zero, 5, true, true, true); | ||
85 | } | ||
86 | } | ||
87 | } \ No newline at end of file | ||