diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs index 7f25864..8c79ab4 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||
@@ -38,6 +38,7 @@ using OpenMetaverse; | |||
38 | using OpenSim.Framework; | 38 | using OpenSim.Framework; |
39 | using OpenSim.Framework.Communications; | 39 | using OpenSim.Framework.Communications; |
40 | using OpenSim.Region.CoreModules.Avatar.Attachments; | 40 | using OpenSim.Region.CoreModules.Avatar.Attachments; |
41 | using OpenSim.Region.CoreModules.Framework.InventoryAccess; | ||
41 | using OpenSim.Region.CoreModules.World.Serialiser; | 42 | using OpenSim.Region.CoreModules.World.Serialiser; |
42 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; | 43 | using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation; |
43 | using OpenSim.Region.Framework.Scenes; | 44 | using OpenSim.Region.Framework.Scenes; |
@@ -65,8 +66,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
65 | // Don't allow tests to be bamboozled by asynchronous events. Execute everything on the same thread. | 66 | // Don't allow tests to be bamboozled by asynchronous events. Execute everything on the same thread. |
66 | Util.FireAndForgetMethod = FireAndForgetMethod.None; | 67 | Util.FireAndForgetMethod = FireAndForgetMethod.None; |
67 | 68 | ||
68 | scene = SceneHelpers.SetupScene("Neighbour x", UUID.Random(), 1000, 1000); | 69 | IConfigSource config = new IniConfigSource(); |
69 | SceneHelpers.SetupSceneModules(scene, new AttachmentsModule()); | 70 | config.AddConfig("Modules"); |
71 | config.Configs["Modules"].Set("InventoryAccessModule", "BasicInventoryAccessModule"); | ||
72 | |||
73 | scene = SceneHelpers.SetupScene(); | ||
74 | SceneHelpers.SetupSceneModules(scene, config, new AttachmentsModule(), new BasicInventoryAccessModule()); | ||
70 | 75 | ||
71 | agent1 = UUID.Random(); | 76 | agent1 = UUID.Random(); |
72 | random = new Random(); | 77 | random = new Random(); |
@@ -114,16 +119,21 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
114 | TestHelpers.InMethod(); | 119 | TestHelpers.InMethod(); |
115 | // log4net.Config.XmlConfigurator.Configure(); | 120 | // log4net.Config.XmlConfigurator.Configure(); |
116 | 121 | ||
117 | UUID spId = TestHelpers.ParseTail(0x1); | 122 | UUID userId = TestHelpers.ParseTail(0x1); |
118 | UUID attItemId = TestHelpers.ParseTail(0x2); | 123 | UUID attItemId = TestHelpers.ParseTail(0x2); |
119 | UUID attAssetId = TestHelpers.ParseTail(0x3); | 124 | UUID attAssetId = TestHelpers.ParseTail(0x3); |
120 | 125 | ||
121 | AgentCircuitData acd = SceneHelpers.GenerateAgentData(spId); | 126 | UserAccountHelpers.CreateUserWithInventory(scene, userId); |
127 | InventoryItemBase attItem | ||
128 | = UserInventoryHelpers.CreateInventoryItem( | ||
129 | scene, "att", attItemId, attAssetId, userId, InventoryType.Object); | ||
130 | |||
131 | AgentCircuitData acd = SceneHelpers.GenerateAgentData(userId); | ||
122 | acd.Appearance = new AvatarAppearance(); | 132 | acd.Appearance = new AvatarAppearance(); |
123 | acd.Appearance.SetAttachment((int)AttachmentPoint.Chest, attItemId, attAssetId); | 133 | acd.Appearance.SetAttachment((int)AttachmentPoint.Chest, attItem.ID, attItem.AssetID); |
124 | ScenePresence presence = SceneHelpers.AddScenePresence(scene, acd); | 134 | ScenePresence presence = SceneHelpers.AddScenePresence(scene, acd); |
125 | 135 | ||
126 | // Assert.That(presence.HasAttachments(), Is.True); | 136 | Assert.That(presence.HasAttachments(), Is.True); |
127 | } | 137 | } |
128 | 138 | ||
129 | // I'm commenting this test because scene setup NEEDS InventoryService to | 139 | // I'm commenting this test because scene setup NEEDS InventoryService to |