3 files changed, 139 insertions, 114 deletions

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..9e718f6 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());
@@ -181,6 +185,8 @@ namespace OpenSim.Tests.Common.Setup
                     StartInventoryService(testScene, false);
                 if (realServices.Contains("grid"))
                     StartGridService(testScene, true);
+                if (realServices.Contains("useraccounts"))
+                    StartUserAccountService(testScene, true);
 
             }
             // If not, make sure the shared module gets references to this new scene
@@ -194,8 +200,6 @@ namespace OpenSim.Tests.Common.Setup
             m_inventoryService.PostInitialise();
             m_assetService.PostInitialise();
 
-            testScene.CommsManager.UserService.SetInventoryService(testScene.InventoryService);
-
             testScene.SetModuleInterfaces();
 
             testScene.LandChannel = new TestLandChannel(testScene);
@@ -269,6 +273,28 @@ namespace OpenSim.Tests.Common.Setup
             //testScene.AddRegionModule(m_gridService.Name, m_gridService);
         }
 
+        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");
+            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_gridService.Name, m_gridService);
+        }
+
 
         /// <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;
+        //}
     }
 }