From 79bd430e08b9e8612194d9b02504f8f4acd889f6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 15 Apr 2011 01:10:26 +0100
Subject: Remove the mock inventory service for tests and just use the real one
 all the time with an in-memory data plugin

---
 OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

(limited to 'OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs')

diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 837f4e2..97d4ace 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -137,7 +137,7 @@ namespace OpenSim.Tests.Common.Setup
             // For now, always started a 'real' authentication service
             StartAuthenticationService(testScene, true);
 
-            LocalInventoryServicesConnector   inventoryService   = StartInventoryService(testScene, realServices.Contains("inventory"));
+            LocalInventoryServicesConnector   inventoryService   = StartInventoryService(testScene);
                                                                    StartGridService(testScene, true);
             LocalUserAccountServicesConnector userAccountService = StartUserAccountService(testScene);            
             LocalPresenceServicesConnector    presenceService    = StartPresenceService(testScene);
@@ -208,24 +208,17 @@ namespace OpenSim.Tests.Common.Setup
             //m_authenticationService = service;
         }
 
-        private static LocalInventoryServicesConnector StartInventoryService(Scene testScene, bool real)
+        private static LocalInventoryServicesConnector StartInventoryService(Scene testScene)
         {
             LocalInventoryServicesConnector inventoryService = new LocalInventoryServicesConnector();
-            IConfigSource config = new IniConfigSource();
+            
+            IConfigSource config = new IniConfigSource();            
             config.AddConfig("Modules");
             config.AddConfig("InventoryService");
             config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector");
-
-            if (real)
-            {
-                config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:InventoryService");
-            }
-            else
-            {
-                config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:MockInventoryService");
-            }
-
+            config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:InventoryService");
             config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
+            
             inventoryService.Initialise(config);
             inventoryService.AddRegion(testScene);
             inventoryService.RegionLoaded(testScene);
-- 
cgit v1.1