From eabf5b6c3d69e83b031afdad64e75f1c7ff1f2dd Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Thu, 10 Sep 2009 17:40:07 +0100 Subject: refactor: Replace some iar item name generation in tests with helper function --- .../Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 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 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 UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000000666"); string itemName = "b.lsl"; - string archiveItemName - = string.Format("{0}{1}{2}", itemName, "_", UUID.Random()); + string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random()); MemoryStream archiveWriteStream = new MemoryStream(); TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); @@ -313,8 +312,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests //UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000008888"); string itemName = "b.lsl"; - string archiveItemName - = string.Format("{0}{1}{2}", itemName, "_", UUID.Random()); + string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random()); MemoryStream archiveWriteStream = new MemoryStream(); TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); @@ -381,8 +379,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests string user2LastName = "Mitty"; string itemName = "b.lsl"; - string archiveItemName - = string.Format("{0}{1}{2}", itemName, "_", UUID.Random()); + string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random()); MemoryStream archiveWriteStream = new MemoryStream(); TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); -- cgit v1.1