diff options
| author | Justin Clark-Casey (justincc) | 2009-09-10 17:40:07 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2009-09-10 17:40:07 +0100 |
| commit | eabf5b6c3d69e83b031afdad64e75f1c7ff1f2dd (patch) | |
| tree | 248b7b4f1abef2dc420473353f51e389f003321c | |
| parent | fix spurious loading... messages on iar load by creating folders as version 1... (diff) | |
| download | opensim-SC_OLD-eabf5b6c3d69e83b031afdad64e75f1c7ff1f2dd.zip opensim-SC_OLD-eabf5b6c3d69e83b031afdad64e75f1c7ff1f2dd.tar.gz opensim-SC_OLD-eabf5b6c3d69e83b031afdad64e75f1c7ff1f2dd.tar.bz2 opensim-SC_OLD-eabf5b6c3d69e83b031afdad64e75f1c7ff1f2dd.tar.xz | |
refactor: Replace some iar item name generation in tests with helper function
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index 9c5f8f3..cc16c47 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
| @@ -219,8 +219,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
| 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 itemName = "b.lsl"; |
| 222 | string archiveItemName | 222 | string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random()); |
| 223 | = string.Format("{0}{1}{2}", itemName, "_", UUID.Random()); | ||
| 224 | 223 | ||
| 225 | MemoryStream archiveWriteStream = new MemoryStream(); | 224 | MemoryStream archiveWriteStream = new MemoryStream(); |
| 226 | TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); | 225 | TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); |
| @@ -313,8 +312,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
| 313 | //UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000008888"); | 312 | //UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000008888"); |
| 314 | 313 | ||
| 315 | string itemName = "b.lsl"; | 314 | string itemName = "b.lsl"; |
| 316 | string archiveItemName | 315 | string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random()); |
| 317 | = string.Format("{0}{1}{2}", itemName, "_", UUID.Random()); | ||
| 318 | 316 | ||
| 319 | MemoryStream archiveWriteStream = new MemoryStream(); | 317 | MemoryStream archiveWriteStream = new MemoryStream(); |
| 320 | TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); | 318 | TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); |
| @@ -381,8 +379,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
| 381 | string user2LastName = "Mitty"; | 379 | string user2LastName = "Mitty"; |
| 382 | 380 | ||
| 383 | string itemName = "b.lsl"; | 381 | string itemName = "b.lsl"; |
| 384 | string archiveItemName | 382 | string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random()); |
| 385 | = string.Format("{0}{1}{2}", itemName, "_", UUID.Random()); | ||
| 386 | 383 | ||
| 387 | MemoryStream archiveWriteStream = new MemoryStream(); | 384 | MemoryStream archiveWriteStream = new MemoryStream(); |
| 388 | TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); | 385 | TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); |