aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-05-21 00:11:52 +0100
committerJustin Clark-Casey (justincc)2011-05-21 00:11:52 +0100
commit534ee52a121c209752101476e031a2c097637d82 (patch)
treef641f53c3ffb9e62ce76530eb83f79caf0e83670
parentrefactor: in TaskInventoryTests, use UserProfileTestUtils.CreateUserWithInvet... (diff)
downloadopensim-SC-534ee52a121c209752101476e031a2c097637d82.zip
opensim-SC-534ee52a121c209752101476e031a2c097637d82.tar.gz
opensim-SC-534ee52a121c209752101476e031a2c097637d82.tar.bz2
opensim-SC-534ee52a121c209752101476e031a2c097637d82.tar.xz
rename UserProfileTestUtils to UserAccountHelpers to be consistent with other test helper names
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs12
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs16
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs6
-rw-r--r--OpenSim/Tests/Common/Setup/UserAccountHelpers.cs (renamed from OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs)2
6 files changed, 20 insertions, 20 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
index 5ba08ee..9421f22 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveTestCase.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
104 Scene scene = SceneSetupHelpers.SetupScene(); 104 Scene scene = SceneSetupHelpers.SetupScene();
105 SceneSetupHelpers.SetupSceneModules(scene, archiverModule); 105 SceneSetupHelpers.SetupSceneModules(scene, archiverModule);
106 106
107 UserProfileTestUtils.CreateUserWithInventory(scene, m_uaLL1, "hampshire"); 107 UserAccountHelpers.CreateUserWithInventory(scene, m_uaLL1, "hampshire");
108 108
109 MemoryStream archiveWriteStream = new MemoryStream(); 109 MemoryStream archiveWriteStream = new MemoryStream();
110 110
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index 52232a0..db57d90 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
72 TestHelper.InMethod(); 72 TestHelper.InMethod();
73// log4net.Config.XmlConfigurator.Configure(); 73// log4net.Config.XmlConfigurator.Configure();
74 74
75 UserProfileTestUtils.CreateUserWithInventory(m_scene, m_uaLL1, "password"); 75 UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL1, "password");
76 m_archiverModule.DearchiveInventory(m_uaLL1.FirstName, m_uaLL1.LastName, "/", "password", m_iarStream); 76 m_archiverModule.DearchiveInventory(m_uaLL1.FirstName, m_uaLL1.LastName, "/", "password", m_iarStream);
77 77
78 InventoryItemBase coaItem 78 InventoryItemBase coaItem
@@ -138,7 +138,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
138 string userLastName = "Stirrup"; 138 string userLastName = "Stirrup";
139 string userPassword = "troll"; 139 string userPassword = "troll";
140 UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020"); 140 UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
141 UserProfileTestUtils.CreateUserWithInventory(m_scene, userFirstName, userLastName, userId, userPassword); 141 UserAccountHelpers.CreateUserWithInventory(m_scene, userFirstName, userLastName, userId, userPassword);
142 142
143 // Create asset 143 // Create asset
144 UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040"); 144 UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040");
@@ -229,7 +229,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
229 TestHelper.InMethod(); 229 TestHelper.InMethod();
230// log4net.Config.XmlConfigurator.Configure(); 230// log4net.Config.XmlConfigurator.Configure();
231 231
232 UserProfileTestUtils.CreateUserWithInventory(m_scene, m_uaLL1, "meowfood"); 232 UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL1, "meowfood");
233 233
234 m_archiverModule.DearchiveInventory(m_uaLL1.FirstName, m_uaLL1.LastName, "/", "meowfood", m_iarStream); 234 m_archiverModule.DearchiveInventory(m_uaLL1.FirstName, m_uaLL1.LastName, "/", "meowfood", m_iarStream);
235 InventoryItemBase foundItem1 235 InventoryItemBase foundItem1
@@ -261,8 +261,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
261 TestHelper.InMethod(); 261 TestHelper.InMethod();
262// log4net.Config.XmlConfigurator.Configure(); 262// log4net.Config.XmlConfigurator.Configure();
263 263
264 UserProfileTestUtils.CreateUserWithInventory(m_scene, m_uaMT, "meowfood"); 264 UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaMT, "meowfood");
265 UserProfileTestUtils.CreateUserWithInventory(m_scene, m_uaLL2, "hampshire"); 265 UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaLL2, "hampshire");
266 266
267 m_archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream); 267 m_archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream);
268 InventoryItemBase foundItem1 268 InventoryItemBase foundItem1
@@ -294,7 +294,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
294 TestHelper.InMethod(); 294 TestHelper.InMethod();
295// log4net.Config.XmlConfigurator.Configure(); 295// log4net.Config.XmlConfigurator.Configure();
296 296
297 UserProfileTestUtils.CreateUserWithInventory(m_scene, m_uaMT, "password"); 297 UserAccountHelpers.CreateUserWithInventory(m_scene, m_uaMT, "password");
298 m_archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "password", m_iarStream); 298 m_archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "password", m_iarStream);
299 299
300 InventoryItemBase foundItem1 300 InventoryItemBase foundItem1
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs
index c7dae52..0446f3b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/PathTests.cs
@@ -71,7 +71,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
71 string userLastName = "Stirrup"; 71 string userLastName = "Stirrup";
72 string userPassword = "troll"; 72 string userPassword = "troll";
73 UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020"); 73 UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
74 UserProfileTestUtils.CreateUserWithInventory(scene, userFirstName, userLastName, userId, userPassword); 74 UserAccountHelpers.CreateUserWithInventory(scene, userFirstName, userLastName, userId, userPassword);
75 75
76 // Create asset 76 // Create asset
77 SceneObjectGroup object1; 77 SceneObjectGroup object1;
@@ -184,8 +184,8 @@ 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_uaMT, "meowfood"); 187 UserAccountHelpers.CreateUserWithInventory(scene, m_uaMT, "meowfood");
188 UserProfileTestUtils.CreateUserWithInventory(scene, m_uaLL1, "hampshire"); 188 UserAccountHelpers.CreateUserWithInventory(scene, m_uaLL1, "hampshire");
189 189
190 archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream); 190 archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.LastName, "/", "meowfood", m_iarStream);
191 InventoryItemBase foundItem1 191 InventoryItemBase foundItem1
@@ -226,7 +226,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
226 Scene scene = SceneSetupHelpers.SetupScene(); 226 Scene scene = SceneSetupHelpers.SetupScene();
227 SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); 227 SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
228 228
229 UserProfileTestUtils.CreateUserWithInventory(scene, m_uaMT, "password"); 229 UserAccountHelpers.CreateUserWithInventory(scene, m_uaMT, "password");
230 archiverModule.DearchiveInventory(m_uaMT.FirstName, m_uaMT.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
@@ -255,7 +255,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
255 string userFirstName = "Jock"; 255 string userFirstName = "Jock";
256 string userLastName = "Stirrup"; 256 string userLastName = "Stirrup";
257 UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020"); 257 UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
258 UserProfileTestUtils.CreateUserWithInventory(scene, userFirstName, userLastName, userId, "meowfood"); 258 UserAccountHelpers.CreateUserWithInventory(scene, userFirstName, userLastName, userId, "meowfood");
259 259
260 // Create asset 260 // Create asset
261 SceneObjectGroup object1; 261 SceneObjectGroup object1;
@@ -328,7 +328,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
328// log4net.Config.XmlConfigurator.Configure(); 328// log4net.Config.XmlConfigurator.Configure();
329 329
330 Scene scene = SceneSetupHelpers.SetupScene(); 330 Scene scene = SceneSetupHelpers.SetupScene();
331 UserAccount ua1 = UserProfileTestUtils.CreateUserWithInventory(scene); 331 UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene);
332 332
333 Dictionary <string, InventoryFolderBase> foldersCreated = new Dictionary<string, InventoryFolderBase>(); 333 Dictionary <string, InventoryFolderBase> foldersCreated = new Dictionary<string, InventoryFolderBase>();
334 HashSet<InventoryNodeBase> nodesLoaded = new HashSet<InventoryNodeBase>(); 334 HashSet<InventoryNodeBase> nodesLoaded = new HashSet<InventoryNodeBase>();
@@ -395,7 +395,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
395 //log4net.Config.XmlConfigurator.Configure(); 395 //log4net.Config.XmlConfigurator.Configure();
396 396
397 Scene scene = SceneSetupHelpers.SetupScene(); 397 Scene scene = SceneSetupHelpers.SetupScene();
398 UserAccount ua1 = UserProfileTestUtils.CreateUserWithInventory(scene); 398 UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene);
399 399
400 string folder1ExistingName = "a"; 400 string folder1ExistingName = "a";
401 string folder2Name = "b"; 401 string folder2Name = "b";
@@ -446,7 +446,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
446// log4net.Config.XmlConfigurator.Configure(); 446// log4net.Config.XmlConfigurator.Configure();
447 447
448 Scene scene = SceneSetupHelpers.SetupScene(); 448 Scene scene = SceneSetupHelpers.SetupScene();
449 UserAccount ua1 = UserProfileTestUtils.CreateUserWithInventory(scene); 449 UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(scene);
450 450
451 string folder1ExistingName = "a"; 451 string folder1ExistingName = "a";
452 string folder2Name = "b"; 452 string folder2Name = "b";
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
index 8d53cf1..75faab0 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
73 string userFirstName = "Jock"; 73 string userFirstName = "Jock";
74 string userLastName = "Stirrup"; 74 string userLastName = "Stirrup";
75 string userPassword = "troll"; 75 string userPassword = "troll";
76 UserProfileTestUtils.CreateUserWithInventory(m_scene, userFirstName, userLastName, m_userId, userPassword); 76 UserAccountHelpers.CreateUserWithInventory(m_scene, userFirstName, userLastName, m_userId, userPassword);
77 77
78 AgentCircuitData acd = new AgentCircuitData(); 78 AgentCircuitData acd = new AgentCircuitData();
79 acd.AgentID = m_userId; 79 acd.AgentID = m_userId;
diff --git a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
index 4f5018a..e830500 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/TaskInventoryTests.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Region.Framework.Tests
89// log4net.Config.XmlConfigurator.Configure(); 89// log4net.Config.XmlConfigurator.Configure();
90 90
91 Scene scene = SceneSetupHelpers.SetupScene(); 91 Scene scene = SceneSetupHelpers.SetupScene();
92 UserAccount user1 = UserProfileTestUtils.CreateUserWithInventory(scene); 92 UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
93 SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID); 93 SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID);
94 SceneObjectPart sop1 = sog1.RootPart; 94 SceneObjectPart sop1 = sog1.RootPart;
95 95
@@ -139,7 +139,7 @@ namespace OpenSim.Region.Framework.Tests
139// log4net.Config.XmlConfigurator.Configure(); 139// log4net.Config.XmlConfigurator.Configure();
140 140
141 Scene scene = SceneSetupHelpers.SetupScene(); 141 Scene scene = SceneSetupHelpers.SetupScene();
142 UserAccount user1 = UserProfileTestUtils.CreateUserWithInventory(scene); 142 UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
143 SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID); 143 SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID);
144 SceneObjectPart sop1 = sog1.RootPart; 144 SceneObjectPart sop1 = sog1.RootPart;
145 TaskInventoryItem sopItem1 = CreateSOItem1(scene, sop1); 145 TaskInventoryItem sopItem1 = CreateSOItem1(scene, sop1);
@@ -165,7 +165,7 @@ namespace OpenSim.Region.Framework.Tests
165// log4net.Config.XmlConfigurator.Configure(); 165// log4net.Config.XmlConfigurator.Configure();
166 166
167 Scene scene = SceneSetupHelpers.SetupScene(); 167 Scene scene = SceneSetupHelpers.SetupScene();
168 UserAccount user1 = UserProfileTestUtils.CreateUserWithInventory(scene); 168 UserAccount user1 = UserAccountHelpers.CreateUserWithInventory(scene);
169 SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID); 169 SceneObjectGroup sog1 = CreateSO1(scene, user1.PrincipalID);
170 SceneObjectPart sop1 = sog1.RootPart; 170 SceneObjectPart sop1 = sog1.RootPart;
171 TaskInventoryItem sopItem1 = CreateSOItem1(scene, sop1); 171 TaskInventoryItem sopItem1 = CreateSOItem1(scene, sop1);
diff --git a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs b/OpenSim/Tests/Common/Setup/UserAccountHelpers.cs
index d01521d..346f78a 100644
--- a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
+++ b/OpenSim/Tests/Common/Setup/UserAccountHelpers.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Tests.Common.Setup
36 /// <summary> 36 /// <summary>
37 /// Utility functions for carrying out user profile related tests. 37 /// Utility functions for carrying out user profile related tests.
38 /// </summary> 38 /// </summary>
39 public static class UserProfileTestUtils 39 public static class UserAccountHelpers
40 { 40 {
41// /// <summary> 41// /// <summary>
42// /// Create a test user with a standard inventory 42// /// Create a test user with a standard inventory
generated by cgit v1.1 at 2024-12-19 09:11:24 +0000