From ec07e1aad6fb3d28fcf4a3eca0becf4e0e209965 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 16 Feb 2009 18:33:05 +0000
Subject: * Iniital inventory archive test code.  Doesn't actually do any
 testing yet

---
 OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs | 4 ++++
 OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs        | 5 +----
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Tests/Common')

diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
index 566d8d2..9b92421 100644
--- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
+++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs
@@ -59,6 +59,10 @@ namespace OpenSim.Tests.Common.Mock
             m_userDataPlugin = new TestUserDataPlugin();
             m_inventoryDataPlugin = new TestInventoryDataPlugin();
 
+            SQLAssetServer assetService = new SQLAssetServer(new TestAssetDataPlugin());
+            IAssetCache ac = new AssetCache(assetService); 
+            m_assetCache = ac;
+            
             LocalInventoryService lis = new LocalInventoryService();
             lis.AddPlugin(m_inventoryDataPlugin);
             m_interServiceInventoryService = lis;
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index 81fccbb..813c8b2 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -73,14 +73,11 @@ namespace OpenSim.Tests.Common.Setup
             AgentCircuitManager acm = new AgentCircuitManager();
             SceneCommunicationService scs = new SceneCommunicationService(cm);
             
-            SQLAssetServer assetService = new SQLAssetServer(new TestAssetDataPlugin());
-            IAssetCache ac = (IAssetCache) new AssetCache(assetService);
-            
             StorageManager sm = new StorageManager("OpenSim.Data.Null.dll", "", "");            
             IConfigSource configSource = new IniConfigSource();
             
             TestScene testScene = new TestScene(
-                regInfo, acm, cm, scs, ac, sm, null, false, false, false, configSource, null);
+                regInfo, acm, cm, scs, cm.AssetCache, sm, null, false, false, false, configSource, null);
                        
             IRegionModule capsModule = new CapabilitiesModule();
             capsModule.Initialise(testScene, new IniConfigSource());
-- 
cgit v1.1