diff options
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r-- | OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs | 4 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 5 |
2 files changed, 5 insertions, 4 deletions
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 | |||
59 | m_userDataPlugin = new TestUserDataPlugin(); | 59 | m_userDataPlugin = new TestUserDataPlugin(); |
60 | m_inventoryDataPlugin = new TestInventoryDataPlugin(); | 60 | m_inventoryDataPlugin = new TestInventoryDataPlugin(); |
61 | 61 | ||
62 | SQLAssetServer assetService = new SQLAssetServer(new TestAssetDataPlugin()); | ||
63 | IAssetCache ac = new AssetCache(assetService); | ||
64 | m_assetCache = ac; | ||
65 | |||
62 | LocalInventoryService lis = new LocalInventoryService(); | 66 | LocalInventoryService lis = new LocalInventoryService(); |
63 | lis.AddPlugin(m_inventoryDataPlugin); | 67 | lis.AddPlugin(m_inventoryDataPlugin); |
64 | m_interServiceInventoryService = lis; | 68 | 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 | |||
73 | AgentCircuitManager acm = new AgentCircuitManager(); | 73 | AgentCircuitManager acm = new AgentCircuitManager(); |
74 | SceneCommunicationService scs = new SceneCommunicationService(cm); | 74 | SceneCommunicationService scs = new SceneCommunicationService(cm); |
75 | 75 | ||
76 | SQLAssetServer assetService = new SQLAssetServer(new TestAssetDataPlugin()); | ||
77 | IAssetCache ac = (IAssetCache) new AssetCache(assetService); | ||
78 | |||
79 | StorageManager sm = new StorageManager("OpenSim.Data.Null.dll", "", ""); | 76 | StorageManager sm = new StorageManager("OpenSim.Data.Null.dll", "", ""); |
80 | IConfigSource configSource = new IniConfigSource(); | 77 | IConfigSource configSource = new IniConfigSource(); |
81 | 78 | ||
82 | TestScene testScene = new TestScene( | 79 | TestScene testScene = new TestScene( |
83 | regInfo, acm, cm, scs, ac, sm, null, false, false, false, configSource, null); | 80 | regInfo, acm, cm, scs, cm.AssetCache, sm, null, false, false, false, configSource, null); |
84 | 81 | ||
85 | IRegionModule capsModule = new CapabilitiesModule(); | 82 | IRegionModule capsModule = new CapabilitiesModule(); |
86 | capsModule.Initialise(testScene, new IniConfigSource()); | 83 | capsModule.Initialise(testScene, new IniConfigSource()); |