diff options
author | Justin Clarke Casey | 2009-04-29 17:46:13 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-04-29 17:46:13 +0000 |
commit | c56f928c804de01f523b23c519ada63475961f1c (patch) | |
tree | f3dd5312a7b9487c4765c66c8cd5e62422907342 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests | |
parent | Again, completely revamp the unlink code to finally allow unlinking (diff) | |
download | opensim-SC_OLD-c56f928c804de01f523b23c519ada63475961f1c.zip opensim-SC_OLD-c56f928c804de01f523b23c519ada63475961f1c.tar.gz opensim-SC_OLD-c56f928c804de01f523b23c519ada63475961f1c.tar.bz2 opensim-SC_OLD-c56f928c804de01f523b23c519ada63475961f1c.tar.xz |
* Adjust load iar unit test to check load of items with creator names that exist in the system but which are not the loading user
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 24 |
1 files changed, 17 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 5ae1cbd..bdca84e 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -198,16 +198,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
198 | [Test] | 198 | [Test] |
199 | public void TestLoadIarV0p1() | 199 | public void TestLoadIarV0p1() |
200 | { | 200 | { |
201 | Console.WriteLine("Started TestLoadIarV0p1()"); | 201 | Console.WriteLine("Started {0}", MethodBase.GetCurrentMethod()); |
202 | 202 | ||
203 | log4net.Config.XmlConfigurator.Configure(); | 203 | log4net.Config.XmlConfigurator.Configure(); |
204 | 204 | ||
205 | string userFirstName = "Mr"; | 205 | string userFirstName = "Mr"; |
206 | string userLastName = "Tiddles"; | 206 | string userLastName = "Tiddles"; |
207 | UUID userUuid = UUID.Parse("00000000-0000-0000-0000-000000000555"); | 207 | UUID userUuid = UUID.Parse("00000000-0000-0000-0000-000000000555"); |
208 | string user2FirstName = "Lord"; | ||
209 | string user2LastName = "Lucan"; | ||
210 | UUID user2Uuid = UUID.Parse("00000000-0000-0000-0000-000000000666"); | ||
211 | |||
208 | string itemName = "b.lsl"; | 212 | string itemName = "b.lsl"; |
209 | string archiveItemName | 213 | string archiveItemName |
210 | = string.Format("{0}{1}{2}", itemName, "_", UUID.Random()); | 214 | = string.Format("{0}{1}{2}", itemName, "_", UUID.Random()); |
211 | 215 | ||
212 | MemoryStream archiveWriteStream = new MemoryStream(); | 216 | MemoryStream archiveWriteStream = new MemoryStream(); |
213 | TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); | 217 | TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); |
@@ -216,9 +220,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
216 | item1.Name = itemName; | 220 | item1.Name = itemName; |
217 | item1.AssetID = UUID.Random(); | 221 | item1.AssetID = UUID.Random(); |
218 | item1.GroupID = UUID.Random(); | 222 | item1.GroupID = UUID.Random(); |
219 | item1.CreatorId = userUuid.ToString(); | 223 | item1.CreatorId = OspResolver.MakeOspa(user2FirstName, user2LastName); |
224 | //item1.CreatorId = userUuid.ToString(); | ||
220 | //item1.CreatorId = "00000000-0000-0000-0000-000000000444"; | 225 | //item1.CreatorId = "00000000-0000-0000-0000-000000000444"; |
221 | item1.Owner = UUID.Parse(item1.CreatorId); | 226 | item1.Owner = UUID.Zero; |
222 | 227 | ||
223 | string item1FileName | 228 | string item1FileName |
224 | = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, archiveItemName); | 229 | = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, archiveItemName); |
@@ -231,9 +236,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
231 | 236 | ||
232 | // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene | 237 | // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene |
233 | Scene scene = SceneSetupHelpers.SetupScene(); | 238 | Scene scene = SceneSetupHelpers.SetupScene(); |
239 | IUserAdminService userAdminService = scene.CommsManager.UserAdminService; | ||
240 | |||
234 | SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); | 241 | SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); |
235 | scene.CommsManager.UserAdminService.AddUser( | 242 | userAdminService.AddUser( |
236 | userFirstName, userLastName, "meowfood", String.Empty, 1000, 1000, userUuid); | 243 | userFirstName, userLastName, "meowfood", String.Empty, 1000, 1000, userUuid); |
244 | userAdminService.AddUser( | ||
245 | user2FirstName, user2LastName, "hampshire", String.Empty, 1000, 1000, user2Uuid); | ||
246 | |||
237 | archiverModule.DearchiveInventory(userFirstName, userLastName, "/", archiveReadStream); | 247 | archiverModule.DearchiveInventory(userFirstName, userLastName, "/", archiveReadStream); |
238 | 248 | ||
239 | CachedUserInfo userInfo | 249 | CachedUserInfo userInfo |
@@ -241,10 +251,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
241 | InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName); | 251 | InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName); |
242 | 252 | ||
243 | // Currently, creator and ownership both revert to the loader | 253 | // Currently, creator and ownership both revert to the loader |
244 | Assert.That(foundItem.CreatorId, Is.EqualTo(userUuid.ToString())); | 254 | Assert.That(foundItem.CreatorId, Is.EqualTo(user2Uuid.ToString())); |
245 | Assert.That(foundItem.Owner, Is.EqualTo(userUuid)); | 255 | Assert.That(foundItem.Owner, Is.EqualTo(userUuid)); |
246 | 256 | ||
247 | Console.WriteLine("Finished TestLoadIarV0p1()"); | 257 | Console.WriteLine("Successfully completed {0}", MethodBase.GetCurrentMethod()); |
248 | } | 258 | } |
249 | 259 | ||
250 | /// <summary> | 260 | /// <summary> |