Merge branch 'master' into careminster-presence-refactor

2 files changed, 11 insertions, 15 deletions

diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 2756324..4a356e2 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -191,7 +191,7 @@ namespace OpenSim.Tests.Common.Setup
                 if (realServices.Contains("grid"))
                     StartGridService(testScene, true);
                 
-                StartUserAccountService(testScene, realServices.Contains("useraccounts"));
+                StartUserAccountService(testScene);
             }
             // If not, make sure the shared module gets references to this new scene
             else
@@ -260,7 +260,7 @@ namespace OpenSim.Tests.Common.Setup
                     "LocalServiceModule", "OpenSim.Services.AuthenticationService.dll:PasswordAuthenticationService");
             else
                 config.Configs["AuthenticationService"].Set(
-                    "LocalServiceModule", "OpenSim.Tests.Common.dll:MockuthenticationService");
+                    "LocalServiceModule", "OpenSim.Tests.Common.dll:MockAuthenticationService");
             config.Configs["AuthenticationService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
             service.Initialise(config);
             service.AddRegion(testScene);
@@ -311,24 +311,18 @@ namespace OpenSim.Tests.Common.Setup
         }
 
         /// <summary>
-        /// Start a user account service, whether real or mock
+        /// Start a user account service
         /// </summary>
         /// <param name="testScene"></param>
-        /// <param name="real">Starts a real service if true, a mock service if not</param>
-        private static void StartUserAccountService(Scene testScene, bool real)
+        private static void StartUserAccountService(Scene testScene)
         {
             IConfigSource config = new IniConfigSource();
             config.AddConfig("Modules");
             config.AddConfig("UserAccountService");
             config.Configs["Modules"].Set("UserAccountServices", "LocalUserAccountServicesConnector");
             config.Configs["UserAccountService"].Set("StorageProvider", "OpenSim.Data.Null.dll");
-            
-            if (real)
-                config.Configs["UserAccountService"].Set(
-                    "LocalServiceModule", "OpenSim.Services.UserAccountService.dll:UserAccountService");
-            else
-                config.Configs["UserAccountService"].Set(
-                    "LocalServiceModule", "OpenSim.Tests.Common.dll:MockUserAccountService");
+            config.Configs["UserAccountService"].Set(
+                "LocalServiceModule", "OpenSim.Services.UserAccountService.dll:UserAccountService");
             
             if (m_userAccountService == null)
             {
@@ -336,8 +330,7 @@ namespace OpenSim.Tests.Common.Setup
                 userAccountService.Initialise(config);
                 m_userAccountService = userAccountService;
             }
-            //else
-            //    config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:TestGridService");
+                        
             m_userAccountService.AddRegion(testScene);
             m_userAccountService.RegionLoaded(testScene);
             testScene.AddRegionModule(m_userAccountService.Name, m_userAccountService);
diff --git a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
index e6a7818..380f258 100644
--- a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
+++ b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
@@ -25,6 +25,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework.Communications;
 using OpenSim.Region.Framework.Scenes;
@@ -124,7 +125,9 @@ namespace OpenSim.Tests.Common.Setup
         public static UserAccount CreateUserWithInventory(
             Scene scene, string firstName, string lastName, UUID userId, string pw)
         {
-            UserAccount ua = new UserAccount(userId) { FirstName = firstName, LastName = lastName };
+            UserAccount ua 
+                = new UserAccount(userId) 
+                    { FirstName = firstName, LastName = lastName, ServiceURLs = new Dictionary<string, object>() };
             scene.UserAccountService.StoreUserAccount(ua);
             scene.InventoryService.CreateUserInventory(ua.PrincipalID);
             scene.AuthenticationService.SetPassword(ua.PrincipalID, pw);