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/InventoryArchiveTestCase.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/InventoryArchiveTestCase.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs index 31e6d75..e5127a0 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs | |||
@@ -63,17 +63,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
63 | /// </summary> | 63 | /// </summary> |
64 | protected MemoryStream m_iarStream; | 64 | protected MemoryStream m_iarStream; |
65 | 65 | ||
66 | protected UserAccount m_ua1 | 66 | protected UserAccount m_uaMT |
67 | = new UserAccount { | 67 | = new UserAccount { |
68 | PrincipalID = UUID.Parse("00000000-0000-0000-0000-000000000555"), | 68 | PrincipalID = UUID.Parse("00000000-0000-0000-0000-000000000555"), |
69 | FirstName = "Mr", | 69 | FirstName = "Mr", |
70 | LastName = "Tiddles" }; | 70 | LastName = "Tiddles" }; |
71 | protected UserAccount m_ua2 | 71 | protected UserAccount m_uaLL1 |
72 | = new UserAccount { | 72 | = new UserAccount { |
73 | PrincipalID = UUID.Parse("00000000-0000-0000-0000-000000000666"), | 73 | PrincipalID = UUID.Parse("00000000-0000-0000-0000-000000000666"), |
74 | FirstName = "Lord", | 74 | FirstName = "Lord", |
75 | LastName = "Lucan" }; | 75 | LastName = "Lucan" }; |
76 | protected UserAccount m_ua3 | 76 | protected UserAccount m_uaLL2 |
77 | = new UserAccount { | 77 | = new UserAccount { |
78 | PrincipalID = UUID.Parse("00000000-0000-0000-0000-000000000777"), | 78 | PrincipalID = UUID.Parse("00000000-0000-0000-0000-000000000777"), |
79 | FirstName = "Lord", | 79 | FirstName = "Lord", |
@@ -100,7 +100,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
100 | Scene scene = SceneSetupHelpers.SetupScene("Inventory"); | 100 | Scene scene = SceneSetupHelpers.SetupScene("Inventory"); |
101 | SceneSetupHelpers.SetupSceneModules(scene, archiverModule); | 101 | SceneSetupHelpers.SetupSceneModules(scene, archiverModule); |
102 | 102 | ||
103 | UserProfileTestUtils.CreateUserWithInventory(scene, m_ua2, "hampshire"); | 103 | UserProfileTestUtils.CreateUserWithInventory(scene, m_uaLL1, "hampshire"); |
104 | 104 | ||
105 | MemoryStream archiveWriteStream = new MemoryStream(); | 105 | MemoryStream archiveWriteStream = new MemoryStream(); |
106 | 106 | ||
@@ -134,13 +134,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
134 | item1.ID = UUID.Parse("00000000-0000-0000-0000-000000000020"); | 134 | item1.ID = UUID.Parse("00000000-0000-0000-0000-000000000020"); |
135 | item1.AssetID = asset1.FullID; | 135 | item1.AssetID = asset1.FullID; |
136 | item1.GroupID = UUID.Random(); | 136 | item1.GroupID = UUID.Random(); |
137 | item1.CreatorIdAsUuid = m_ua2.PrincipalID; | 137 | item1.CreatorIdAsUuid = m_uaLL1.PrincipalID; |
138 | item1.Owner = m_ua2.PrincipalID; | 138 | item1.Owner = m_uaLL1.PrincipalID; |
139 | item1.Folder = scene.InventoryService.GetRootFolder(m_ua2.PrincipalID).ID; | 139 | item1.Folder = scene.InventoryService.GetRootFolder(m_uaLL1.PrincipalID).ID; |
140 | scene.AddInventoryItem(item1); | 140 | scene.AddInventoryItem(item1); |
141 | 141 | ||
142 | archiverModule.ArchiveInventory( | 142 | archiverModule.ArchiveInventory( |
143 | Guid.NewGuid(), m_ua2.FirstName, m_ua2.LastName, m_item1Name, "hampshire", archiveWriteStream); | 143 | Guid.NewGuid(), m_uaLL1.FirstName, m_uaLL1.LastName, m_item1Name, "hampshire", archiveWriteStream); |
144 | 144 | ||
145 | m_iarStreamBytes = archiveWriteStream.ToArray(); | 145 | m_iarStreamBytes = archiveWriteStream.ToArray(); |
146 | } | 146 | } |