remove mock asset service for tests in favour of always using the real one

OpenSim/Region/Framework/Scenes/Tests/UuidGathererTests.cs

@@ -47,7 +47,9 @@ namespace OpenSim.Region.Framework.Scenes.Tests
         [SetUp]
         public void Init()
         {
-            m_assetService = new MockAssetService();
+            // FIXME: We don't need a full scene here - it would be enough to set up the asset service.
+            Scene scene = SceneSetupHelpers.SetupScene();
+            m_assetService = scene.AssetService;
             m_uuidGatherer = new UuidGatherer(m_assetService);
         }
 

OpenSim/Tests/Common/Mock/MockAssetService.cs

@@ -1,123 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the OpenSimulator Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using log4net;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Data;
-using OpenSim.Services.Interfaces;
-using Nini.Config;
-
-namespace OpenSim.Tests.Common.Mock
-{
-    public class MockAssetService : IAssetService
-    {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        
-        private readonly Dictionary<string, AssetBase> Assets = new Dictionary<string, AssetBase>();
-
-        public MockAssetService() {}
-
-        /// <summary>
-        /// This constructor is required if the asset service is being created reflectively (which is the case in some
-        /// tests).
-        /// </summary>
-        /// <param name="config"></param>
-        public MockAssetService(IConfigSource config) {}
-        
-        public AssetBase Get(string id)
-        {
-//            m_log.DebugFormat("[MOCK ASSET SERVICE]: Getting asset with id {0}", id);
-            
-            AssetBase asset;
-            if (Assets.ContainsKey(id))
-            {
-                asset = Assets[id];
-//                m_log.DebugFormat(
-//                    "[MOCK ASSET SERVICE]: Got asset {0} {1}, bytes {2}", asset.Name, asset.ID, asset.Data.Length);                
-            }
-            else
-            {
-                asset = null;           
-            }
-            
-            return asset;
-        }
-
-        public AssetBase GetCached(string id)
-        {
-            return Get(id);
-        }
-
-        public AssetMetadata GetMetadata(string id)
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public byte[] GetData(string id)
-        {
-//            m_log.DebugFormat("[MOCK ASSET SERVICE]: Requesting data for asset {0}", id);
-            
-            AssetBase asset = Get(id);
-            
-            if (asset == null)
-                return null;
-            else
-                return asset.Data;
-        }
-
-        public bool Get(string id, object sender, AssetRetrieved handler)
-        {
-            handler(id, sender, Get(id));
-            
-            return true;
-        }
-
-        public string Store(AssetBase asset)
-        {
-//            m_log.DebugFormat(
-//                "[MOCK ASSET SERVICE]: Storing asset {0} {1}, bytes {2}", asset.Name, asset.ID, asset.Data.Length);
-            
-            Assets[asset.ID] = asset;
-
-            return asset.ID;
-        }
-
-        public bool UpdateContent(string id, byte[] data)
-        {
-            throw new System.NotImplementedException();
-        }
-
-        public bool Delete(string id)
-        {
-            throw new System.NotImplementedException();
-        }
-    }
-}

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.Configs["Modules"].Set("AssetServices", "LocalAssetServicesConnector");            
-            
             config.AddConfig("AssetService");
-            if (real)
+            config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService");            
-                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("StorageProvider", "OpenSim.Tests.Common.dll");
             
             assetService.Initialise(config);