3 files changed, 221 insertions, 31 deletions

diff --git a/OpenSim/Tests/Common/Mock/TestAssetService.cs b/OpenSim/Tests/Common/Mock/TestAssetService.cs
index d35e3ed..5f1184b 100644
--- a/OpenSim/Tests/Common/Mock/TestAssetService.cs
+++ b/OpenSim/Tests/Common/Mock/TestAssetService.cs
@@ -31,13 +31,18 @@ using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Data;
 using OpenSim.Services.Interfaces;
+using Nini.Config;
 
 namespace OpenSim.Tests.Common.Mock
 {
     public class TestAssetService : IAssetService
     {
-        private readonly Dictionary<string, AssetBase> Assets = new Dictionary<string, AssetBase>();        
-     
+        private readonly Dictionary<string, AssetBase> Assets = new Dictionary<string, AssetBase>();
+
+        public TestAssetService(IConfigSource config)
+        {
+        }
+        
         public AssetBase Get(string id)
         {
             return Assets[ id ];
diff --git a/OpenSim/Tests/Common/Mock/TestInventoryService.cs b/OpenSim/Tests/Common/Mock/TestInventoryService.cs
new file mode 100644
index 0000000..cf1a3a9
--- /dev/null
+++ b/OpenSim/Tests/Common/Mock/TestInventoryService.cs
@@ -0,0 +1,133 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using OpenSim.Framework;
+using OpenMetaverse;
+using OpenSim.Services.Interfaces;
+using Nini.Config;
+
+namespace OpenSim.Tests.Common.Mock
+{
+    public class TestInventoryService : IInventoryService
+    {
+        public TestInventoryService()
+        {
+        }
+        
+        public TestInventoryService(IConfigSource config)
+        {
+        }
+
+        /// <summary>
+        /// <see cref="OpenSim.Framework.Communications.IInterServiceInventoryServices"/>
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public bool CreateUserInventory(UUID userId)
+        {
+            return false;
+        }
+
+        /// <summary>
+        /// <see cref="OpenSim.Framework.Communications.IInterServiceInventoryServices"/>
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public List<InventoryFolderBase> GetInventorySkeleton(UUID userId)
+        {
+            List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
+            InventoryFolderBase folder = new InventoryFolderBase();
+            folder.ID = UUID.Random();
+            folder.Owner = userId;
+            folders.Add(folder);
+            return folders;
+        }
+
+        /// <summary>
+        /// Returns a list of all the active gestures in a user's inventory.
+        /// </summary>
+        /// <param name="userId">
+        /// The <see cref="UUID"/> of the user
+        /// </param>
+        /// <returns>
+        /// A flat list of the gesture items.
+        /// </returns>
+        public List<InventoryItemBase> GetActiveGestures(UUID userId)
+        {
+            return null;
+        }
+
+        public InventoryCollection GetUserInventory(UUID userID)
+        {
+            return null;
+        }
+
+        public void GetUserInventory(UUID userID, OpenSim.Services.Interfaces.InventoryReceiptCallback callback)
+        {
+        }
+
+        public List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
+        {
+            return null;
+        }
+
+        public bool AddFolder(InventoryFolderBase folder)
+        {
+            return false;
+        }
+
+        public bool UpdateFolder(InventoryFolderBase folder)
+        {
+            return false;
+        }
+
+        public bool MoveFolder(InventoryFolderBase folder)
+        {
+            return false;
+        }
+
+        public bool PurgeFolder(InventoryFolderBase folder)
+        {
+            return false;
+        }
+
+        public bool AddItem(InventoryItemBase item)
+        {
+            return false;
+        }
+
+        public bool UpdateItem(InventoryItemBase item)
+        {
+            return false;
+        }
+
+        public bool DeleteItem(InventoryItemBase item)
+        {
+            return false;
+        }
+
+        public InventoryItemBase QueryItem(InventoryItemBase item)
+        {
+            return null;
+        }
+
+        public InventoryFolderBase QueryFolder(InventoryFolderBase folder)
+        {
+            return null;
+        }
+
+        public bool HasInventoryForUser(UUID userID)
+        {
+            return false;
+        }
+
+        public InventoryFolderBase RequestRootFolder(UUID userID)
+        {
+            InventoryFolderBase root = new InventoryFolderBase();
+            root.ID = UUID.Random();
+            root.Owner = userID;
+            root.ParentID = UUID.Zero;
+            return root;
+        }
+    }
+}
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index c11691f..fbe0e46 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -54,6 +54,10 @@ namespace OpenSim.Tests.Common.Setup
     /// </summary>
     public class SceneSetupHelpers
     {
+        private static ISharedRegionModule m_assetService = null;
+        private static ISharedRegionModule m_inventoryService = null;
+        private static TestCommunicationsManager commsManager = null;
+
         /// <summary>
         /// Set up a test scene
         /// </summary>
@@ -63,7 +67,7 @@ namespace OpenSim.Tests.Common.Setup
         /// <returns></returns>
         public static TestScene SetupScene()
         {
-            return SetupScene(true);
+            return SetupScene("");
         }
         
         /// <summary>
@@ -72,12 +76,17 @@ namespace OpenSim.Tests.Common.Setup
         /// 
         /// <param name="startServices">Start associated service threads for the scene</param>
         /// <returns></returns>
-        public static TestScene SetupScene(bool startServices)
+        public static TestScene SetupScene(String realServices)
         {
             return SetupScene(
-                "Unit test region", UUID.Random(), 1000, 1000, new TestCommunicationsManager(), startServices);
+                "Unit test region", UUID.Random(), 1000, 1000, new TestCommunicationsManager(), realServices);
+        }
+
+        public static TestScene SetupScene(TestCommunicationsManager cm, String realServices)
+        {
+            return SetupScene(
+                "Unit test region", UUID.Random(), 1000, 1000, cm, "");
         }
-        
         /// <summary>
         /// Set up a test scene
         /// </summary>
@@ -89,28 +98,35 @@ namespace OpenSim.Tests.Common.Setup
         /// <returns></returns>
         public static TestScene SetupScene(string name, UUID id, uint x, uint y, TestCommunicationsManager cm)
         {
-            return SetupScene(name, id, x, y, cm, true);
+            return SetupScene(name, id, x, y, cm, "");
         }
 
         /// <summary>
-        /// Set up a test scene
+        /// Set up a scene. 
         /// </summary>
         /// <param name="name">Name of the region</param>
         /// <param name="id">ID of the region</param>
         /// <param name="x">X co-ordinate of the region</param>
         /// <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>
-        /// <param name="startServices">Start associated threads for the services used by the scene</param>
+        /// <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, bool startServices)
+            string name, UUID id, uint x, uint y, TestCommunicationsManager cm, String realServices)
         {
+            bool newScene= false;
+
             Console.WriteLine("Setting up test scene {0}", name);
+            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
-            MainConsole.Instance = new LocalConsole("TEST PROMPT");
-            
-            MainServer.Instance = new BaseHttpServer(980);
             RegionInfo regInfo = new RegionInfo(x, y, new IPEndPoint(IPAddress.Loopback, 9000), "127.0.0.1");
             regInfo.RegionName = name;
             regInfo.RegionID = id;
@@ -132,44 +148,80 @@ namespace OpenSim.Tests.Common.Setup
             IRegionModule godsModule = new GodsModule();
             godsModule.Initialise(testScene, new IniConfigSource());
             testScene.AddModule(godsModule.Name, godsModule);
+            realServices = realServices.ToLower();
+            IniConfigSource config = new IniConfigSource();
+            if ((m_assetService == null && m_inventoryService == null) || newScene)
+            {
+                if (realServices.Contains("asset"))
+                    StartAssetService(testScene, true);
+                else
+                    StartAssetService(testScene, false);
+                if (realServices.Contains("inventory"))
+                    StartInventoryService(testScene, true);
+                else
+                    StartInventoryService(testScene, false);
+            }
+            else
+            {
+                m_assetService.AddRegion(testScene);
+                m_assetService.RegionLoaded(testScene);
+                m_inventoryService.AddRegion(testScene);
+                m_inventoryService.RegionLoaded(testScene);
+            }
+            m_inventoryService.PostInitialise();
+            m_assetService.PostInitialise();
+
+            testScene.CommsManager.UserService.SetInventoryService(testScene.InventoryService);
 
+            testScene.SetModuleInterfaces();
+
+            testScene.LandChannel = new TestLandChannel();
+            testScene.LoadWorldMap();
+
+            PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager();
+            physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll");
+            testScene.PhysicsScene
+                = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", configSource, "test");
+            
+            return testScene;
+        }
+
+        private static void StartAssetService(Scene testScene, bool real)
+        {
             ISharedRegionModule assetService = new LocalAssetServicesConnector();
             IniConfigSource config = new IniConfigSource();
             config.AddConfig("Modules");
             config.AddConfig("AssetService");
             config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector");
-            config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService");
+            if (real)
+                config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService");
+            else
+                config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:TestAssetService");
             config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
-            assetService.Initialise(config); 
+            assetService.Initialise(config);
             assetService.AddRegion(testScene);
             assetService.RegionLoaded(testScene);
             testScene.AddRegionModule(assetService.Name, assetService);
-            assetService.PostInitialise();
+            m_assetService = assetService;
+        }
 
+        private static void StartInventoryService(Scene testScene, bool real)
+        {
             ISharedRegionModule inventoryService = new LocalInventoryServicesConnector();
-            config = new IniConfigSource();
+            IniConfigSource config = new IniConfigSource();
             config.AddConfig("Modules");
             config.AddConfig("InventoryService");
             config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector");
-            config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:InventoryService");
+            if (real)
+                config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:InventoryService");
+            else
+                config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:TestInventoryService");
             config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
             inventoryService.Initialise(config);
             inventoryService.AddRegion(testScene);
             inventoryService.RegionLoaded(testScene);
             testScene.AddRegionModule(inventoryService.Name, inventoryService);
-            inventoryService.PostInitialise();
- 
-            testScene.SetModuleInterfaces();
-
-            testScene.LandChannel = new TestLandChannel();
-            testScene.LoadWorldMap();
-
-            PhysicsPluginManager physicsPluginManager = new PhysicsPluginManager();
-            physicsPluginManager.LoadPluginsFromAssembly("Physics/OpenSim.Region.Physics.BasicPhysicsPlugin.dll");
-            testScene.PhysicsScene
-                = physicsPluginManager.GetPhysicsScene("basicphysics", "ZeroMesher", configSource, "test");
-
-            return testScene;
+            m_inventoryService = inventoryService;
         }
 
         /// <summary>