diff options
author | Justin Clark-Casey (justincc) | 2009-11-05 19:09:32 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-11-05 19:09:32 +0000 |
commit | 6f4a588397d5e96e9566c9b34f8be2cb3ef421a4 (patch) | |
tree | 00da369f6250db97e6c58da2d6d9a502cfe23fa9 /OpenSim/Region/CoreModules/Avatar/Inventory | |
parent | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-6f4a588397d5e96e9566c9b34f8be2cb3ef421a4.zip opensim-SC_OLD-6f4a588397d5e96e9566c9b34f8be2cb3ef421a4.tar.gz opensim-SC_OLD-6f4a588397d5e96e9566c9b34f8be2cb3ef421a4.tar.bz2 opensim-SC_OLD-6f4a588397d5e96e9566c9b34f8be2cb3ef421a4.tar.xz |
minor test var name tweak
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index b0fdcd6..81c3b74 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -136,7 +136,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
136 | InventoryFolderBase objsFolder | 136 | InventoryFolderBase objsFolder |
137 | = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects"); | 137 | = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects"); |
138 | item1.Folder = objsFolder.ID; | 138 | item1.Folder = objsFolder.ID; |
139 | scene.AddInventoryItem(userId, item1); | 139 | scene.AddInventoryItem(userId, item1); |
140 | 140 | ||
141 | MemoryStream archiveWriteStream = new MemoryStream(); | 141 | MemoryStream archiveWriteStream = new MemoryStream(); |
142 | archiverModule.OnInventoryArchiveSaved += SaveCompleted; | 142 | archiverModule.OnInventoryArchiveSaved += SaveCompleted; |
@@ -218,14 +218,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
218 | string userItemCreatorLastName = "Lucan"; | 218 | string userItemCreatorLastName = "Lucan"; |
219 | UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000000666"); | 219 | UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000000666"); |
220 | 220 | ||
221 | string itemName = "b.lsl"; | 221 | string item1Name = "b.lsl"; |
222 | string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random()); | 222 | string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(item1Name, UUID.Random()); |
223 | 223 | ||
224 | MemoryStream archiveWriteStream = new MemoryStream(); | 224 | MemoryStream archiveWriteStream = new MemoryStream(); |
225 | TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); | 225 | TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); |
226 | 226 | ||
227 | InventoryItemBase item1 = new InventoryItemBase(); | 227 | InventoryItemBase item1 = new InventoryItemBase(); |
228 | item1.Name = itemName; | 228 | item1.Name = item1Name; |
229 | item1.AssetID = UUID.Random(); | 229 | item1.AssetID = UUID.Random(); |
230 | item1.GroupID = UUID.Random(); | 230 | item1.GroupID = UUID.Random(); |
231 | item1.CreatorId = OspResolver.MakeOspa(userItemCreatorFirstName, userItemCreatorLastName); | 231 | item1.CreatorId = OspResolver.MakeOspa(userItemCreatorFirstName, userItemCreatorLastName); |
@@ -259,7 +259,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
259 | = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName); | 259 | = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName); |
260 | 260 | ||
261 | InventoryItemBase foundItem1 | 261 | InventoryItemBase foundItem1 |
262 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, itemName); | 262 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, item1Name); |
263 | 263 | ||
264 | Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1"); | 264 | Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1"); |
265 | Assert.That( | 265 | Assert.That( |
@@ -277,7 +277,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
277 | archiverModule.DearchiveInventory(userFirstName, userLastName, "xA", "meowfood", archiveReadStream); | 277 | archiverModule.DearchiveInventory(userFirstName, userLastName, "xA", "meowfood", archiveReadStream); |
278 | 278 | ||
279 | InventoryItemBase foundItem2 | 279 | InventoryItemBase foundItem2 |
280 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, "xA/" + itemName); | 280 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, "xA/" + item1Name); |
281 | Assert.That(foundItem2, Is.Not.Null, "Didn't find loaded item 2"); | 281 | Assert.That(foundItem2, Is.Not.Null, "Didn't find loaded item 2"); |
282 | 282 | ||
283 | // Now try loading to a more deeply nested folder | 283 | // Now try loading to a more deeply nested folder |
@@ -286,7 +286,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
286 | archiverModule.DearchiveInventory(userFirstName, userLastName, "xB/xC", "meowfood", archiveReadStream); | 286 | archiverModule.DearchiveInventory(userFirstName, userLastName, "xB/xC", "meowfood", archiveReadStream); |
287 | 287 | ||
288 | InventoryItemBase foundItem3 | 288 | InventoryItemBase foundItem3 |
289 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, "xB/xC/" + itemName); | 289 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, "xB/xC/" + item1Name); |
290 | Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3"); | 290 | Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3"); |
291 | } | 291 | } |
292 | 292 | ||