13 files changed, 569 insertions, 521 deletions

diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerConnector.cs
index 013462e..f17a8de 100644
--- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
+++ b/OpenSim/Server/Handlers/UserAccounts/UserAccountServerConnector.cs
@@ -25,46 +25,37 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Servers;
+using System;
+using Nini.Config;
+using OpenSim.Server.Base;
+using OpenSim.Services.Interfaces;
 using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Region.Communications.Local;
-using OpenSim.Data;
+using OpenSim.Server.Handlers.Base;
 
-namespace OpenSim.Tests.Common.Mock
+namespace OpenSim.Server.Handlers.UserAccounts
 {
-    public class TestCommunicationsManager : CommunicationsManager
+    public class UserAccountServiceConnector : ServiceConnector
     {
-        public IUserDataPlugin UserDataPlugin
-        {
-            get { return m_userDataPlugin; }
-        }
-        private IUserDataPlugin m_userDataPlugin;
-
-        // public IInventoryDataPlugin InventoryDataPlugin
-        // {
-        //     get { return m_inventoryDataPlugin; }
-        // }
-        // private IInventoryDataPlugin m_inventoryDataPlugin;
+        private IUserAccountService m_UserAccountService;
+        private string m_ConfigName = "UserAccountService";
 
-        public TestCommunicationsManager()
-            : this(null)
+        public UserAccountServiceConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
         {
-        }
+            IConfig serverConfig = config.Configs[m_ConfigName];
+            if (serverConfig == null)
+                throw new Exception(String.Format("No section {0} in config file", m_ConfigName));
 
-        public TestCommunicationsManager(NetworkServersInfo serversInfo)
-            : base(serversInfo, null)
-        {
+            string service = serverConfig.GetString("LocalServiceModule",
+                    String.Empty);
+
+            if (service == String.Empty)
+                throw new Exception("No LocalServiceModule in config file");
 
-            LocalUserServices lus = new LocalUserServices(991, 992, this);
-            lus.AddPlugin(new TemporaryUserProfilePlugin());
-            m_userDataPlugin = new TestUserDataPlugin();
-            lus.AddPlugin(m_userDataPlugin);
-            m_userService = lus;
-            m_userAdminService = lus;
+            Object[] args = new Object[] { config };
+            m_UserAccountService = ServerUtils.LoadPlugin<IUserAccountService>(service, args);
 
+            server.AddStreamHandler(new UserAccountServerPostHandler(m_UserAccountService));
         }
     }
 }
diff --git a/OpenSim/Tests/Clients/Presence/OpenSim.Server.ini b/OpenSim/Tests/Clients/Presence/OpenSim.Server.ini
new file mode 100644
index 0000000..47e73f9
--- /dev/null
+++ b/OpenSim/Tests/Clients/Presence/OpenSim.Server.ini
@@ -0,0 +1,33 @@
+; * Run a ROBUST server shell like this, from bin:
+; * $ OpenSim.Server.exe -inifile ../OpenSim/Tests/Clients/Presence/OpenSim.Server.ini
+; *
+; * Then run this client like this, from bin:
+; * $ OpenSim.Tests.Clients.PresenceClient.exe
+; *
+; *
+
+[Startup]
+ServiceConnectors = "OpenSim.Server.Handlers.dll:PresenceServiceConnector"
+
+; * This is common for all services, it's the network setup for the entire
+; * server instance
+; *
+[Network]
+port = 8003
+
+; * The following are for the remote console
+; * They have no effect for the local or basic console types
+; * Leave commented to diable logins to the console
+;ConsoleUser = Test
+;ConsolePass = secret
+
+; * As an example, the below configuration precisely mimicks the legacy
+; * asset server. It is read by the asset IN connector (defined above)
+; * and it then loads the OUT connector (a local database module). That,
+; * in turn, reads the asset loader and database connection information
+; *
+[PresenceService]
+        LocalServiceModule = "OpenSim.Services.PresenceService.dll:PresenceService"
+    StorageProvider = "OpenSim.Data.MySQL.dll"
+    ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
+
diff --git a/OpenSim/Tests/Clients/Presence/PresenceClient.cs b/OpenSim/Tests/Clients/Presence/PresenceClient.cs
new file mode 100644
index 0000000..4f959f6
--- /dev/null
+++ b/OpenSim/Tests/Clients/Presence/PresenceClient.cs
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Reflection;
+
+using OpenMetaverse;
+using log4net;
+using log4net.Appender;
+using log4net.Layout;
+
+using OpenSim.Framework;
+using OpenSim.Services.Interfaces;
+using OpenSim.Services.Connectors;
+
+namespace OpenSim.Tests.Clients.PresenceClient
+{
+    public class PresenceClient
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+        
+        public static void Main(string[] args)
+        {
+            ConsoleAppender consoleAppender = new ConsoleAppender();
+            consoleAppender.Layout =
+                new PatternLayout("%date [%thread] %-5level %logger [%property{NDC}] - %message%newline");
+            log4net.Config.BasicConfigurator.Configure(consoleAppender);
+
+            string serverURI = "http://127.0.0.1:8003";
+            PresenceServicesConnector m_Connector = new PresenceServicesConnector(serverURI);
+
+            UUID user1 = UUID.Random();
+            UUID session1 = UUID.Random();
+            UUID region1 = UUID.Random();
+
+            bool success = m_Connector.LoginAgent(user1.ToString(), session1, UUID.Zero);
+            if (success)
+                m_log.InfoFormat("[PRESENCE CLIENT]: Successfully logged in user {0} with session {1}", user1, session1);
+            else
+                m_log.InfoFormat("[PRESENCE CLIENT]: failed to login user {0}", user1);
+
+            System.Console.WriteLine("\n");
+
+            PresenceInfo pinfo = m_Connector.GetAgent(session1);
+            if (pinfo == null)
+                m_log.InfoFormat("[PRESENCE CLIENT]: Unable to retrieve presence for {0}", user1);
+            else
+                m_log.InfoFormat("[PRESENCE CLIENT]: Presence retrieved correctly: userID={0}; Online={1}; regionID={2}; homeRegion={3}", 
+                    pinfo.UserID, pinfo.Online, pinfo.RegionID, pinfo.HomeRegionID);
+
+            System.Console.WriteLine("\n");
+            success = m_Connector.ReportAgent(session1, region1, new Vector3(128, 128, 128), new Vector3(4, 5, 6));
+            if (success)
+                m_log.InfoFormat("[PRESENCE CLIENT]: Successfully reported session {0} in region {1}", user1, region1);
+            else
+                m_log.InfoFormat("[PRESENCE CLIENT]: failed to report session {0}", session1);
+            pinfo = m_Connector.GetAgent(session1);
+            if (pinfo == null)
+                m_log.InfoFormat("[PRESENCE CLIENT]: Unable to retrieve presence for {0} for second time", user1);
+            else
+                m_log.InfoFormat("[PRESENCE CLIENT]: Presence retrieved correctly: userID={0}; Online={1}; regionID={2}; homeRegion={3}",
+                    pinfo.UserID, pinfo.Online, pinfo.RegionID, pinfo.HomeRegionID);
+
+            System.Console.WriteLine("\n");
+            success = m_Connector.SetHomeLocation(user1.ToString(), region1, new Vector3(128, 128, 128), new Vector3(4, 5, 6));
+            if (success)
+                m_log.InfoFormat("[PRESENCE CLIENT]: Successfully set home for user {0} in region {1}", user1, region1);
+            else
+                m_log.InfoFormat("[PRESENCE CLIENT]: failed to set home for user {0}", user1);
+            pinfo = m_Connector.GetAgent(session1);
+            if (pinfo == null)
+                m_log.InfoFormat("[PRESENCE CLIENT]: Unable to retrieve presence for {0} for third time", user1);
+            else
+                m_log.InfoFormat("[PRESENCE CLIENT]: Presence retrieved correctly: userID={0}; Online={1}; regionID={2}; homeRegion={3}",
+                    pinfo.UserID, pinfo.Online, pinfo.RegionID, pinfo.HomeRegionID);
+
+            System.Console.WriteLine("\n");
+            success = m_Connector.LogoutAgent(session1, Vector3.Zero, Vector3.UnitY);
+            if (success)
+                m_log.InfoFormat("[PRESENCE CLIENT]: Successfully logged out user {0}", user1);
+            else
+                m_log.InfoFormat("[PRESENCE CLIENT]: failed to logout user {0}", user1);
+            pinfo = m_Connector.GetAgent(session1);
+            if (pinfo == null)
+                m_log.InfoFormat("[PRESENCE CLIENT]: Unable to retrieve presence for {0} for fourth time", user1);
+            else
+                m_log.InfoFormat("[PRESENCE CLIENT]: Presence retrieved correctly: userID={0}; Online={1}; regionID={2}; homeRegion={3}",
+                    pinfo.UserID, pinfo.Online, pinfo.RegionID, pinfo.HomeRegionID);
+
+            System.Console.WriteLine("\n");
+            success = m_Connector.ReportAgent(session1, UUID.Random(), Vector3.Zero, Vector3.Zero);
+            if (success)
+                m_log.InfoFormat("[PRESENCE CLIENT]: Report agent succeeded, but this is wrong");
+            else
+                m_log.InfoFormat("[PRESENCE CLIENT]: failed to report agent, as it should because user is not logged in");
+
+        }
+
+    }
+}
diff --git a/OpenSim/Tests/Clients/UserAccounts/OpenSim.Server.ini b/OpenSim/Tests/Clients/UserAccounts/OpenSim.Server.ini
new file mode 100644
index 0000000..eb1f473
--- /dev/null
+++ b/OpenSim/Tests/Clients/UserAccounts/OpenSim.Server.ini
@@ -0,0 +1,33 @@
+; * Run a ROBUST server shell like this, from bin:
+; * $ OpenSim.Server.exe -inifile ../OpenSim/Tests/Clients/Presence/OpenSim.Server.ini
+; *
+; * Then run this client like this, from bin:
+; * $ OpenSim.Tests.Clients.UserAccountClient.exe
+; *
+; *
+
+[Startup]
+ServiceConnectors = "OpenSim.Server.Handlers.dll:UserAccountServiceConnector"
+
+; * This is common for all services, it's the network setup for the entire
+; * server instance
+; *
+[Network]
+port = 8003
+
+; * The following are for the remote console
+; * They have no effect for the local or basic console types
+; * Leave commented to diable logins to the console
+;ConsoleUser = Test
+;ConsolePass = secret
+
+; * As an example, the below configuration precisely mimicks the legacy
+; * asset server. It is read by the asset IN connector (defined above)
+; * and it then loads the OUT connector (a local database module). That,
+; * in turn, reads the asset loader and database connection information
+; *
+[UserAccountService]
+        LocalServiceModule = "OpenSim.Services.UserAccountService.dll:UserAccountService"
+    StorageProvider = "OpenSim.Data.MySQL.dll"
+    ConnectionString = "Data Source=localhost;Database=opensim;User ID=opensim;Password=opensim123;"
+
diff --git a/OpenSim/Tests/Clients/UserAccounts/UserAccountsClient.cs b/OpenSim/Tests/Clients/UserAccounts/UserAccountsClient.cs
new file mode 100644
index 0000000..56195b1
--- /dev/null
+++ b/OpenSim/Tests/Clients/UserAccounts/UserAccountsClient.cs
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Reflection;
+
+using OpenMetaverse;
+using log4net;
+using log4net.Appender;
+using log4net.Layout;
+
+using OpenSim.Framework;
+using OpenSim.Services.Interfaces;
+using OpenSim.Services.Connectors;
+
+namespace OpenSim.Tests.Clients.PresenceClient
+{
+    public class UserAccountsClient
+    {
+        private static readonly ILog m_log =
+                LogManager.GetLogger(
+                MethodBase.GetCurrentMethod().DeclaringType);
+        
+        public static void Main(string[] args)
+        {
+            ConsoleAppender consoleAppender = new ConsoleAppender();
+            consoleAppender.Layout =
+                new PatternLayout("%date [%thread] %-5level %logger [%property{NDC}] - %message%newline");
+            log4net.Config.BasicConfigurator.Configure(consoleAppender);
+
+            string serverURI = "http://127.0.0.1:8003";
+            UserAccountServicesConnector m_Connector = new UserAccountServicesConnector(serverURI);
+
+            UUID user1 = UUID.Random();
+            string first = "Completely";
+            string last = "Clueless";
+            string email = "foo@bar.com";
+
+            UserAccount account = new UserAccount(user1);
+            account.FirstName = first;
+            account.LastName = last;
+            account.Email = email;
+            account.ServiceURLs = new Dictionary<string, object>();
+            account.ServiceURLs.Add("InventoryServerURI", "http://cnn.com");
+            account.ServiceURLs.Add("AssetServerURI", "http://cnn.com");
+
+            bool success = m_Connector.StoreUserAccount(account);
+            if (success)
+                m_log.InfoFormat("[USER CLIENT]: Successfully created account for user {0} {1}", account.FirstName, account.LastName);
+            else
+                m_log.InfoFormat("[USER CLIENT]: failed to create user {0} {1}", account.FirstName, account.LastName);
+
+            System.Console.WriteLine("\n");
+
+            account = m_Connector.GetUserAccount(UUID.Zero, user1);
+            if (account == null)
+                m_log.InfoFormat("[USER CLIENT]: Unable to retrieve accouny by UUID for {0}", user1);
+            else
+            {
+                m_log.InfoFormat("[USER CLIENT]: Account retrieved correctly: userID={0}; FirstName={1}; LastName={2}; Email={3}",
+                                  account.PrincipalID, account.FirstName, account.LastName, account.Email);
+                foreach (KeyValuePair<string, object> kvp in account.ServiceURLs)
+                    m_log.DebugFormat("\t {0} -> {1}", kvp.Key, kvp.Value);
+            }
+
+            System.Console.WriteLine("\n");
+
+            account = m_Connector.GetUserAccount(UUID.Zero, first, last);
+            if (account == null)
+                m_log.InfoFormat("[USER CLIENT]: Unable to retrieve accouny by name for {0}", user1);
+            else
+            {
+                m_log.InfoFormat("[USER CLIENT]: Account retrieved correctly: userID={0}; FirstName={1}; LastName={2}; Email={3}",
+                                  account.PrincipalID, account.FirstName, account.LastName, account.Email);
+                foreach (KeyValuePair<string, object> kvp in account.ServiceURLs)
+                    m_log.DebugFormat("\t {0} -> {1}", kvp.Key, kvp.Value);
+            }
+
+            System.Console.WriteLine("\n");
+            account = m_Connector.GetUserAccount(UUID.Zero, email);
+            if (account == null)
+                m_log.InfoFormat("[USER CLIENT]: Unable to retrieve accouny by email for {0}", user1);
+            else
+            {
+                m_log.InfoFormat("[USER CLIENT]: Account retrieved correctly: userID={0}; FirstName={1}; LastName={2}; Email={3}",
+                                  account.PrincipalID, account.FirstName, account.LastName, account.Email);
+                foreach (KeyValuePair<string, object> kvp in account.ServiceURLs)
+                    m_log.DebugFormat("\t {0} -> {1}", kvp.Key, kvp.Value);
+            }
+
+        }
+
+    }
+}
diff --git a/OpenSim/Tests/Common/Mock/MockUserAccountService.cs b/OpenSim/Tests/Common/Mock/MockUserAccountService.cs
new file mode 100644
index 0000000..0769c7a
--- /dev/null
+++ b/OpenSim/Tests/Common/Mock/MockUserAccountService.cs
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System.Collections.Generic;
+using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Services.Interfaces;
+
+namespace OpenSim.Tests.Common.Mock
+{        
+    public class MockUserAccountService : IUserAccountService
+    {        
+
+        public MockUserAccountService(IConfigSource config) {}
+        
+        public UserAccount GetUserAccount(UUID scopeID, UUID userID) { return new UserAccount(); }
+        public UserAccount GetUserAccount(UUID scopeID, string FirstName, string LastName) { return new UserAccount(); }           
+        public UserAccount GetUserAccount(UUID scopeID, string Email) { return new UserAccount(); }
+        public List<UserAccount> GetUserAccounts(UUID scopeID, string query) { return new List<UserAccount>(); }
+        public bool StoreUserAccount(UserAccount data) { return true; }
+    }
+}
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Mock/MockUserService.cs b/OpenSim/Tests/Common/Mock/MockUserService.cs
deleted file mode 100644
index 396ef25..0000000
--- a/OpenSim/Tests/Common/Mock/MockUserService.cs
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Services.Interfaces;
-
-namespace OpenSim.Tests.Common
-{
-    public class MockUserService : IUserService
-    {
-        public void AddTemporaryUserProfile(UserProfileData userProfile)
-        {
-            throw new NotImplementedException();
-        }
-        
-        public UserProfileData GetUserProfile(string firstName, string lastName)
-        {
-            throw new NotImplementedException();
-        }
-
-        public UserProfileData GetUserProfile(UUID userId)
-        {
-            throw new NotImplementedException();
-        }
-
-        public UserProfileData GetUserProfile(Uri uri)
-        {
-            UserProfileData userProfile = new UserProfileData();
-
-//                userProfile.ID = new UUID(Util.GetHashGuid(uri.ToString(), AssetCache.AssetInfo.Secret));
-
-            return userProfile;
-        }
-
-        public Uri GetUserUri(UserProfileData userProfile)
-        {
-            throw new NotImplementedException();
-        }
-
-        public UserAgentData GetAgentByUUID(UUID userId)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void ClearUserAgent(UUID avatarID)
-        {
-            throw new NotImplementedException();
-        }
-
-        public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID QueryID, string Query)
-        {
-            throw new NotImplementedException();
-        }
-
-        public UserProfileData SetupMasterUser(string firstName, string lastName)
-        {
-            throw new NotImplementedException();
-        }
-
-        public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
-        {
-            throw new NotImplementedException();
-        }
-
-        public UserProfileData SetupMasterUser(UUID userId)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool UpdateUserProfile(UserProfileData data)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void RemoveUserFriend(UUID friendlistowner, UUID friend)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, Vector3 position, Vector3 lookat)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz)
-        {
-            throw new NotImplementedException();
-        }
-
-        public List<FriendListItem> GetUserFriendList(UUID friendlistowner)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool VerifySession(UUID userID, UUID sessionID)
-        {
-            return true;
-        }
-
-        public void SetInventoryService(IInventoryService inv)
-        {
-            throw new NotImplementedException();
-        }
-
-        public virtual bool AuthenticateUserByPassword(UUID userID, string password)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 68ac96a..b07a072 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -95,7 +95,8 @@ namespace OpenSim.Tests.Common.Mock
         public event DeRezObject OnDeRezObject;
         public event Action<IClientAPI> OnRegionHandShakeReply;
         public event GenericCall2 OnRequestWearables;
-        public event GenericCall2 OnCompleteMovementToRegion;
+        public event GenericCall1 OnCompleteMovementToRegion;
+        public event UpdateAgent OnPreAgentUpdate;
         public event UpdateAgent OnAgentUpdate;
         public event AgentRequestSit OnAgentRequestSit;
         public event AgentSit OnAgentSit;
@@ -140,6 +141,7 @@ namespace OpenSim.Tests.Common.Mock
         public event Action<UUID> OnRemoveAvatar;
 
         public event CreateNewInventoryItem OnCreateNewInventoryItem;
+        public event LinkInventoryItem OnLinkInventoryItem;
         public event CreateInventoryFolder OnCreateNewInventoryFolder;
         public event UpdateInventoryFolder OnUpdateInventoryFolder;
         public event MoveInventoryFolder OnMoveInventoryFolder;
@@ -367,7 +369,11 @@ namespace OpenSim.Tests.Common.Mock
             get { return true; }
             set { }
         }
-
+        public bool IsLoggingOut
+        {
+            get { return false; }
+            set { }
+        }
         public UUID ActiveGroupId
         {
             get { return UUID.Zero; }
@@ -449,7 +455,7 @@ namespace OpenSim.Tests.Common.Mock
 
         public void CompleteMovement()
         {
-            OnCompleteMovementToRegion();
+            OnCompleteMovementToRegion(this);
         }
 
         public virtual void ActivateGesture(UUID assetId, UUID gestureId)
@@ -748,7 +754,7 @@ namespace OpenSim.Tests.Common.Mock
 
             if (OnCompleteMovementToRegion != null)
             {
-                OnCompleteMovementToRegion();
+                OnCompleteMovementToRegion(this);
             }
         }
         public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID)
@@ -1205,5 +1211,13 @@ namespace OpenSim.Tests.Common.Mock
         public void SendGroupActiveProposals(UUID groupID, UUID transactionID, GroupActiveProposals[] Proposals)
         {
         }
+
+        public void SendChangeUserRights(UUID agentID, UUID friendID, int rights)
+        {
+        }
+
+        public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId)
+        {
+        }
     }
 }
diff --git a/OpenSim/Tests/Common/Mock/TestScene.cs b/OpenSim/Tests/Common/Mock/TestScene.cs
index 22cfa2c..01f2c14 100644
--- a/OpenSim/Tests/Common/Mock/TestScene.cs
+++ b/OpenSim/Tests/Common/Mock/TestScene.cs
@@ -29,7 +29,7 @@ using System;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
+
 using OpenSim.Framework.Servers;
 using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Scenes;
@@ -40,10 +40,10 @@ namespace OpenSim.Tests.Common.Mock
     {
         public TestScene(
             RegionInfo regInfo, AgentCircuitManager authen,
-            CommunicationsManager commsMan, SceneCommunicationService sceneGridService, StorageManager storeManager,
+            SceneCommunicationService sceneGridService, StorageManager storeManager,
             ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim,
             bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
-            : base(regInfo, authen, commsMan, sceneGridService, storeManager, moduleLoader,
+            : base(regInfo, authen, sceneGridService, storeManager, moduleLoader,
                    dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion)
         {
         }
@@ -56,7 +56,7 @@ namespace OpenSim.Tests.Common.Mock
         /// 
         /// <param name="agent"></param>
         /// <returns></returns>
-        public override bool AuthenticateUser(AgentCircuitData agent, out string reason)
+        public override bool VerifyUserPresence(AgentCircuitData agent, out string reason)
         {
             reason = String.Empty;
             return true;
@@ -65,6 +65,6 @@ namespace OpenSim.Tests.Common.Mock
         public AsyncSceneObjectGroupDeleter SceneObjectGroupDeleter
         {
             get { return m_asyncSceneObjectDeleter; }
-        }
+        }      
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Mock/TestUserDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestUserDataPlugin.cs
deleted file mode 100644
index 5188cf6..0000000
--- a/OpenSim/Tests/Common/Mock/TestUserDataPlugin.cs
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Data;
-
-namespace OpenSim.Tests.Common.Mock
-{
-    /// <summary>
-    /// In memory user data provider.  Might be quite useful as a proper user data plugin, though getting mono addins
-    /// to load any plugins when running unit tests has proven impossible so far.  Currently no locking since unit
-    /// tests are single threaded.
-    /// </summary>
-    public class TestUserDataPlugin : IUserDataPlugin
-    {
-        public string Version { get { return "0"; } }
-        public string Name { get { return "TestUserDataPlugin"; } }
-
-        /// <summary>
-        /// User profiles keyed by name
-        /// </summary>
-        private Dictionary<string, UserProfileData> m_userProfilesByName = new Dictionary<string, UserProfileData>();
-
-        /// <summary>
-        /// User profiles keyed by uuid
-        /// </summary>
-        private Dictionary<UUID, UserProfileData> m_userProfilesByUuid = new Dictionary<UUID, UserProfileData>();
-
-        /// <summary>
-        /// User profiles and their agents
-        /// </summary>
-        private Dictionary<UUID, UserAgentData> m_agentByProfileUuid = new Dictionary<UUID, UserAgentData>();
-
-        /// <summary>
-        /// Friends list by uuid
-        /// </summary>
-        private Dictionary<UUID, List<FriendListItem>> m_friendsListByUuid = new Dictionary<UUID, List<FriendListItem>>();
-
-        public void Initialise() {}
-        public void Dispose() {}
-        
-        public void AddTemporaryUserProfile(UserProfileData userProfile)
-        {
-            // Not interested
-        }
-
-        public void AddNewUserProfile(UserProfileData user)
-        {
-            UpdateUserProfile(user);
-        }
-
-        public UserProfileData GetUserByUUID(UUID user)
-        {
-            UserProfileData userProfile = null;
-            m_userProfilesByUuid.TryGetValue(user, out userProfile);
-
-            return userProfile;
-        }
-
-        public UserProfileData GetUserByName(string fname, string lname)
-        {
-            UserProfileData userProfile = null;
-            m_userProfilesByName.TryGetValue(fname + " " + lname, out userProfile);
-
-            return userProfile;
-        }
-        
-        public UserProfileData GetUserByUri(Uri uri) { return null; }
-
-        public bool UpdateUserProfile(UserProfileData user)
-        {
-            m_userProfilesByUuid[user.ID] = user;
-            m_userProfilesByName[user.FirstName + " " + user.SurName] = user;
-
-            return true;
-        }
-
-        public List<AvatarPickerAvatar> GeneratePickerResults(UUID queryID, string query) { return null; }
-
-        public UserAgentData GetAgentByUUID(UUID user)
-        {
-            UserAgentData userAgent = null;
-            m_agentByProfileUuid.TryGetValue(user, out userAgent);
-
-            return userAgent;
-        }
-
-        public UserAgentData GetAgentByName(string name)
-        {
-            UserProfileData userProfile = null;
-            m_userProfilesByName.TryGetValue(name, out userProfile);
-            UserAgentData userAgent = null;
-            m_agentByProfileUuid.TryGetValue(userProfile.ID, out userAgent);
-
-            return userAgent;
-        }
-
-        public UserAgentData GetAgentByName(string fname, string lname)
-        {
-            UserProfileData userProfile = GetUserByName(fname,lname);
-            UserAgentData userAgent = null;
-            m_agentByProfileUuid.TryGetValue(userProfile.ID, out userAgent);
-
-            return userAgent;
-        }
-
-        public void StoreWebLoginKey(UUID agentID, UUID webLoginKey) {}
-
-        public void AddNewUserAgent(UserAgentData agent)
-        {
-            m_agentByProfileUuid[agent.ProfileID] = agent;
-        }
-        public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
-        {
-            FriendListItem newfriend = new FriendListItem();
-            newfriend.FriendPerms = perms;
-            newfriend.Friend = friend;
-            newfriend.FriendListOwner = friendlistowner;
-
-            if (!m_friendsListByUuid.ContainsKey(friendlistowner))
-            {
-                List<FriendListItem> friendslist = new List<FriendListItem>();
-                m_friendsListByUuid[friendlistowner] = friendslist;
-
-            }
-            m_friendsListByUuid[friendlistowner].Add(newfriend);
-        }
-
-        public void RemoveUserFriend(UUID friendlistowner, UUID friend)
-        {
-            if (m_friendsListByUuid.ContainsKey(friendlistowner))
-            {
-                List<FriendListItem> friendslist = m_friendsListByUuid[friendlistowner];
-                foreach (FriendListItem frienditem in friendslist)
-                {
-                    if (frienditem.Friend == friend)
-                    {
-                        friendslist.Remove(frienditem);
-                        break;
-                    }
-                }
-            }
-        }
-
-        public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
-        {
-            if (m_friendsListByUuid.ContainsKey(friendlistowner))
-            {
-                List<FriendListItem> friendslist = m_friendsListByUuid[friendlistowner];
-                foreach (FriendListItem frienditem in friendslist)
-                {
-                    if (frienditem.Friend == friend)
-                    {
-                        frienditem.FriendPerms = perms;
-                        break;
-                    }
-                }
-            }
-        }
-
-        public List<FriendListItem> GetUserFriendList(UUID friendlistowner)
-        {
-            if (m_friendsListByUuid.ContainsKey(friendlistowner))
-            {
-                return m_friendsListByUuid[friendlistowner];
-            }
-            else
-                return new List<FriendListItem>();
-
-
-        }
-
-        public Dictionary<UUID, FriendRegionInfo> GetFriendRegionInfos(List<UUID> uuids) { return null; }
-
-        public bool MoneyTransferRequest(UUID from, UUID to, uint amount) { return false; }
-
-        public bool InventoryTransferRequest(UUID from, UUID to, UUID inventory) { return false; }
-
-        public void Initialise(string connect) { return; }
-
-        public AvatarAppearance GetUserAppearance(UUID user) { return null; }
-
-        public void UpdateUserAppearance(UUID user, AvatarAppearance appearance) {}
-
-        public void ResetAttachments(UUID userID) {}
-
-        public void LogoutUsers(UUID regionID) {}
-    }
-}
diff --git a/OpenSim/Tests/Common/Setup/AssetHelpers.cs b/OpenSim/Tests/Common/Setup/AssetHelpers.cs
index 1188b62..1fc3cb5 100644
--- a/OpenSim/Tests/Common/Setup/AssetHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/AssetHelpers.cs
@@ -38,12 +38,9 @@ namespace OpenSim.Tests.Common
         /// <summary>
         /// Create an asset from the given data
         /// </summary>
-        /// <param name="assetUuid"></param>
-        /// <param name="data"></param>
-        /// <returns></returns>
-        public static AssetBase CreateAsset(UUID assetUuid, string data)
+        public static AssetBase CreateAsset(UUID assetUuid, string data, UUID creatorID)
         {
-            AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object);
+            AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object, creatorID.ToString());
             asset.Data = Encoding.ASCII.GetBytes(data);
             return asset;
         }
@@ -56,7 +53,7 @@ namespace OpenSim.Tests.Common
         /// <returns></returns>
         public static AssetBase CreateAsset(UUID assetUuid, SceneObjectGroup sog)
         {
-            AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object);
+            AssetBase asset = new AssetBase(assetUuid, assetUuid.ToString(), (sbyte)AssetType.Object, sog.OwnerID.ToString());
             asset.Data = Encoding.ASCII.GetBytes(SceneObjectSerializer.ToXml2Format(sog));
             return asset;
         }
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index b13e8dd..864e2aa 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -32,7 +32,7 @@ using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
+
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
@@ -45,6 +45,7 @@ using OpenSim.Region.CoreModules.Avatar.Gods;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid;
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts;
 using OpenSim.Services.Interfaces;
 using OpenSim.Tests.Common.Mock;
 
@@ -60,7 +61,7 @@ namespace OpenSim.Tests.Common.Setup
         private static ISharedRegionModule m_assetService = null;
         private static ISharedRegionModule m_inventoryService = null;
         private static ISharedRegionModule m_gridService = null;
-        private static TestCommunicationsManager commsManager = null;
+        private static ISharedRegionModule m_userAccountService = null;
 
         /// <summary>
         /// Set up a test scene
@@ -83,21 +84,23 @@ namespace OpenSim.Tests.Common.Setup
         public static TestScene SetupScene(String realServices)
         {
             return SetupScene(
-                "Unit test region", UUID.Random(), 1000, 1000, new TestCommunicationsManager(), realServices);
+                "Unit test region", UUID.Random(), 1000, 1000, realServices);
         }
 
-        /// <summary>
-        /// Set up a test scene
-        /// </summary>
-        /// 
-        /// <param name="realServices">Starts real inventory and asset services, as opposed to mock ones, if true</param>
-        /// <param name="cm">This should be the same if simulating two scenes within a standalone</param>
-        /// <returns></returns>
-        public static TestScene SetupScene(TestCommunicationsManager cm, String realServices)
-        {
-            return SetupScene(
-                "Unit test region", UUID.Random(), 1000, 1000, cm, "");
-        }
+        // REFACTORING PROBLEM. No idea what the difference is with the previous one
+        ///// <summary>
+        ///// Set up a test scene
+        ///// </summary>
+        ///// 
+        ///// <param name="realServices">Starts real inventory and asset services, as opposed to mock ones, if true</param>
+        ///// <param name="cm">This should be the same if simulating two scenes within a standalone</param>
+        ///// <returns></returns>
+        //public static TestScene SetupScene(String realServices)
+        //{
+        //    return SetupScene(
+        //        "Unit test region", UUID.Random(), 1000, 1000, "");
+        //}
+
         /// <summary>
         /// Set up a test scene
         /// </summary>
@@ -107,9 +110,9 @@ namespace OpenSim.Tests.Common.Setup
         /// <param name="y">Y co-ordinate of the region</param>
         /// <param name="cm">This should be the same if simulating two scenes within a standalone</param>
         /// <returns></returns>
-        public static TestScene SetupScene(string name, UUID id, uint x, uint y, TestCommunicationsManager cm)
+        public static TestScene SetupScene(string name, UUID id, uint x, uint y)
         {
-            return SetupScene(name, id, x, y, cm, "");
+            return SetupScene(name, id, x, y,"");
         }
 
 
@@ -125,23 +128,24 @@ namespace OpenSim.Tests.Common.Setup
         /// <param name="realServices">Starts real inventory and asset services, as opposed to mock ones, if true</param>
         /// <returns></returns>
         public static TestScene SetupScene(
-            string name, UUID id, uint x, uint y, TestCommunicationsManager cm, String realServices)
+            string name, UUID id, uint x, uint y, String realServices)
         {
             bool newScene = false;
 
             Console.WriteLine("Setting up test scene {0}", name);
-            
-            // If cm is the same as our last commsManager used, this means the tester wants to link
-            // regions. In this case, don't use the sameshared region modules and dont initialize them again.
-            // Also, no need to start another MainServer and MainConsole instance.
-            if (cm == null || cm != commsManager)
-            {
-                System.Console.WriteLine("Starting a brand new scene");
-                newScene = true;
-                MainConsole.Instance = new LocalConsole("TEST PROMPT");
-                MainServer.Instance = new BaseHttpServer(980);
-                commsManager = cm;
-            }
+
+            // REFACTORING PROBLEM!
+            //// If cm is the same as our last commsManager used, this means the tester wants to link
+            //// regions. In this case, don't use the sameshared region modules and dont initialize them again.
+            //// Also, no need to start another MainServer and MainConsole instance.
+            //if (cm == null || cm != commsManager)
+            //{
+            //    System.Console.WriteLine("Starting a brand new scene");
+            //    newScene = true;
+            //    MainConsole.Instance = new LocalConsole("TEST PROMPT");
+            //    MainServer.Instance = new BaseHttpServer(980);
+            //    commsManager = cm;
+            //}
 
             // We must set up a console otherwise setup of some modules may fail
             RegionInfo regInfo = new RegionInfo(x, y, new IPEndPoint(IPAddress.Loopback, 9000), "127.0.0.1");
@@ -149,13 +153,13 @@ namespace OpenSim.Tests.Common.Setup
             regInfo.RegionID = id;
 
             AgentCircuitManager acm = new AgentCircuitManager();
-            SceneCommunicationService scs = new SceneCommunicationService(cm);
+            SceneCommunicationService scs = new SceneCommunicationService();
 
             StorageManager sm = new StorageManager("OpenSim.Data.Null.dll", "", "");
             IConfigSource configSource = new IniConfigSource();
 
             TestScene testScene = new TestScene(
-                regInfo, acm, cm, scs, sm, null, false, false, false, configSource, null);
+                regInfo, acm, scs, sm, null, false, false, false, configSource, null);
 
             INonSharedRegionModule capsModule = new CapabilitiesModule();
             capsModule.Initialise(new IniConfigSource());
@@ -175,13 +179,16 @@ namespace OpenSim.Tests.Common.Setup
                     StartAssetService(testScene, true);
                 else
                     StartAssetService(testScene, false);
+                
                 if (realServices.Contains("inventory"))
                     StartInventoryService(testScene, true);
                 else
                     StartInventoryService(testScene, false);
+                
                 if (realServices.Contains("grid"))
                     StartGridService(testScene, true);
-
+                
+                StartUserAccountService(testScene, realServices.Contains("useraccounts"));
             }
             // If not, make sure the shared module gets references to this new scene
             else
@@ -190,11 +197,13 @@ namespace OpenSim.Tests.Common.Setup
                 m_assetService.RegionLoaded(testScene);
                 m_inventoryService.AddRegion(testScene);
                 m_inventoryService.RegionLoaded(testScene);
+                m_userAccountService.AddRegion(testScene);
+                m_userAccountService.RegionLoaded(testScene);
             }
+            
             m_inventoryService.PostInitialise();
             m_assetService.PostInitialise();
-
-            testScene.CommsManager.UserService.SetInventoryService(testScene.InventoryService);
+            m_userAccountService.PostInitialise();
 
             testScene.SetModuleInterfaces();
 
@@ -205,6 +214,14 @@ namespace OpenSim.Tests.Common.Setup
             physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll");
             testScene.PhysicsScene
                 = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher",   new IniConfigSource(), "test");
+
+            // It's really not a good idea to use static variables as they carry over between tests, leading to
+            // problems that are extremely hard to debug.  Really, these static fields need to be eliminated -
+            // tests using multiple regions that need to share modules need to find another solution.
+            m_assetService = null;
+            m_inventoryService = null;
+            m_gridService = null;
+            m_userAccountService = null;
             
             return testScene;
         }
@@ -269,6 +286,38 @@ namespace OpenSim.Tests.Common.Setup
             //testScene.AddRegionModule(m_gridService.Name, m_gridService);
         }
 
+        /// <summary>
+        /// Start a user account service, whether real or mock
+        /// </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)
+        {
+            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");
+            
+            if (m_userAccountService == null)
+            {
+                ISharedRegionModule userAccountService = new LocalUserAccountServicesConnector();
+                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);
+        }
 
         /// <summary>
         /// Setup modules for a scene using their default settings.
diff --git a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
index cb76bc1..cd61fa6 100644
--- a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
+++ b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
@@ -27,8 +27,7 @@
 
 using OpenMetaverse;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Communications.Local;
+
 
 namespace OpenSim.Tests.Common.Setup
 {
@@ -37,82 +36,85 @@ namespace OpenSim.Tests.Common.Setup
     /// </summary>
     public static class UserProfileTestUtils
     {
-        /// <summary>
-        /// Create a test user with a standard inventory
-        /// </summary>
-        /// <param name="commsManager"></param>
-        /// <param name="callback">
-        /// Callback to invoke when inventory has been loaded.  This is required because
-        /// loading may be asynchronous, even on standalone
-        /// </param>
-        /// <returns></returns>
-        public static CachedUserInfo CreateUserWithInventory(
-            CommunicationsManager commsManager, OnInventoryReceivedDelegate callback)
-        {
-            UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000099");
-            return CreateUserWithInventory(commsManager, userId, callback);
-        }
+        // REFACTORING PROBLEM
+        // This needs to be rewritten
+
+        ///// <summary>
+        ///// Create a test user with a standard inventory
+        ///// </summary>
+        ///// <param name="commsManager"></param>
+        ///// <param name="callback">
+        ///// Callback to invoke when inventory has been loaded.  This is required because
+        ///// loading may be asynchronous, even on standalone
+        ///// </param>
+        ///// <returns></returns>
+        //public static CachedUserInfo CreateUserWithInventory(
+        //    CommunicationsManager commsManager, OnInventoryReceivedDelegate callback)
+        //{
+        //    UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000099");
+        //    return CreateUserWithInventory(commsManager, userId, callback);
+        //}
         
-        /// <summary>
-        /// Create a test user with a standard inventory
-        /// </summary>
-        /// <param name="commsManager"></param>
-        /// <param name="userId">User ID</param>
-        /// <param name="callback">
-        /// Callback to invoke when inventory has been loaded.  This is required because
-        /// loading may be asynchronous, even on standalone
-        /// </param>
-        /// <returns></returns>
-        public static CachedUserInfo CreateUserWithInventory(
-            CommunicationsManager commsManager, UUID userId, OnInventoryReceivedDelegate callback)
-        {
-            return CreateUserWithInventory(commsManager, "Bill", "Bailey", userId, callback);
-        }
+        ///// <summary>
+        ///// Create a test user with a standard inventory
+        ///// </summary>
+        ///// <param name="commsManager"></param>
+        ///// <param name="userId">User ID</param>
+        ///// <param name="callback">
+        ///// Callback to invoke when inventory has been loaded.  This is required because
+        ///// loading may be asynchronous, even on standalone
+        ///// </param>
+        ///// <returns></returns>
+        //public static CachedUserInfo CreateUserWithInventory(
+        //    CommunicationsManager commsManager, UUID userId, OnInventoryReceivedDelegate callback)
+        //{
+        //    return CreateUserWithInventory(commsManager, "Bill", "Bailey", userId, callback);
+        //}
 
-        /// <summary>
-        /// Create a test user with a standard inventory
-        /// </summary>
-        /// <param name="commsManager"></param>
-        /// <param name="firstName">First name of user</param>
-        /// <param name="lastName">Last name of user</param>
-        /// <param name="userId">User ID</param>
-        /// <param name="callback">
-        /// Callback to invoke when inventory has been loaded.  This is required because
-        /// loading may be asynchronous, even on standalone
-        /// </param>
-        /// <returns></returns>
-        public static CachedUserInfo CreateUserWithInventory(
-            CommunicationsManager commsManager, string firstName, string lastName, 
-            UUID userId, OnInventoryReceivedDelegate callback)
-        {
-            return CreateUserWithInventory(commsManager, firstName, lastName, "troll", userId, callback);
-        }
+        ///// <summary>
+        ///// Create a test user with a standard inventory
+        ///// </summary>
+        ///// <param name="commsManager"></param>
+        ///// <param name="firstName">First name of user</param>
+        ///// <param name="lastName">Last name of user</param>
+        ///// <param name="userId">User ID</param>
+        ///// <param name="callback">
+        ///// Callback to invoke when inventory has been loaded.  This is required because
+        ///// loading may be asynchronous, even on standalone
+        ///// </param>
+        ///// <returns></returns>
+        //public static CachedUserInfo CreateUserWithInventory(
+        //    CommunicationsManager commsManager, string firstName, string lastName, 
+        //    UUID userId, OnInventoryReceivedDelegate callback)
+        //{
+        //    return CreateUserWithInventory(commsManager, firstName, lastName, "troll", userId, callback);
+        //}
 
-        /// <summary>
-        /// Create a test user with a standard inventory
-        /// </summary>
-        /// <param name="commsManager"></param>
-        /// <param name="firstName">First name of user</param>
-        /// <param name="lastName">Last name of user</param>
-        /// <param name="password">Password</param>
-        /// <param name="userId">User ID</param>
-        /// <param name="callback">
-        /// Callback to invoke when inventory has been loaded.  This is required because
-        /// loading may be asynchronous, even on standalone
-        /// </param>
-        /// <returns></returns>
-        public static CachedUserInfo CreateUserWithInventory(
-            CommunicationsManager commsManager, string firstName, string lastName, string password,
-            UUID userId, OnInventoryReceivedDelegate callback)
-        {
-            LocalUserServices lus = (LocalUserServices)commsManager.UserService;
-            lus.AddUser(firstName, lastName, password, "bill@bailey.com", 1000, 1000, userId);
+        ///// <summary>
+        ///// Create a test user with a standard inventory
+        ///// </summary>
+        ///// <param name="commsManager"></param>
+        ///// <param name="firstName">First name of user</param>
+        ///// <param name="lastName">Last name of user</param>
+        ///// <param name="password">Password</param>
+        ///// <param name="userId">User ID</param>
+        ///// <param name="callback">
+        ///// Callback to invoke when inventory has been loaded.  This is required because
+        ///// loading may be asynchronous, even on standalone
+        ///// </param>
+        ///// <returns></returns>
+        //public static CachedUserInfo CreateUserWithInventory(
+        //    CommunicationsManager commsManager, string firstName, string lastName, string password,
+        //    UUID userId, OnInventoryReceivedDelegate callback)
+        //{
+        //    LocalUserServices lus = (LocalUserServices)commsManager.UserService;
+        //    lus.AddUser(firstName, lastName, password, "bill@bailey.com", 1000, 1000, userId);
             
-            CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(userId);
-            userInfo.OnInventoryReceived += callback;
-            userInfo.FetchInventory();
+        //    CachedUserInfo userInfo = commsManager.UserProfileCacheService.GetUserDetails(userId);
+        //    userInfo.OnInventoryReceived += callback;
+        //    userInfo.FetchInventory();
             
-            return userInfo;
-        }
+        //    return userInfo;
+        //}
     }
 }