* Improves SceneSetupHelper to allow the tester to choose a real or mock, inventory and asset, service modules. The boolean startServices was replaced with realServices string. If the string contains the word asset, it will start a real asset module, if it contains inventory, it starts a real inventory. Otherwise, it use mock (NullPlugin-like) objects, for tests that don't really need functionality.

* SetupScene is now actually sharing the asset and inventory modules if the tester wishes to have multiple regions connected. To link regions, just start SetupScene with the same CommunicationManager for all scenes. SceneSetupHelper will hold a static reference to the modules and won't initialize them again, just run the scenes through the modules AddRegion, RegionLoaded and PostInitialize.

* With the recent changes, both asset and inventory (and in the future, user) services should always be asked from the scene, not instantiated alone. The tests should reflect this new behavior and always start a scene.

1 files changed, 7 insertions, 6 deletions

diff --git a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
index fdc20dd..0402883 100644
--- a/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/Cache/UserProfileCacheServiceTests.cs
@@ -54,6 +54,7 @@ namespace OpenSim.Framework.Communications.Tests
             CachedUserInfo nonExistingUserInfo;
 
             TestCommunicationsManager commsManager = new TestCommunicationsManager();
+            Scene myScene = SceneSetupHelpers.SetupScene(commsManager, "");
 
             // Check we can't retrieve info before it exists by uuid
             nonExistingUserInfo = commsManager.UserProfileCacheService.GetUserDetails(userId);
@@ -116,7 +117,7 @@ namespace OpenSim.Framework.Communications.Tests
         {
             TestHelper.InMethod();
 
-            Scene myScene = SceneSetupHelpers.SetupScene();
+            Scene myScene = SceneSetupHelpers.SetupScene("inventory");
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager);
             for (int i = 0 ; i < 50 ; i++)
             {
@@ -132,7 +133,7 @@ namespace OpenSim.Framework.Communications.Tests
         {
             TestHelper.InMethod();
 
-            Scene myScene = SceneSetupHelpers.SetupScene();
+            Scene myScene = SceneSetupHelpers.SetupScene("inventory");
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager);
             for (int i = 0 ; i < 50 ; i++)
             {
@@ -154,7 +155,7 @@ namespace OpenSim.Framework.Communications.Tests
         {
             TestHelper.InMethod();
 
-            Scene myScene = SceneSetupHelpers.SetupScene();
+            Scene myScene = SceneSetupHelpers.SetupScene("inventory");
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager);
             for (int i = 0 ; i < 50 ; i++)
             {
@@ -190,7 +191,7 @@ namespace OpenSim.Framework.Communications.Tests
         {
             TestHelper.InMethod();
 
-            Scene myScene = SceneSetupHelpers.SetupScene();
+            Scene myScene = SceneSetupHelpers.SetupScene("inventory");
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager);
             for (int i = 0 ; i < 50 ; i++)
             {
@@ -256,7 +257,7 @@ namespace OpenSim.Framework.Communications.Tests
         {
             TestHelper.InMethod();
 
-            Scene myScene = SceneSetupHelpers.SetupScene();
+            Scene myScene = SceneSetupHelpers.SetupScene("inventory");
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager);
             for (int i = 0 ; i < 50 ; i++)
             {
@@ -297,7 +298,7 @@ namespace OpenSim.Framework.Communications.Tests
             TestHelper.InMethod();
             //log4net.Config.XmlConfigurator.Configure();
 
-            Scene myScene = SceneSetupHelpers.SetupScene();
+            Scene myScene = SceneSetupHelpers.SetupScene("inventory");
             CachedUserInfo userInfo = UserProfileTestUtils.CreateUserWithInventory(myScene.CommsManager);
             for (int i = 0 ; i < 50 ; i++)
             {