aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Common
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r--OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs6
-rw-r--r--OpenSim/Tests/Common/Mock/TestScene.cs2
-rw-r--r--OpenSim/Tests/Common/Setup/AssetHelpers.cs4
-rw-r--r--OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs37
-rw-r--r--OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs4
-rw-r--r--OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs8
6 files changed, 30 insertions, 31 deletions
diff --git a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
index 315d405..f453a4b 100644
--- a/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Data.Null
99 } 99 }
100 100
101 public void RemoveObject(UUID obj, UUID regionUUID) 101 public void RemoveObject(UUID obj, UUID regionUUID)
102 { 102 {
103 // All parts belonging to the object with the uuid are removed. 103 // All parts belonging to the object with the uuid are removed.
104 List<SceneObjectPart> parts = new List<SceneObjectPart>(m_sceneObjectParts.Values); 104 List<SceneObjectPart> parts = new List<SceneObjectPart>(m_sceneObjectParts.Values);
105 foreach (SceneObjectPart part in parts) 105 foreach (SceneObjectPart part in parts)
@@ -108,7 +108,7 @@ namespace OpenSim.Data.Null
108 { 108 {
109 m_log.DebugFormat( 109 m_log.DebugFormat(
110 "[MOCK REGION DATA PLUGIN]: Removing part {0} {1} as part of object {2} from {3}", 110 "[MOCK REGION DATA PLUGIN]: Removing part {0} {1} as part of object {2} from {3}",
111 part.Name, part.UUID, obj, regionUUID); 111 part.Name, part.UUID, obj, regionUUID);
112 m_sceneObjectParts.Remove(part.UUID); 112 m_sceneObjectParts.Remove(part.UUID);
113 } 113 }
114 } 114 }
@@ -129,7 +129,7 @@ namespace OpenSim.Data.Null
129 if (prim.IsRoot) 129 if (prim.IsRoot)
130 { 130 {
131 m_log.DebugFormat( 131 m_log.DebugFormat(
132 "[MOCK REGION DATA PLUGIN]: Loading root part {0} {1} in {2}", prim.Name, prim.UUID, regionUUID); 132 "[MOCK REGION DATA PLUGIN]: Loading root part {0} {1} in {2}", prim.Name, prim.UUID, regionUUID);
133 objects[prim.UUID] = new SceneObjectGroup(prim); 133 objects[prim.UUID] = new SceneObjectGroup(prim);
134 } 134 }
135 } 135 }
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index 4511228..0e1433a 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -65,6 +65,6 @@ namespace OpenSim.Tests.Common.Mock
65 public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter 65 public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter
66 { 66 {
67 get { return m_asyncSceneObjectDeleter; } 67 get { return m_asyncSceneObjectDeleter; }
68 } 68 }
69 } 69 }
70} \ No newline at end of file 70} \ No newline at end of file
diff --git a/OpenSim/Tests/Common/Setup/AssetHelpers.cs b/OpenSim/Tests/Common/Setup/AssetHelpers.cs
index f9a80b0..8647cfe 100644
--- a/OpenSim/Tests/Common/Setup/AssetHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/AssetHelpers.cs
@@ -54,8 +54,8 @@ namespace OpenSim.Tests.Common
54 { 54 {
55 AssetBase asset = CreateAsset(UUID.Random(), AssetType.Notecard, "hello", creatorId); 55 AssetBase asset = CreateAsset(UUID.Random(), AssetType.Notecard, "hello", creatorId);
56 scene.AssetService.Store(asset); 56 scene.AssetService.Store(asset);
57 return asset; 57 return asset;
58 } 58 }
59 59
60 /// <summary> 60 /// <summary>
61 /// Create an asset from the given scene object. 61 /// Create an asset from the given scene object.
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index ffd0078..ee76db4 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Tests.Common.Setup
58 public class SceneSetupHelpers 58 public class SceneSetupHelpers
59 { 59 {
60 // These static variables in order to allow regions to be linked by shared modules and same 60 // These static variables in order to allow regions to be linked by shared modules and same
61 // CommunicationsManager. 61 // CommunicationsManager.
62 private static ISharedRegionModule m_assetService = null; 62 private static ISharedRegionModule m_assetService = null;
63// private static ISharedRegionModule m_authenticationService = null; 63// private static ISharedRegionModule m_authenticationService = null;
64 private static ISharedRegionModule m_inventoryService = null; 64 private static ISharedRegionModule m_inventoryService = null;
@@ -69,19 +69,19 @@ namespace OpenSim.Tests.Common.Setup
69 /// <summary> 69 /// <summary>
70 /// Set up a test scene 70 /// Set up a test scene
71 /// </summary> 71 /// </summary>
72 /// 72 ///
73 /// Automatically starts service threads, as would the normal runtime. 73 /// Automatically starts service threads, as would the normal runtime.
74 /// 74 ///
75 /// <returns></returns> 75 /// <returns></returns>
76 public static TestScene SetupScene() 76 public static TestScene SetupScene()
77 { 77 {
78 return SetupScene(""); 78 return SetupScene("");
79 } 79 }
80 80
81 /// <summary> 81 /// <summary>
82 /// Set up a test scene 82 /// Set up a test scene
83 /// </summary> 83 /// </summary>
84 /// 84 ///
85 /// <param name="realServices">Starts real inventory and asset services, as opposed to mock ones, if true</param> 85 /// <param name="realServices">Starts real inventory and asset services, as opposed to mock ones, if true</param>
86 /// <returns></returns> 86 /// <returns></returns>
87 public static TestScene SetupScene(String realServices) 87 public static TestScene SetupScene(String realServices)
@@ -94,7 +94,7 @@ namespace OpenSim.Tests.Common.Setup
94 ///// <summary> 94 ///// <summary>
95 ///// Set up a test scene 95 ///// Set up a test scene
96 ///// </summary> 96 ///// </summary>
97 ///// 97 /////
98 ///// <param name="realServices">Starts real inventory and asset services, as opposed to mock ones, if true</param> 98 ///// <param name="realServices">Starts real inventory and asset services, as opposed to mock ones, if true</param>
99 ///// <param name="cm">This should be the same if simulating two scenes within a standalone</param> 99 ///// <param name="cm">This should be the same if simulating two scenes within a standalone</param>
100 ///// <returns></returns> 100 ///// <returns></returns>
@@ -168,13 +168,13 @@ namespace OpenSim.Tests.Common.Setup
168 capsModule.Initialise(new IniConfigSource()); 168 capsModule.Initialise(new IniConfigSource());
169 testScene.AddRegionModule(capsModule.Name, capsModule); 169 testScene.AddRegionModule(capsModule.Name, capsModule);
170 capsModule.AddRegion(testScene); 170 capsModule.AddRegion(testScene);
171 171
172 IRegionModule godsModule = new GodsModule(); 172 IRegionModule godsModule = new GodsModule();
173 godsModule.Initialise(testScene, new IniConfigSource()); 173 godsModule.Initialise(testScene, new IniConfigSource());
174 testScene.AddModule(godsModule.Name, godsModule); 174 testScene.AddModule(godsModule.Name, godsModule);
175 realServices = realServices.ToLower(); 175 realServices = realServices.ToLower();
176 // IConfigSource config = new IniConfigSource(); 176 // IConfigSource config = new IniConfigSource();
177 177
178 // If we have a brand new scene, need to initialize shared region modules 178 // If we have a brand new scene, need to initialize shared region modules
179 if ((m_assetService == null && m_inventoryService == null) || newScene) 179 if ((m_assetService == null && m_inventoryService == null) || newScene)
180 { 180 {
@@ -185,13 +185,13 @@ namespace OpenSim.Tests.Common.Setup
185 185
186 // For now, always started a 'real' authentication service 186 // For now, always started a 'real' authentication service
187 StartAuthenticationService(testScene, true); 187 StartAuthenticationService(testScene, true);
188 188
189 if (realServices.Contains("inventory")) 189 if (realServices.Contains("inventory"))
190 StartInventoryService(testScene, true); 190 StartInventoryService(testScene, true);
191 else 191 else
192 StartInventoryService(testScene, false); 192 StartInventoryService(testScene, false);
193 193
194 StartGridService(testScene, true); 194 StartGridService(testScene, true);
195 StartUserAccountService(testScene); 195 StartUserAccountService(testScene);
196 StartPresenceService(testScene); 196 StartPresenceService(testScene);
197 } 197 }
@@ -208,7 +208,7 @@ namespace OpenSim.Tests.Common.Setup
208 m_presenceService.RegionLoaded(testScene); 208 m_presenceService.RegionLoaded(testScene);
209 209
210 } 210 }
211 211
212 m_inventoryService.PostInitialise(); 212 m_inventoryService.PostInitialise();
213 m_assetService.PostInitialise(); 213 m_assetService.PostInitialise();
214 m_userAccountService.PostInitialise(); 214 m_userAccountService.PostInitialise();
@@ -251,7 +251,7 @@ namespace OpenSim.Tests.Common.Setup
251 else 251 else
252 config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:MockAssetService"); 252 config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:MockAssetService");
253 config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); 253 config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
254 assetService.Initialise(config); 254 assetService.Initialise(config);
255 assetService.AddRegion(testScene); 255 assetService.AddRegion(testScene);
256 assetService.RegionLoaded(testScene); 256 assetService.RegionLoaded(testScene);
257 testScene.AddRegionModule(assetService.Name, assetService); 257 testScene.AddRegionModule(assetService.Name, assetService);
@@ -278,7 +278,7 @@ namespace OpenSim.Tests.Common.Setup
278 testScene.AddRegionModule(service.Name, service); 278 testScene.AddRegionModule(service.Name, service);
279 //m_authenticationService = service; 279 //m_authenticationService = service;
280 } 280 }
281 281
282 private static void StartInventoryService(Scene testScene, bool real) 282 private static void StartInventoryService(Scene testScene, bool real)
283 { 283 {
284 ISharedRegionModule inventoryService = new LocalInventoryServicesConnector(); 284 ISharedRegionModule inventoryService = new LocalInventoryServicesConnector();
@@ -286,7 +286,7 @@ namespace OpenSim.Tests.Common.Setup
286 config.AddConfig("Modules"); 286 config.AddConfig("Modules");
287 config.AddConfig("InventoryService"); 287 config.AddConfig("InventoryService");
288 config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector"); 288 config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector");
289 289
290 if (real) 290 if (real)
291 { 291 {
292 config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:InventoryService"); 292 config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:InventoryService");
@@ -295,7 +295,7 @@ namespace OpenSim.Tests.Common.Setup
295 { 295 {
296 config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:MockInventoryService"); 296 config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:MockInventoryService");
297 } 297 }
298 298
299 config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); 299 config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
300 inventoryService.Initialise(config); 300 inventoryService.Initialise(config);
301 inventoryService.AddRegion(testScene); 301 inventoryService.AddRegion(testScene);
@@ -339,14 +339,14 @@ namespace OpenSim.Tests.Common.Setup
339 config.Configs["UserAccountService"].Set("StorageProvider", "OpenSim.Data.Null.dll"); 339 config.Configs["UserAccountService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
340 config.Configs["UserAccountService"].Set( 340 config.Configs["UserAccountService"].Set(
341 "LocalServiceModule", "OpenSim.Services.UserAccountService.dll:UserAccountService"); 341 "LocalServiceModule", "OpenSim.Services.UserAccountService.dll:UserAccountService");
342 342
343 if (m_userAccountService == null) 343 if (m_userAccountService == null)
344 { 344 {
345 ISharedRegionModule userAccountService = new LocalUserAccountServicesConnector(); 345 ISharedRegionModule userAccountService = new LocalUserAccountServicesConnector();
346 userAccountService.Initialise(config); 346 userAccountService.Initialise(config);
347 m_userAccountService = userAccountService; 347 m_userAccountService = userAccountService;
348 } 348 }
349 349
350 m_userAccountService.AddRegion(testScene); 350 m_userAccountService.AddRegion(testScene);
351 m_userAccountService.RegionLoaded(testScene); 351 m_userAccountService.RegionLoaded(testScene);
352 testScene.AddRegionModule(m_userAccountService.Name, m_userAccountService); 352 testScene.AddRegionModule(m_userAccountService.Name, m_userAccountService);
@@ -560,5 +560,4 @@ namespace OpenSim.Tests.Common.Setup
560 sogd.InventoryDeQueueAndDelete(); 560 sogd.InventoryDeQueueAndDelete();
561 } 561 }
562 } 562 }
563
564} 563}
diff --git a/OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs b/OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs
index 915af7e..135c50e 100644
--- a/OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs
+++ b/OpenSim/Tests/Common/Setup/UserInventoryTestUtils.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Tests.Common
42 42
43 public static InventoryItemBase CreateInventoryItem( 43 public static InventoryItemBase CreateInventoryItem(
44 Scene scene, string itemName, UUID itemId, string folderPath, UUID userId) 44 Scene scene, string itemName, UUID itemId, string folderPath, UUID userId)
45 { 45 {
46 InventoryItemBase item = new InventoryItemBase(); 46 InventoryItemBase item = new InventoryItemBase();
47 item.Name = itemName; 47 item.Name = itemName;
48 item.AssetID = AssetHelpers.CreateAsset(scene, userId).FullID; 48 item.AssetID = AssetHelpers.CreateAsset(scene, userId).FullID;
@@ -52,7 +52,7 @@ namespace OpenSim.Tests.Common
52 InventoryFolderBase objsFolder = scene.InventoryService.GetFolderForType(userId, AssetType.Object); 52 InventoryFolderBase objsFolder = scene.InventoryService.GetFolderForType(userId, AssetType.Object);
53 53
54 item.Folder = objsFolder.ID; 54 item.Folder = objsFolder.ID;
55 scene.AddInventoryItem(item); 55 scene.AddInventoryItem(item);
56 56
57 return item; 57 return item;
58 } 58 }
diff --git a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
index 26156f3..d01521d 100644
--- a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
+++ b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Tests.Common.Setup
53// UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000099"); 53// UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000099");
54// return CreateUserWithInventory(commsManager, userId, callback); 54// return CreateUserWithInventory(commsManager, userId, callback);
55// } 55// }
56// 56//
57// /// <summary> 57// /// <summary>
58// /// Create a test user with a standard inventory 58// /// Create a test user with a standard inventory
59// /// </summary> 59// /// </summary>
@@ -108,11 +108,11 @@ namespace OpenSim.Tests.Common.Setup
108// { 108// {
109// LocalUserServices lus = (LocalUserServices)commsManager.UserService; 109// LocalUserServices lus = (LocalUserServices)commsManager.UserService;
110// lus.AddUser(firstName, lastName, password, "bill@bailey.com", 1000, 1000, userId); 110// lus.AddUser(firstName, lastName, password, "bill@bailey.com", 1000, 1000, userId);
111// 111//
112// CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(userId); 112// CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(userId);
113// userInfo.OnInventoryReceived += callback; 113// userInfo.OnInventoryReceived += callback;
114// userInfo.FetchInventory(); 114// userInfo.FetchInventory();
115// 115//
116// return userInfo; 116// return userInfo;
117// } 117// }
118 118
@@ -140,6 +140,6 @@ namespace OpenSim.Tests.Common.Setup
140 scene.UserAccountService.StoreUserAccount(ua); 140 scene.UserAccountService.StoreUserAccount(ua);
141 scene.InventoryService.CreateUserInventory(ua.PrincipalID); 141 scene.InventoryService.CreateUserInventory(ua.PrincipalID);
142 scene.AuthenticationService.SetPassword(ua.PrincipalID, pw); 142 scene.AuthenticationService.SetPassword(ua.PrincipalID, pw);
143 } 143 }
144 } 144 }
145} \ No newline at end of file 145} \ No newline at end of file