diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs | 8 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Setup/UserInventoryHelpers.cs (renamed from OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs) | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs index 0446f3b..7e15a3d 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs | |||
@@ -194,7 +194,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
194 | Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1"); | 194 | Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1"); |
195 | 195 | ||
196 | // Now try loading to a root child folder | 196 | // Now try loading to a root child folder |
197 | UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, m_uaMT.PrincipalID, "xA"); | 197 | UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, m_uaMT.PrincipalID, "xA"); |
198 | MemoryStream archiveReadStream = new MemoryStream(m_iarStream.ToArray()); | 198 | MemoryStream archiveReadStream = new MemoryStream(m_iarStream.ToArray()); |
199 | archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "xA", "meowfood", archiveReadStream); | 199 | archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "xA", "meowfood", archiveReadStream); |
200 | 200 | ||
@@ -203,7 +203,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
203 | Assert.That(foundItem2, Is.Not.Null, "Didn't find loaded item 2"); | 203 | Assert.That(foundItem2, Is.Not.Null, "Didn't find loaded item 2"); |
204 | 204 | ||
205 | // Now try loading to a more deeply nested folder | 205 | // Now try loading to a more deeply nested folder |
206 | UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, m_uaMT.PrincipalID, "xB/xC"); | 206 | UserInventoryHelpers.CreateInventoryFolder(scene.InventoryService, m_uaMT.PrincipalID, "xB/xC"); |
207 | archiveReadStream = new MemoryStream(archiveReadStream.ToArray()); | 207 | archiveReadStream = new MemoryStream(archiveReadStream.ToArray()); |
208 | archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "xB/xC", "meowfood", archiveReadStream); | 208 | archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "xB/xC", "meowfood", archiveReadStream); |
209 | 209 | ||
@@ -401,7 +401,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
401 | string folder2Name = "b"; | 401 | string folder2Name = "b"; |
402 | 402 | ||
403 | InventoryFolderBase folder1 | 403 | InventoryFolderBase folder1 |
404 | = UserInventoryTestUtils.CreateInventoryFolder( | 404 | = UserInventoryHelpers.CreateInventoryFolder( |
405 | scene.InventoryService, ua1.PrincipalID, folder1ExistingName); | 405 | scene.InventoryService, ua1.PrincipalID, folder1ExistingName); |
406 | 406 | ||
407 | string folder1ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder1ExistingName, UUID.Random()); | 407 | string folder1ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder1ExistingName, UUID.Random()); |
@@ -452,7 +452,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
452 | string folder2Name = "b"; | 452 | string folder2Name = "b"; |
453 | 453 | ||
454 | InventoryFolderBase folder1 | 454 | InventoryFolderBase folder1 |
455 | = UserInventoryTestUtils.CreateInventoryFolder( | 455 | = UserInventoryHelpers.CreateInventoryFolder( |
456 | scene.InventoryService, ua1.PrincipalID, folder1ExistingName); | 456 | scene.InventoryService, ua1.PrincipalID, folder1ExistingName); |
457 | 457 | ||
458 | string folder1ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder1ExistingName, UUID.Random()); | 458 | string folder1ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder1ExistingName, UUID.Random()); |
diff --git a/OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs b/OpenSim/Tests/Common/Setup/UserInventoryHelpers.cs index 135c50e..0419134 100644 --- a/OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs +++ b/OpenSim/Tests/Common/Setup/UserInventoryHelpers.cs | |||
@@ -34,9 +34,9 @@ using OpenSim.Services.Interfaces; | |||
34 | namespace OpenSim.Tests.Common | 34 | namespace OpenSim.Tests.Common |
35 | { | 35 | { |
36 | /// <summary> | 36 | /// <summary> |
37 | /// Utility functions for carrying out user inventory related tests. | 37 | /// Utility functions for carrying out user inventory tests. |
38 | /// </summary> | 38 | /// </summary> |
39 | public static class UserInventoryTestUtils | 39 | public static class UserInventoryHelpers |
40 | { | 40 | { |
41 | public static readonly string PATH_DELIMITER = "/"; | 41 | public static readonly string PATH_DELIMITER = "/"; |
42 | 42 | ||