Resolve merge commits, stage 1

7 files changed, 87 insertions, 32 deletions

diff --git a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
index 9b68331..99eb124 100644
--- a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
@@ -42,7 +42,7 @@ namespace OpenSim.Tests.Common
         /// <returns></returns>
         public static AssetBase CreateAsset()
         {
-            return CreateAsset(UUID.Random(), AssetType.Notecard, "hello", UUID.Random());
+            return CreateAsset(UUID.Random());
         }
 
         /// <summary>
@@ -50,9 +50,9 @@ namespace OpenSim.Tests.Common
         /// </summary>
         /// <param name="creatorId">/param>
         /// <returns></returns>
-        public static AssetBase CreateAsset(UUID creatorId)
+        public static AssetBase CreateAsset(UUID id)
         {
-            return CreateAsset(UUID.Random(), AssetType.Notecard, "hello", creatorId);
+            return CreateAsset(id, AssetType.Notecard, "hello", UUID.Random());
         }
         
         /// <summary>
diff --git a/OpenSim/Tests/Common/Helpers/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
index bef0481..ea433a6 100644
--- a/OpenSim/Tests/Common/Helpers/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/SceneHelpers.cs
@@ -40,6 +40,7 @@ using OpenSim.Region.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.CoreModules.Avatar.Gods;
+using OpenSim.Region.CoreModules.Asset;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication;
 using OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory;
@@ -54,8 +55,13 @@ namespace OpenSim.Tests.Common
     /// <summary>
     /// Helpers for setting up scenes.
     /// </summary>
-    public class SceneSetupHelpers
+    public class SceneHelpers
     {
+        public static TestScene SetupScene()
+        {
+            return SetupScene(null);
+        }
+
         /// <summary>
         /// Set up a test scene
         /// </summary>
@@ -63,9 +69,14 @@ namespace OpenSim.Tests.Common
         /// Automatically starts service threads, as would the normal runtime.
         /// </remarks>
         /// <returns></returns>
-        public static TestScene SetupScene()
+        public static TestScene SetupScene(CoreAssetCache cache)
+        {
+            return SetupScene("Unit test region", UUID.Random(), 1000, 1000, cache);
+        }
+
+        public static TestScene SetupScene(string name, UUID id, uint x, uint y)
         {
-            return SetupScene("Unit test region", UUID.Random(), 1000, 1000);
+            return SetupScene(name, id, x, y, null);
         }
 
         /// <summary>
@@ -78,7 +89,7 @@ namespace OpenSim.Tests.Common
         /// <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)
+        public static TestScene SetupScene(string name, UUID id, uint x, uint y, CoreAssetCache cache)
         {
             Console.WriteLine("Setting up test scene {0}", name);
 
@@ -103,7 +114,7 @@ namespace OpenSim.Tests.Common
             godsModule.Initialise(testScene, new IniConfigSource());
             testScene.AddModule(godsModule.Name, godsModule);
 
-            LocalAssetServicesConnector       assetService       = StartAssetService(testScene);
+            LocalAssetServicesConnector       assetService       = StartAssetService(testScene, cache);
                                                                    StartAuthenticationService(testScene);
             LocalInventoryServicesConnector   inventoryService   = StartInventoryService(testScene);
                                                                    StartGridService(testScene);
@@ -132,7 +143,7 @@ namespace OpenSim.Tests.Common
             return testScene;
         }
 
-        private static LocalAssetServicesConnector StartAssetService(Scene testScene)
+        private static LocalAssetServicesConnector StartAssetService(Scene testScene, CoreAssetCache cache)
         {
             LocalAssetServicesConnector assetService = new LocalAssetServicesConnector();
             IConfigSource config = new IniConfigSource();
@@ -145,6 +156,20 @@ namespace OpenSim.Tests.Common
             
             assetService.Initialise(config);
             assetService.AddRegion(testScene);
+
+            if (cache != null)
+            {
+                IConfigSource cacheConfig = new IniConfigSource();
+                cacheConfig.AddConfig("Modules");
+                cacheConfig.Configs["Modules"].Set("AssetCaching", "CoreAssetCache");
+                cacheConfig.AddConfig("AssetCache");
+
+                cache.Initialise(cacheConfig);
+                cache.AddRegion(testScene);
+                cache.RegionLoaded(testScene);
+                testScene.AddRegionModule(cache.Name, cache);
+            }
+
             assetService.RegionLoaded(testScene);
             testScene.AddRegionModule(assetService.Name, assetService);
             
@@ -331,6 +356,8 @@ namespace OpenSim.Tests.Common
             agentData.InventoryFolder = UUID.Zero;
             agentData.startpos = Vector3.Zero;
             agentData.CapsPath = "http://wibble.com";
+            agentData.ServiceURLs = new Dictionary<string, object>();
+            agentData.Appearance = new AvatarAppearance();
 
             return agentData;
         }
@@ -341,9 +368,9 @@ namespace OpenSim.Tests.Common
         /// <param name="scene"></param>
         /// <param name="agentId"></param>
         /// <returns></returns>
-        public static TestClient AddRootAgent(Scene scene, UUID agentId)
+        public static ScenePresence AddScenePresence(Scene scene, UUID agentId)
         {
-            return AddRootAgent(scene, GenerateAgentData(agentId));
+            return AddScenePresence(scene, GenerateAgentData(agentId));
         }
 
         /// <summary>
@@ -364,7 +391,7 @@ namespace OpenSim.Tests.Common
         /// <param name="scene"></param>
         /// <param name="agentData"></param>
         /// <returns></returns>
-        public static TestClient AddRootAgent(Scene scene, AgentCircuitData agentData)
+        public static ScenePresence AddScenePresence(Scene scene, AgentCircuitData agentData)
         {
             string reason;
 
@@ -379,14 +406,14 @@ namespace OpenSim.Tests.Common
 
             // Stage 2: add the new client as a child agent to the scene
             TestClient client = new TestClient(agentData, scene);
-            scene.AddNewClient(client);
+            scene.AddNewClient(client, PresenceType.User);
 
             // Stage 3: Complete the entrance into the region.  This converts the child agent into a root agent.
             ScenePresence scp = scene.GetScenePresence(agentData.AgentID);
-            scp.CompleteMovement(client);
+            scp.CompleteMovement(client, true);
             //scp.MakeRootAgent(new Vector3(90, 90, 90), true);
 
-            return client;
+            return scp;
         }
 
         /// <summary>
diff --git a/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs
index 5215c34..a8f0d59 100644
--- a/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/TaskInventoryHelpers.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Tests.Common
         /// <param name="id"></param>
         public static TaskInventoryItem AddSceneObject(Scene scene, SceneObjectPart sop, string itemName, UUID id)
         {
-            SceneObjectGroup taskSceneObject = SceneSetupHelpers.CreateSceneObject(1, UUID.Zero);
+            SceneObjectGroup taskSceneObject = SceneHelpers.CreateSceneObject(1, UUID.Zero);
             AssetBase taskSceneObjectAsset = AssetHelpers.CreateAsset(0x10, taskSceneObject);
             scene.AssetService.Store(taskSceneObjectAsset);
             TaskInventoryItem taskSceneObjectItem
diff --git a/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs b/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs
index d924ecd..b73df2c 100644
--- a/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/UserAccountHelpers.cs
@@ -118,13 +118,12 @@ namespace OpenSim.Tests.Common
 
         public static UserAccount CreateUserWithInventory(Scene scene)
         {
-            return CreateUserWithInventory(scene, 99);
+            return CreateUserWithInventory(scene, TestHelpers.ParseTail(99));
         }
 
-        public static UserAccount CreateUserWithInventory(Scene scene, int uuidTail)
+        public static UserAccount CreateUserWithInventory(Scene scene, UUID userId)
         {
-            return CreateUserWithInventory(
-                scene, "Bill", "Bailey", new UUID(string.Format("00000000-0000-0000-0000-{0:X12}", uuidTail)), "troll");
+            return CreateUserWithInventory(scene, "Bill", "Bailey", userId, "troll");
         }
 
         public static UserAccount CreateUserWithInventory(
@@ -139,7 +138,6 @@ namespace OpenSim.Tests.Common
         {
             // FIXME: This should really be set up by UserAccount itself
             ua.ServiceURLs = new Dictionary<string, object>();
-                
             scene.UserAccountService.StoreUserAccount(ua);
             scene.InventoryService.CreateUserInventory(ua.PrincipalID);
             scene.AuthenticationService.SetPassword(ua.PrincipalID, pw);
diff --git a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
index 1703597..4e60ca9 100644
--- a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
@@ -52,7 +52,22 @@ namespace OpenSim.Tests.Common
         /// <returns></returns>
         public static InventoryItemBase CreateInventoryItem(Scene scene, string itemName, UUID userId)
         {
-            return CreateInventoryItem(scene, itemName, UUID.Random(), userId);
+            return CreateInventoryItem(scene, itemName, UUID.Random(), UUID.Random(), userId, InventoryType.Notecard);
+        }
+
+        /// <summary>
+        /// Creates an item of the given type with an accompanying asset.
+        /// </summary>
+        /// <param name="scene"></param>
+        /// <param name="itemName"></param>
+        /// <param name="itemId"></param>
+        /// <param name="userId"></param>
+        /// <param name="type">Type of item to create</param>
+        /// <returns></returns>
+        public static InventoryItemBase CreateInventoryItem(
+            Scene scene, string itemName, UUID userId, InventoryType type)
+        {
+            return CreateInventoryItem(scene, itemName, UUID.Random(), UUID.Random(), userId, type);
         }
 
         /// <summary>
@@ -61,18 +76,32 @@ namespace OpenSim.Tests.Common
         /// <param name="scene"></param>
         /// <param name="itemName"></param>
         /// <param name="itemId"></param>
+        /// <param name="assetId"></param>
         /// <param name="userId"></param>
+        /// <param name="type">Type of item to create</param>
         /// <returns></returns>
-        public static InventoryItemBase CreateInventoryItem(Scene scene, string itemName, UUID itemId, UUID userId)
+        public static InventoryItemBase CreateInventoryItem(
+            Scene scene, string itemName, UUID itemId, UUID assetId, UUID userId, InventoryType type)
         {
-            AssetBase asset = AssetHelpers.CreateAsset(scene, userId);
+            AssetBase asset = null;
+
+            if (type == InventoryType.Notecard)
+                asset = AssetHelpers.CreateAsset(scene, userId);
+            else if (type == InventoryType.Object)
+                asset
+                    = AssetHelpers.CreateAsset(assetId, SceneHelpers.CreateSceneObject(1, userId));
+            else
+                throw new Exception(string.Format("Inventory type {0} not supported", type));
+
+            scene.AssetService.Store(asset);
+
             InventoryItemBase item = new InventoryItemBase();
             item.Name = itemName;
             item.AssetID = asset.FullID;
             item.ID = itemId;
             item.Owner = userId;
             item.AssetType = asset.Type;
-            item.InvType = (int)InventoryType.Notecard;
+            item.InvType = (int)type;
 
             InventoryFolderBase folder = scene.InventoryService.GetFolderForType(userId, AssetType.Notecard);
             
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 0f89f84..014f7f6 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -95,7 +95,7 @@ namespace OpenSim.Tests.Common.Mock
         public event DeRezObject OnDeRezObject;
         public event Action<IClientAPI> OnRegionHandShakeReply;
         public event GenericCall1 OnRequestWearables;
-        public event GenericCall1 OnCompleteMovementToRegion;
+        public event Action<IClientAPI, bool> OnCompleteMovementToRegion;
         public event UpdateAgent OnPreAgentUpdate;
         public event UpdateAgent OnAgentUpdate;
         public event AgentRequestSit OnAgentRequestSit;
@@ -234,7 +234,7 @@ namespace OpenSim.Tests.Common.Mock
         public event ScriptReset OnScriptReset;
         public event GetScriptRunning OnGetScriptRunning;
         public event SetScriptRunning OnSetScriptRunning;
-        public event UpdateVector OnAutoPilotGo;
+        public event Action<Vector3, bool> OnAutoPilotGo;
 
         public event TerrainUnacked OnUnackedTerrain;
 
@@ -455,7 +455,7 @@ namespace OpenSim.Tests.Common.Mock
 
         public void CompleteMovement()
         {
-            OnCompleteMovementToRegion(this);
+            OnCompleteMovementToRegion(this, true);
         }
 
         public virtual void ActivateGesture(UUID assetId, UUID gestureId)
@@ -579,7 +579,7 @@ namespace OpenSim.Tests.Common.Mock
 
             // Stage 2: add the new client as a child agent to the scene
             TeleportSceneClient = new TestClient(newAgent, TeleportTargetScene);
-            TeleportTargetScene.AddNewClient(TeleportSceneClient);
+            TeleportTargetScene.AddNewClient(TeleportSceneClient, PresenceType.User);
         }
 
         public virtual void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint,
@@ -759,9 +759,10 @@ namespace OpenSim.Tests.Common.Mock
 
             if (OnCompleteMovementToRegion != null)
             {
-                OnCompleteMovementToRegion(this);
+                OnCompleteMovementToRegion(this, true);
             }
         }
+        
         public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID)
         {
         }
@@ -890,7 +891,7 @@ namespace OpenSim.Tests.Common.Mock
         }
         public void Close(bool sendStop)
         {
-            m_scene.RemoveClient(AgentId);
+            m_scene.RemoveClient(AgentId, true);
         }
 
         public void Start()
diff --git a/OpenSim/Tests/Common/TestHelper.cs b/OpenSim/Tests/Common/TestHelpers.cs
index 86bd107..ced06de 100644
--- a/OpenSim/Tests/Common/TestHelper.cs
+++ b/OpenSim/Tests/Common/TestHelpers.cs
@@ -32,7 +32,7 @@ using OpenMetaverse;
 
 namespace OpenSim.Tests.Common
 {
-    public class TestHelper
+    public class TestHelpers
     {
         public static bool AssertThisDelegateCausesArgumentException(TestDelegate d)
         {