From 7c925744f6094a01aae40972e56fb0ec4d6f3ba5 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 15 Sep 2009 07:55:29 +0100
Subject: Some OSGrid specific changes, please use this or later for OSGrid use

---
 .../Inventory/Archiver/Tests/InventoryArchiverTests.cs     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs')

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
 
             mre.Reset();
             archiverModule.ArchiveInventory(
-                Guid.NewGuid(), userFirstName, userLastName, "Objects", archiveWriteStream);
+                Guid.NewGuid(), userFirstName, userLastName, "Objects", "troll", archiveWriteStream);
             mre.WaitOne(60000, false);
 
             byte[] archive = archiveWriteStream.ToArray();
@@ -253,7 +253,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
                 userItemCreatorFirstName, userItemCreatorLastName, "hampshire", 
                 String.Empty, 1000, 1000, userItemCreatorUuid);
             
-            archiverModule.DearchiveInventory(userFirstName, userLastName, "/", archiveReadStream);
+            archiverModule.DearchiveInventory(userFirstName, userLastName, "/", "troll", archiveReadStream);
 
             CachedUserInfo userInfo 
                 = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName);
@@ -274,7 +274,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             // Now try loading to a root child folder            
             UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userInfo.UserProfile.ID, "xA");
             archiveReadStream = new MemoryStream(archiveReadStream.ToArray());            
-            archiverModule.DearchiveInventory(userFirstName, userLastName, "xA", archiveReadStream);
+            archiverModule.DearchiveInventory(userFirstName, userLastName, "xA", "troll", archiveReadStream);
 
             InventoryItemBase foundItem2
                 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, "xA/" + itemName);
@@ -283,7 +283,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             // Now try loading to a more deeply nested folder
             UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userInfo.UserProfile.ID, "xB/xC");
             archiveReadStream = new MemoryStream(archiveReadStream.ToArray());            
-            archiverModule.DearchiveInventory(userFirstName, userLastName, "xB/xC", archiveReadStream);
+            archiverModule.DearchiveInventory(userFirstName, userLastName, "xB/xC", "troll", archiveReadStream);
 
             InventoryItemBase foundItem3
                 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, "xB/xC/" + itemName);
@@ -343,7 +343,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             userAdminService.AddUser(
                 userFirstName, userLastName, "meowfood", String.Empty, 1000, 1000, userUuid);
             
-            archiverModule.DearchiveInventory(userFirstName, userLastName, "/", archiveReadStream);
+            archiverModule.DearchiveInventory(userFirstName, userLastName, "/", "troll", archiveReadStream);
 
             CachedUserInfo userInfo 
                 = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName);
@@ -408,7 +408,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             userAdminService.AddUser(
                 userFirstName, userLastName, "meowfood", String.Empty, 1000, 1000, userUuid);
             
-            archiverModule.DearchiveInventory(userFirstName, userLastName, "/", archiveReadStream);
+            archiverModule.DearchiveInventory(userFirstName, userLastName, "/", "troll", archiveReadStream);
             
             // Check that a suitable temporary user profile has been created.
             UserProfileData user2Profile 
@@ -492,4 +492,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
             Assert.That(folder2, Is.Not.Null, "Could not find folder b");
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1