From 54e885581989ddfaf525753ede12c4d4d797cba0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 15 Apr 2011 01:23:26 +0100
Subject: remove mock asset service for tests in favour of always using the
 real one

---
 OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Tests/Common/Setup')

diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 97d4ace..484a97d 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -132,7 +132,7 @@ namespace OpenSim.Tests.Common.Setup
             testScene.AddModule(godsModule.Name, godsModule);
             realServices = realServices.ToLower();
 
-            LocalAssetServicesConnector assetService = StartAssetService(testScene, realServices.Contains("asset"));
+            LocalAssetServicesConnector assetService = StartAssetService(testScene);
 
             // For now, always started a 'real' authentication service
             StartAuthenticationService(testScene, true);
@@ -164,19 +164,15 @@ namespace OpenSim.Tests.Common.Setup
             return testScene;
         }
 
-        private static LocalAssetServicesConnector StartAssetService(Scene testScene, bool real)
+        private static LocalAssetServicesConnector StartAssetService(Scene testScene)
         {
             LocalAssetServicesConnector assetService = new LocalAssetServicesConnector();
             IConfigSource config = new IniConfigSource();
-            config.AddConfig("Modules");            
-            config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector");
             
+            config.AddConfig("Modules");            
+            config.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector");            
             config.AddConfig("AssetService");
-            if (real)
-                config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService");
-            else
-                config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:MockAssetService");
-            
+            config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService");            
             config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
             
             assetService.Initialise(config);
-- 
cgit v1.1