diff options
author | Justin Clark-Casey (justincc) | 2011-03-10 22:52:41 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-03-10 22:52:41 +0000 |
commit | 8d69e6831136fea089ed0ca04249bf65ba66db28 (patch) | |
tree | 04f40869f27893d344aa6ba21d375f90499da1b1 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs | |
parent | factor out common scene setup code in InventoryArchiveTestCase (diff) | |
download | opensim-SC_OLD-8d69e6831136fea089ed0ca04249bf65ba66db28.zip opensim-SC_OLD-8d69e6831136fea089ed0ca04249bf65ba66db28.tar.gz opensim-SC_OLD-8d69e6831136fea089ed0ca04249bf65ba66db28.tar.bz2 opensim-SC_OLD-8d69e6831136fea089ed0ca04249bf65ba66db28.tar.xz |
refactor: rename test user account fields
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs index 66c19f4..0e8f647 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs | |||
@@ -184,31 +184,31 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
184 | 184 | ||
185 | SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); | 185 | SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); |
186 | 186 | ||
187 | UserProfileTestUtils.CreateUserWithInventory(scene, m_ua1, "meowfood"); | 187 | UserProfileTestUtils.CreateUserWithInventory(scene, m_uaMT, "meowfood"); |
188 | UserProfileTestUtils.CreateUserWithInventory(scene, m_ua2, "hampshire"); | 188 | UserProfileTestUtils.CreateUserWithInventory(scene, m_uaLL1, "hampshire"); |
189 | 189 | ||
190 | archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "/", "meowfood", m_iarStream); | 190 | archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream); |
191 | InventoryItemBase foundItem1 | 191 | InventoryItemBase foundItem1 |
192 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_ua1.PrincipalID, m_item1Name); | 192 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_uaMT.PrincipalID, m_item1Name); |
193 | 193 | ||
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_ua1.PrincipalID, "xA"); | 197 | UserInventoryTestUtils.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_ua1.FirstName, m_ua1.LastName, "xA", "meowfood", archiveReadStream); | 199 | archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "xA", "meowfood", archiveReadStream); |
200 | 200 | ||
201 | InventoryItemBase foundItem2 | 201 | InventoryItemBase foundItem2 |
202 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_ua1.PrincipalID, "xA/" + m_item1Name); | 202 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_uaMT.PrincipalID, "xA/" + m_item1Name); |
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_ua1.PrincipalID, "xB/xC"); | 206 | UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, m_uaMT.PrincipalID, "xB/xC"); |
207 | archiveReadStream = new MemoryStream(archiveReadStream.ToArray()); | 207 | archiveReadStream = new MemoryStream(archiveReadStream.ToArray()); |
208 | archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "xB/xC", "meowfood", archiveReadStream); | 208 | archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "xB/xC", "meowfood", archiveReadStream); |
209 | 209 | ||
210 | InventoryItemBase foundItem3 | 210 | InventoryItemBase foundItem3 |
211 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_ua1.PrincipalID, "xB/xC/" + m_item1Name); | 211 | = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, m_uaMT.PrincipalID, "xB/xC/" + m_item1Name); |
212 | Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3"); | 212 | Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3"); |
213 | } | 213 | } |
214 | 214 | ||
@@ -226,12 +226,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
226 | Scene scene = SceneSetupHelpers.SetupScene("inventory"); | 226 | Scene scene = SceneSetupHelpers.SetupScene("inventory"); |
227 | SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); | 227 | SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); |
228 | 228 | ||
229 | UserProfileTestUtils.CreateUserWithInventory(scene, m_ua1, "password"); | 229 | UserProfileTestUtils.CreateUserWithInventory(scene, m_uaMT, "password"); |
230 | archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "/Objects", "password", m_iarStream); | 230 | archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/Objects", "password", m_iarStream); |
231 | 231 | ||
232 | InventoryItemBase foundItem1 | 232 | InventoryItemBase foundItem1 |
233 | = InventoryArchiveUtils.FindItemByPath( | 233 | = InventoryArchiveUtils.FindItemByPath( |
234 | scene.InventoryService, m_ua1.PrincipalID, "/Objects/" + m_item1Name); | 234 | scene.InventoryService, m_uaMT.PrincipalID, "/Objects/" + m_item1Name); |
235 | 235 | ||
236 | Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1 in TestLoadIarFolderStartsWithSlash()"); | 236 | Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1 in TestLoadIarFolderStartsWithSlash()"); |
237 | } | 237 | } |