diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index 5f75c4a..b52014b 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -170,10 +170,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
170 | 170 | ||
171 | /// <summary> | 171 | /// <summary> |
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 same name as the creator, though not the same id. |
174 | /// </summary> | 174 | /// </summary> |
175 | [Test] | 175 | [Test] |
176 | public void TestLoadIarV0_1ExistingUsers() | 176 | public void TestLoadIarV0_1SameNameCreator() |
177 | { | 177 | { |
178 | TestHelper.InMethod(); | 178 | TestHelper.InMethod(); |
179 | // log4net.Config.XmlConfigurator.Configure(); | 179 | // log4net.Config.XmlConfigurator.Configure(); |
@@ -187,7 +187,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
187 | SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); | 187 | SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); |
188 | 188 | ||
189 | UserProfileTestUtils.CreateUserWithInventory(scene, m_ua1, "meowfood"); | 189 | UserProfileTestUtils.CreateUserWithInventory(scene, m_ua1, "meowfood"); |
190 | UserProfileTestUtils.CreateUserWithInventory(scene, m_ua2, "hampshire"); | 190 | UserProfileTestUtils.CreateUserWithInventory(scene, m_ua3, "hampshire"); |
191 | 191 | ||
192 | archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "/", "meowfood", m_iarStream); | 192 | archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "/", "meowfood", m_iarStream); |
193 | InventoryItemBase foundItem1 | 193 | InventoryItemBase foundItem1 |
@@ -198,12 +198,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
198 | // Assert.That( | 198 | // Assert.That( |
199 | // foundItem1.CreatorId, Is.EqualTo(item1.CreatorId), | 199 | // foundItem1.CreatorId, Is.EqualTo(item1.CreatorId), |
200 | // "Loaded item non-uuid creator doesn't match original"); | 200 | // "Loaded item non-uuid creator doesn't match original"); |
201 | // Assert.That( | ||
202 | // foundItem1.CreatorId, Is.EqualTo(m_ua2.PrincipalID.ToString()), | ||
203 | // "Loaded item non-uuid creator doesn't match original"); | ||
204 | |||
205 | Assert.That( | 201 | Assert.That( |
206 | foundItem1.CreatorIdAsUuid, Is.EqualTo(m_ua2.PrincipalID), | 202 | foundItem1.CreatorId, Is.EqualTo(m_ua3.PrincipalID.ToString()), |
203 | "Loaded item non-uuid creator doesn't match original"); | ||
204 | Assert.That( | ||
205 | foundItem1.CreatorIdAsUuid, Is.EqualTo(m_ua3.PrincipalID), | ||
207 | "Loaded item uuid creator doesn't match original"); | 206 | "Loaded item uuid creator doesn't match original"); |
208 | Assert.That(foundItem1.Owner, Is.EqualTo(m_ua1.PrincipalID), | 207 | Assert.That(foundItem1.Owner, Is.EqualTo(m_ua1.PrincipalID), |
209 | "Loaded item owner doesn't match inventory reciever"); | 208 | "Loaded item owner doesn't match inventory reciever"); |
@@ -211,10 +210,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
211 | 210 | ||
212 | /// <summary> | 211 | /// <summary> |
213 | /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where | 212 | /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where |
214 | /// embedded creators do not exist in the system | 213 | /// the creator or an account with the creator's name does not exist within the system. |
215 | /// </summary> | 214 | /// </summary> |
216 | [Test] | 215 | [Test] |
217 | public void TestLoadIarV0_1AbsentUsers() | 216 | public void TestLoadIarV0_1AbsentCreator() |
218 | { | 217 | { |
219 | TestHelper.InMethod(); | 218 | TestHelper.InMethod(); |
220 | // log4net.Config.XmlConfigurator.Configure(); | 219 | // log4net.Config.XmlConfigurator.Configure(); |