diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests')
-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 cc16c47..8a414f9 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -143,7 +143,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
143 | 143 | ||
144 | mre.Reset(); | 144 | mre.Reset(); |
145 | archiverModule.ArchiveInventory( | 145 | archiverModule.ArchiveInventory( |
146 | Guid.NewGuid(), userFirstName, userLastName, "Objects", archiveWriteStream); | 146 | Guid.NewGuid(), userFirstName, userLastName, "Objects", "troll", archiveWriteStream); |
147 | mre.WaitOne(60000, false); | 147 | mre.WaitOne(60000, false); |
148 | 148 | ||
149 | byte[] archive = archiveWriteStream.ToArray(); | 149 | byte[] archive = archiveWriteStream.ToArray(); |
@@ -253,7 +253,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
253 | userItemCreatorFirstName, userItemCreatorLastName, "hampshire", | 253 | userItemCreatorFirstName, userItemCreatorLastName, "hampshire", |
254 | String.Empty, 1000, 1000, userItemCreatorUuid); | 254 | String.Empty, 1000, 1000, userItemCreatorUuid); |
255 | 255 | ||
256 | archiverModule.DearchiveInventory(userFirstName, userLastName, "/", archiveReadStream); | 256 | archiverModule.DearchiveInventory(userFirstName, userLastName, "/", "troll", archiveReadStream); |
257 | 257 | ||
258 | CachedUserInfo userInfo | 258 | CachedUserInfo userInfo |
259 | = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName); | 259 | = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName); |
@@ -274,7 +274,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
274 | // Now try loading to a root child folder | 274 | // Now try loading to a root child folder |
275 | UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userInfo.UserProfile.ID, "xA"); | 275 | UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userInfo.UserProfile.ID, "xA"); |
276 | archiveReadStream = new MemoryStream(archiveReadStream.ToArray()); | 276 | archiveReadStream = new MemoryStream(archiveReadStream.ToArray()); |
277 | archiverModule.DearchiveInventory(userFirstName, userLastName, "xA", archiveReadStream); | 277 | archiverModule.DearchiveInventory(userFirstName, userLastName, "xA", "troll", 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/" + itemName); |
@@ -283,7 +283,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
283 | // Now try loading to a more deeply nested folder | 283 | // Now try loading to a more deeply nested folder |
284 | UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userInfo.UserProfile.ID, "xB/xC"); | 284 | UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userInfo.UserProfile.ID, "xB/xC"); |
285 | archiveReadStream = new MemoryStream(archiveReadStream.ToArray()); | 285 | archiveReadStream = new MemoryStream(archiveReadStream.ToArray()); |
286 | archiverModule.DearchiveInventory(userFirstName, userLastName, "xB/xC", archiveReadStream); | 286 | archiverModule.DearchiveInventory(userFirstName, userLastName, "xB/xC", "troll", 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/" + itemName); |
@@ -343,7 +343,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
343 | userAdminService.AddUser( | 343 | userAdminService.AddUser( |
344 | userFirstName, userLastName, "meowfood", String.Empty, 1000, 1000, userUuid); | 344 | userFirstName, userLastName, "meowfood", String.Empty, 1000, 1000, userUuid); |
345 | 345 | ||
346 | archiverModule.DearchiveInventory(userFirstName, userLastName, "/", archiveReadStream); | 346 | archiverModule.DearchiveInventory(userFirstName, userLastName, "/", "troll", archiveReadStream); |
347 | 347 | ||
348 | CachedUserInfo userInfo | 348 | CachedUserInfo userInfo |
349 | = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName); | 349 | = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName); |
@@ -408,7 +408,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
408 | userAdminService.AddUser( | 408 | userAdminService.AddUser( |
409 | userFirstName, userLastName, "meowfood", String.Empty, 1000, 1000, userUuid); | 409 | userFirstName, userLastName, "meowfood", String.Empty, 1000, 1000, userUuid); |
410 | 410 | ||
411 | archiverModule.DearchiveInventory(userFirstName, userLastName, "/", archiveReadStream); | 411 | archiverModule.DearchiveInventory(userFirstName, userLastName, "/", "troll", archiveReadStream); |
412 | 412 | ||
413 | // Check that a suitable temporary user profile has been created. | 413 | // Check that a suitable temporary user profile has been created. |
414 | UserProfileData user2Profile | 414 | UserProfileData user2Profile |
@@ -492,4 +492,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
492 | Assert.That(folder2, Is.Not.Null, "Could not find folder b"); | 492 | Assert.That(folder2, Is.Not.Null, "Could not find folder b"); |
493 | } | 493 | } |
494 | } | 494 | } |
495 | } \ No newline at end of file | 495 | } |