aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-03-10 22:52:41 +0000
committerJustin Clark-Casey (justincc)2011-03-10 22:52:41 +0000
commit8d69e6831136fea089ed0ca04249bf65ba66db28 (patch)
tree04f40869f27893d344aa6ba21d375f90499da1b1 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
parentfactor out common scene setup code in InventoryArchiveTestCase (diff)
downloadopensim-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 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs28
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 79b4777..c7aad5e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -188,27 +188,27 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
188 TestHelper.InMethod(); 188 TestHelper.InMethod();
189// log4net.Config.XmlConfigurator.Configure(); 189// log4net.Config.XmlConfigurator.Configure();
190 190
191 UserProfileTestUtils.CreateUserWithInventory(m_scene, m_ua1, "meowfood"); 191 UserProfileTestUtils.CreateUserWithInventory(m_scene, m_uaMT, "meowfood");
192 UserProfileTestUtils.CreateUserWithInventory(m_scene, m_ua3, "hampshire"); 192 UserProfileTestUtils.CreateUserWithInventory(m_scene, m_uaLL2, "hampshire");
193 193
194 m_archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "/", "meowfood", m_iarStream); 194 m_archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream);
195 InventoryItemBase foundItem1 195 InventoryItemBase foundItem1
196 = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_ua1.PrincipalID, m_item1Name); 196 = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaMT.PrincipalID, m_item1Name);
197 197
198 Assert.That( 198 Assert.That(
199 foundItem1.CreatorId, Is.EqualTo(m_ua3.PrincipalID.ToString()), 199 foundItem1.CreatorId, Is.EqualTo(m_uaLL2.PrincipalID.ToString()),
200 "Loaded item non-uuid creator doesn't match original"); 200 "Loaded item non-uuid creator doesn't match original");
201 Assert.That( 201 Assert.That(
202 foundItem1.CreatorIdAsUuid, Is.EqualTo(m_ua3.PrincipalID), 202 foundItem1.CreatorIdAsUuid, Is.EqualTo(m_uaLL2.PrincipalID),
203 "Loaded item uuid creator doesn't match original"); 203 "Loaded item uuid creator doesn't match original");
204 Assert.That(foundItem1.Owner, Is.EqualTo(m_ua1.PrincipalID), 204 Assert.That(foundItem1.Owner, Is.EqualTo(m_uaMT.PrincipalID),
205 "Loaded item owner doesn't match inventory reciever"); 205 "Loaded item owner doesn't match inventory reciever");
206 206
207 AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString()); 207 AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());
208 string xmlData = Utils.BytesToString(asset1.Data); 208 string xmlData = Utils.BytesToString(asset1.Data);
209 SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData); 209 SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
210 210
211 Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_ua3.PrincipalID)); 211 Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_uaLL2.PrincipalID));
212 } 212 }
213 213
214 /// <summary> 214 /// <summary>
@@ -221,25 +221,25 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
221 TestHelper.InMethod(); 221 TestHelper.InMethod();
222// log4net.Config.XmlConfigurator.Configure(); 222// log4net.Config.XmlConfigurator.Configure();
223 223
224 UserProfileTestUtils.CreateUserWithInventory(m_scene, m_ua1, "password"); 224 UserProfileTestUtils.CreateUserWithInventory(m_scene, m_uaMT, "password");
225 m_archiverModule.DearchiveInventory(m_ua1.FirstName, m_ua1.LastName, "/", "password", m_iarStream); 225 m_archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "password", m_iarStream);
226 226
227 InventoryItemBase foundItem1 227 InventoryItemBase foundItem1
228 = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_ua1.PrincipalID, m_item1Name); 228 = InventoryArchiveUtils.FindItemByPath(m_scene.InventoryService, m_uaMT.PrincipalID, m_item1Name);
229 229
230 Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1"); 230 Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
231 Assert.That( 231 Assert.That(
232 foundItem1.CreatorId, Is.EqualTo(m_ua1.PrincipalID.ToString()), 232 foundItem1.CreatorId, Is.EqualTo(m_uaMT.PrincipalID.ToString()),
233 "Loaded item non-uuid creator doesn't match that of the loading user"); 233 "Loaded item non-uuid creator doesn't match that of the loading user");
234 Assert.That( 234 Assert.That(
235 foundItem1.CreatorIdAsUuid, Is.EqualTo(m_ua1.PrincipalID), 235 foundItem1.CreatorIdAsUuid, Is.EqualTo(m_uaMT.PrincipalID),
236 "Loaded item uuid creator doesn't match that of the loading user"); 236 "Loaded item uuid creator doesn't match that of the loading user");
237 237
238 AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString()); 238 AssetBase asset1 = m_scene.AssetService.Get(foundItem1.AssetID.ToString());
239 string xmlData = Utils.BytesToString(asset1.Data); 239 string xmlData = Utils.BytesToString(asset1.Data);
240 SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData); 240 SceneObjectGroup sog1 = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
241 241
242 Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_ua1.PrincipalID)); 242 Assert.That(sog1.RootPart.CreatorID, Is.EqualTo(m_uaMT.PrincipalID));
243 } 243 }
244 } 244 }
245} \ No newline at end of file 245} \ No newline at end of file