diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs index 5b334c6..373094b 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectBasicTests.cs | |||
@@ -29,10 +29,12 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using System.Threading; | 31 | using System.Threading; |
32 | using Nini.Config; | ||
32 | using NUnit.Framework; | 33 | using NUnit.Framework; |
33 | using OpenMetaverse; | 34 | using OpenMetaverse; |
34 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Communications; | 36 | using OpenSim.Framework.Communications; |
37 | using OpenSim.Region.CoreModules.Framework.InventoryAccess; | ||
36 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
37 | using OpenSim.Services.Interfaces; | 39 | using OpenSim.Services.Interfaces; |
38 | using OpenSim.Tests.Common; | 40 | using OpenSim.Tests.Common; |
@@ -239,28 +241,31 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
239 | /// <summary> | 241 | /// <summary> |
240 | /// Test deleting an object asynchronously to user inventory. | 242 | /// Test deleting an object asynchronously to user inventory. |
241 | /// </summary> | 243 | /// </summary> |
242 | // [Test] | 244 | [Test] |
243 | public void TestDeleteSceneObjectAsyncToUserInventory() | 245 | public void TestDeleteSceneObjectAsyncToUserInventory() |
244 | { | 246 | { |
245 | TestHelpers.InMethod(); | 247 | TestHelpers.InMethod(); |
246 | TestHelpers.EnableLogging(); | 248 | // TestHelpers.EnableLogging(); |
247 | 249 | ||
248 | UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); | 250 | UUID agentId = UUID.Parse("00000000-0000-0000-0000-000000000001"); |
249 | string myObjectName = "Fred"; | 251 | string myObjectName = "Fred"; |
250 | 252 | ||
251 | TestScene scene = new SceneHelpers().SetupScene(); | 253 | TestScene scene = new SceneHelpers().SetupScene(); |
252 | 254 | ||
255 | IConfigSource configSource = new IniConfigSource(); | ||
256 | IConfig config = configSource.AddConfig("Modules"); | ||
257 | config.Set("InventoryAccessModule", "BasicInventoryAccessModule"); | ||
258 | SceneHelpers.SetupSceneModules( | ||
259 | scene, configSource, new object[] { new BasicInventoryAccessModule() }); | ||
260 | |||
261 | SceneHelpers.SetupSceneModules(scene, new object[] { }); | ||
262 | |||
253 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. | 263 | // Turn off the timer on the async sog deleter - we'll crank it by hand for this test. |
254 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; | 264 | AsyncSceneObjectGroupDeleter sogd = scene.SceneObjectGroupDeleter; |
255 | sogd.Enabled = false; | 265 | sogd.Enabled = false; |
256 | 266 | ||
257 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, myObjectName, agentId); | 267 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, myObjectName, agentId); |
258 | 268 | ||
259 | // Assert.That( | ||
260 | // scene.CommsManager.UserAdminService.AddUser( | ||
261 | // "Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId), | ||
262 | // Is.EqualTo(agentId)); | ||
263 | |||
264 | UserAccount ua = UserAccountHelpers.CreateUserWithInventory(scene, agentId); | 269 | UserAccount ua = UserAccountHelpers.CreateUserWithInventory(scene, agentId); |
265 | InventoryFolderBase folder1 | 270 | InventoryFolderBase folder1 |
266 | = UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, ua.PrincipalID, "folder1"); | 271 | = UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, ua.PrincipalID, "folder1"); |