diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs index f023e77..b632774 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||
@@ -53,7 +53,6 @@ using OpenSim.Region.ScriptEngine.Interfaces; | |||
53 | using OpenSim.Region.ScriptEngine.XEngine; | 53 | using OpenSim.Region.ScriptEngine.XEngine; |
54 | using OpenSim.Services.Interfaces; | 54 | using OpenSim.Services.Interfaces; |
55 | using OpenSim.Tests.Common; | 55 | using OpenSim.Tests.Common; |
56 | using OpenSim.Tests.Common.Mock; | ||
57 | 56 | ||
58 | namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | 57 | namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests |
59 | { | 58 | { |
@@ -199,6 +198,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
199 | string attName = "att"; | 198 | string attName = "att"; |
200 | 199 | ||
201 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, attName, sp.UUID); | 200 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, attName, sp.UUID); |
201 | Assert.That(so.Backup, Is.True); | ||
202 | 202 | ||
203 | m_numberOfAttachEventsFired = 0; | 203 | m_numberOfAttachEventsFired = 0; |
204 | scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, true, false, false); | 204 | scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Chest, false, true, false, false); |
@@ -213,6 +213,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
213 | Assert.That(attSo.IsAttachment); | 213 | Assert.That(attSo.IsAttachment); |
214 | Assert.That(attSo.UsesPhysics, Is.False); | 214 | Assert.That(attSo.UsesPhysics, Is.False); |
215 | Assert.That(attSo.IsTemporary, Is.False); | 215 | Assert.That(attSo.IsTemporary, Is.False); |
216 | Assert.That(attSo.Backup, Is.False); | ||
216 | 217 | ||
217 | // Check item status | 218 | // Check item status |
218 | Assert.That( | 219 | Assert.That( |
@@ -223,7 +224,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
223 | Assert.That(attachmentItem, Is.Not.Null); | 224 | Assert.That(attachmentItem, Is.Not.Null); |
224 | Assert.That(attachmentItem.Name, Is.EqualTo(attName)); | 225 | Assert.That(attachmentItem.Name, Is.EqualTo(attName)); |
225 | 226 | ||
226 | InventoryFolderBase targetFolder = scene.InventoryService.GetFolderForType(sp.UUID, AssetType.Object); | 227 | InventoryFolderBase targetFolder = scene.InventoryService.GetFolderForType(sp.UUID, FolderType.Object); |
227 | Assert.That(attachmentItem.Folder, Is.EqualTo(targetFolder.ID)); | 228 | Assert.That(attachmentItem.Folder, Is.EqualTo(targetFolder.ID)); |
228 | 229 | ||
229 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1)); | 230 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1)); |
@@ -270,7 +271,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
270 | Assert.That(attachmentItem, Is.Not.Null); | 271 | Assert.That(attachmentItem, Is.Not.Null); |
271 | Assert.That(attachmentItem.Name, Is.EqualTo(so.Name)); | 272 | Assert.That(attachmentItem.Name, Is.EqualTo(so.Name)); |
272 | 273 | ||
273 | InventoryFolderBase targetFolder = scene.InventoryService.GetFolderForType(sp.UUID, AssetType.Object); | 274 | InventoryFolderBase targetFolder = scene.InventoryService.GetFolderForType(sp.UUID, FolderType.Object); |
274 | Assert.That(attachmentItem.Folder, Is.EqualTo(targetFolder.ID)); | 275 | Assert.That(attachmentItem.Folder, Is.EqualTo(targetFolder.ID)); |
275 | 276 | ||
276 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(2)); | 277 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(2)); |
@@ -303,7 +304,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
303 | Assert.That(attachmentItem, Is.Not.Null); | 304 | Assert.That(attachmentItem, Is.Not.Null); |
304 | Assert.That(attachmentItem.Name, Is.EqualTo(so2.Name)); | 305 | Assert.That(attachmentItem.Name, Is.EqualTo(so2.Name)); |
305 | 306 | ||
306 | InventoryFolderBase targetFolder = scene.InventoryService.GetFolderForType(sp.UUID, AssetType.Object); | 307 | InventoryFolderBase targetFolder = scene.InventoryService.GetFolderForType(sp.UUID, FolderType.Object); |
307 | Assert.That(attachmentItem.Folder, Is.EqualTo(targetFolder.ID)); | 308 | Assert.That(attachmentItem.Folder, Is.EqualTo(targetFolder.ID)); |
308 | 309 | ||
309 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1)); | 310 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1)); |
@@ -336,7 +337,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
336 | Assert.That(attachmentItem, Is.Not.Null); | 337 | Assert.That(attachmentItem, Is.Not.Null); |
337 | Assert.That(attachmentItem.Name, Is.EqualTo(so2.Name)); | 338 | Assert.That(attachmentItem.Name, Is.EqualTo(so2.Name)); |
338 | 339 | ||
339 | InventoryFolderBase targetFolder = scene.InventoryService.GetFolderForType(sp.UUID, AssetType.Object); | 340 | InventoryFolderBase targetFolder = scene.InventoryService.GetFolderForType(sp.UUID, FolderType.Object); |
340 | Assert.That(attachmentItem.Folder, Is.EqualTo(targetFolder.ID)); | 341 | Assert.That(attachmentItem.Folder, Is.EqualTo(targetFolder.ID)); |
341 | 342 | ||
342 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1)); | 343 | Assert.That(scene.GetSceneObjectGroups().Count, Is.EqualTo(1)); |
@@ -385,7 +386,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
385 | public void TestRezAttachmentFromInventory() | 386 | public void TestRezAttachmentFromInventory() |
386 | { | 387 | { |
387 | TestHelpers.InMethod(); | 388 | TestHelpers.InMethod(); |
388 | // log4net.Config.XmlConfigurator.Configure(); | 389 | // TestHelpers.EnableLogging(); |
389 | 390 | ||
390 | Scene scene = CreateTestScene(); | 391 | Scene scene = CreateTestScene(); |
391 | UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene, 0x1); | 392 | UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene, 0x1); |
@@ -407,6 +408,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
407 | Assert.That(attSo.IsAttachment); | 408 | Assert.That(attSo.IsAttachment); |
408 | Assert.That(attSo.UsesPhysics, Is.False); | 409 | Assert.That(attSo.UsesPhysics, Is.False); |
409 | Assert.That(attSo.IsTemporary, Is.False); | 410 | Assert.That(attSo.IsTemporary, Is.False); |
411 | Assert.IsFalse(attSo.Backup); | ||
410 | 412 | ||
411 | // Check appearance status | 413 | // Check appearance status |
412 | Assert.That(sp.Appearance.GetAttachments().Count, Is.EqualTo(1)); | 414 | Assert.That(sp.Appearance.GetAttachments().Count, Is.EqualTo(1)); |
@@ -544,7 +546,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
544 | SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, sp.UUID, "att-name", 0x10); | 546 | SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, sp.UUID, "att-name", 0x10); |
545 | TaskInventoryItem scriptItem | 547 | TaskInventoryItem scriptItem |
546 | = TaskInventoryHelpers.AddScript( | 548 | = TaskInventoryHelpers.AddScript( |
547 | scene, | 549 | scene.AssetService, |
548 | so.RootPart, | 550 | so.RootPart, |
549 | "scriptItem", | 551 | "scriptItem", |
550 | "default { attach(key id) { if (id != NULL_KEY) { llSay(0, \"Hello World\"); } } }"); | 552 | "default { attach(key id) { if (id != NULL_KEY) { llSay(0, \"Hello World\"); } } }"); |
@@ -601,7 +603,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
601 | Assert.That(scene.InventoryService.GetItem(new InventoryItemBase(attItem.ID)), Is.Null); | 603 | Assert.That(scene.InventoryService.GetItem(new InventoryItemBase(attItem.ID)), Is.Null); |
602 | 604 | ||
603 | // Check object in scene | 605 | // Check object in scene |
604 | Assert.That(scene.GetSceneObjectGroup("att"), Is.Not.Null); | 606 | SceneObjectGroup soInScene = scene.GetSceneObjectGroup("att"); |
607 | Assert.That(soInScene, Is.Not.Null); | ||
608 | Assert.IsTrue(soInScene.Backup); | ||
605 | 609 | ||
606 | // Check events | 610 | // Check events |
607 | Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(1)); | 611 | Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(1)); |
@@ -655,7 +659,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
655 | SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, sp.UUID, "att-name", 0x10); | 659 | SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, sp.UUID, "att-name", 0x10); |
656 | TaskInventoryItem scriptTaskItem | 660 | TaskInventoryItem scriptTaskItem |
657 | = TaskInventoryHelpers.AddScript( | 661 | = TaskInventoryHelpers.AddScript( |
658 | scene, | 662 | scene.AssetService, |
659 | so.RootPart, | 663 | so.RootPart, |
660 | "scriptItem", | 664 | "scriptItem", |
661 | "default { attach(key id) { if (id != NULL_KEY) { llSay(0, \"Hello World\"); } } }"); | 665 | "default { attach(key id) { if (id != NULL_KEY) { llSay(0, \"Hello World\"); } } }"); |
@@ -755,6 +759,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
755 | Assert.That(attSo.IsAttachment); | 759 | Assert.That(attSo.IsAttachment); |
756 | Assert.That(attSo.UsesPhysics, Is.False); | 760 | Assert.That(attSo.UsesPhysics, Is.False); |
757 | Assert.That(attSo.IsTemporary, Is.False); | 761 | Assert.That(attSo.IsTemporary, Is.False); |
762 | Assert.IsFalse(attSo.Backup); | ||
758 | 763 | ||
759 | // Check appearance status | 764 | // Check appearance status |
760 | List<AvatarAttachment> retreivedAttachments = presence.Appearance.GetAttachments(); | 765 | List<AvatarAttachment> retreivedAttachments = presence.Appearance.GetAttachments(); |
@@ -884,6 +889,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
884 | SceneObjectGroup actualSceneBAtt = actualSceneBAttachments[0]; | 889 | SceneObjectGroup actualSceneBAtt = actualSceneBAttachments[0]; |
885 | Assert.That(actualSceneBAtt.Name, Is.EqualTo(attItem.Name)); | 890 | Assert.That(actualSceneBAtt.Name, Is.EqualTo(attItem.Name)); |
886 | Assert.That(actualSceneBAtt.AttachmentPoint, Is.EqualTo((uint)AttachmentPoint.Chest)); | 891 | Assert.That(actualSceneBAtt.AttachmentPoint, Is.EqualTo((uint)AttachmentPoint.Chest)); |
892 | Assert.IsFalse(actualSceneBAtt.Backup); | ||
887 | 893 | ||
888 | Assert.That(sceneB.GetSceneObjectGroups().Count, Is.EqualTo(1)); | 894 | Assert.That(sceneB.GetSceneObjectGroups().Count, Is.EqualTo(1)); |
889 | 895 | ||
@@ -994,6 +1000,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
994 | SceneObjectGroup actualSceneBAtt = actualSceneBAttachments[0]; | 1000 | SceneObjectGroup actualSceneBAtt = actualSceneBAttachments[0]; |
995 | Assert.That(actualSceneBAtt.Name, Is.EqualTo(attItem.Name)); | 1001 | Assert.That(actualSceneBAtt.Name, Is.EqualTo(attItem.Name)); |
996 | Assert.That(actualSceneBAtt.AttachmentPoint, Is.EqualTo((uint)AttachmentPoint.Chest)); | 1002 | Assert.That(actualSceneBAtt.AttachmentPoint, Is.EqualTo((uint)AttachmentPoint.Chest)); |
1003 | Assert.IsFalse(actualSceneBAtt.Backup); | ||
997 | 1004 | ||
998 | Assert.That(sceneB.GetSceneObjectGroups().Count, Is.EqualTo(1)); | 1005 | Assert.That(sceneB.GetSceneObjectGroups().Count, Is.EqualTo(1)); |
999 | 1006 | ||