diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index 67d7159..5f75c4a 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -172,8 +172,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
172 | /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where | 172 | /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where |
173 | /// an account exists with the creator name. | 173 | /// an account exists with the creator name. |
174 | /// </summary> | 174 | /// </summary> |
175 | /// | ||
176 | /// This test also does some deeper probing of loading into nested inventory structures | ||
177 | [Test] | 175 | [Test] |
178 | public void TestLoadIarV0_1ExistingUsers() | 176 | public void TestLoadIarV0_1ExistingUsers() |
179 | { | 177 | { |
@@ -194,8 +192,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
194 | archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "/", "meowfood", m_iarStream); | 192 | archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "/", "meowfood", m_iarStream); |
195 | InventoryItemBase foundItem1 | 193 | InventoryItemBase foundItem1 |
196 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_ua1.PrincipalID, m_item1Name); | 194 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_ua1.PrincipalID, m_item1Name); |
197 | |||
198 | Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1"); | ||
199 | 195 | ||
200 | // We have to disable this check since loaded items that did find users via OSPA resolution are now only storing the | 196 | // We have to disable this check since loaded items that did find users via OSPA resolution are now only storing the |
201 | // UUID, not the OSPA itself. | 197 | // UUID, not the OSPA itself. |
@@ -211,24 +207,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
211 | "Loaded item uuid creator doesn't match original"); | 207 | "Loaded item uuid creator doesn't match original"); |
212 | Assert.That(foundItem1.Owner, Is.EqualTo(m_ua1.PrincipalID), | 208 | Assert.That(foundItem1.Owner, Is.EqualTo(m_ua1.PrincipalID), |
213 | "Loaded item owner doesn't match inventory reciever"); | 209 | "Loaded item owner doesn't match inventory reciever"); |
214 | |||
215 | // Now try loading to a root child folder | ||
216 | UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, m_ua1.PrincipalID, "xA"); | ||
217 | MemoryStream archiveReadStream = new MemoryStream(m_iarStream.ToArray()); | ||
218 | archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "xA", "meowfood", archiveReadStream); | ||
219 | |||
220 | InventoryItemBase foundItem2 | ||
221 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_ua1.PrincipalID, "xA/" + m_item1Name); | ||
222 | Assert.That(foundItem2, Is.Not.Null, "Didn't find loaded item 2"); | ||
223 | |||
224 | // Now try loading to a more deeply nested folder | ||
225 | UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, m_ua1.PrincipalID, "xB/xC"); | ||
226 | archiveReadStream = new MemoryStream(archiveReadStream.ToArray()); | ||
227 | archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "xB/xC", "meowfood", archiveReadStream); | ||
228 | |||
229 | InventoryItemBase foundItem3 | ||
230 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_ua1.PrincipalID, "xB/xC/" + m_item1Name); | ||
231 | Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3"); | ||
232 | } | 210 | } |
233 | 211 | ||
234 | /// <summary> | 212 | /// <summary> |