diff options
author | Justin Clark-Casey (justincc) | 2010-01-29 18:11:53 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-01-29 18:11:53 +0000 |
commit | ae2174d8f526b225c3cccf551f1a9f01d6569203 (patch) | |
tree | c1c6ebd0ae5a51ad404b74e07019a459f42b1064 /OpenSim/Region/CoreModules/World/Archiver/Tests | |
parent | Resolve one more conflict I overlooked (diff) | |
download | opensim-SC_OLD-ae2174d8f526b225c3cccf551f1a9f01d6569203.zip opensim-SC_OLD-ae2174d8f526b225c3cccf551f1a9f01d6569203.tar.gz opensim-SC_OLD-ae2174d8f526b225c3cccf551f1a9f01d6569203.tar.bz2 opensim-SC_OLD-ae2174d8f526b225c3cccf551f1a9f01d6569203.tar.xz |
Add method to get all items with the same name from a particular prim
Extend load oar test to check loading of a sound item
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/Tests')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index 1200105..bf80a1c 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |||
@@ -237,6 +237,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
237 | SceneObjectGroup object1 = new SceneObjectGroup(part1); | 237 | SceneObjectGroup object1 = new SceneObjectGroup(part1); |
238 | 238 | ||
239 | // Let's put some inventory items into our object | 239 | // Let's put some inventory items into our object |
240 | string soundItemName = "sound-item1"; | ||
240 | UUID soundItemUuid = UUID.Parse("00000000-0000-0000-0000-000000000002"); | 241 | UUID soundItemUuid = UUID.Parse("00000000-0000-0000-0000-000000000002"); |
241 | Type type = GetType(); | 242 | Type type = GetType(); |
242 | Assembly assembly = type.Assembly; | 243 | Assembly assembly = type.Assembly; |
@@ -269,7 +270,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
269 | asset1FileName = ArchiveConstants.ASSETS_PATH + soundUuid + ".wav"; | 270 | asset1FileName = ArchiveConstants.ASSETS_PATH + soundUuid + ".wav"; |
270 | */ | 271 | */ |
271 | 272 | ||
272 | TaskInventoryItem item1 = new TaskInventoryItem { AssetID = soundUuid, ItemID = soundItemUuid }; | 273 | TaskInventoryItem item1 |
274 | = new TaskInventoryItem { AssetID = soundUuid, ItemID = soundItemUuid, Name = soundItemName }; | ||
273 | part1.Inventory.AddInventoryItem(item1, true); | 275 | part1.Inventory.AddInventoryItem(item1, true); |
274 | } | 276 | } |
275 | } | 277 | } |
@@ -305,14 +307,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
305 | Assert.That( | 307 | Assert.That( |
306 | object1PartLoaded.OffsetPosition, Is.EqualTo(offsetPosition), "object1 offset position not equal"); | 308 | object1PartLoaded.OffsetPosition, Is.EqualTo(offsetPosition), "object1 offset position not equal"); |
307 | 309 | ||
308 | // Need to implement a method to get the task inventory item by name (since the uuid will have changed on load) | 310 | TaskInventoryItem loadedSoundItem = object1PartLoaded.Inventory.GetInventoryItems(soundItemName)[0]; |
309 | /* | ||
310 | TaskInventoryItem loadedSoundItem = object1PartLoaded.Inventory.GetInventoryItem(soundItemUuid); | ||
311 | Assert.That(loadedSoundItem, Is.Not.Null, "loaded sound item was null"); | 311 | Assert.That(loadedSoundItem, Is.Not.Null, "loaded sound item was null"); |
312 | AssetBase loadedSoundAsset = scene.AssetService.Get(loadedSoundItem.AssetID.ToString()); | 312 | AssetBase loadedSoundAsset = scene.AssetService.Get(loadedSoundItem.AssetID.ToString()); |
313 | Assert.That(loadedSoundAsset, Is.Not.Null, "loaded sound asset was null"); | 313 | Assert.That(loadedSoundAsset, Is.Not.Null, "loaded sound asset was null"); |
314 | Assert.That(loadedSoundAsset.Data, Is.EqualTo(soundData), "saved and loaded sound data do not match"); | 314 | Assert.That(loadedSoundAsset.Data, Is.EqualTo(soundData), "saved and loaded sound data do not match"); |
315 | */ | ||
316 | 315 | ||
317 | // Temporary | 316 | // Temporary |
318 | Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod()); | 317 | Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod()); |