diff options
Diffstat (limited to 'OpenSim/Tests/Common')
-rw-r--r-- | OpenSim/Tests/Common/Mock/MockAssetService.cs (renamed from OpenSim/Tests/Common/Mock/TestAssetService.cs) | 6 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Mock/MockInventoryService.cs (renamed from OpenSim/Tests/Common/Mock/TestInventoryService.cs) | 6 | ||||
-rw-r--r-- | OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Tests/Common/Mock/TestAssetService.cs b/OpenSim/Tests/Common/Mock/MockAssetService.cs index a537b97..cb38043 100644 --- a/OpenSim/Tests/Common/Mock/TestAssetService.cs +++ b/OpenSim/Tests/Common/Mock/MockAssetService.cs | |||
@@ -37,20 +37,20 @@ using Nini.Config; | |||
37 | 37 | ||
38 | namespace OpenSim.Tests.Common.Mock | 38 | namespace OpenSim.Tests.Common.Mock |
39 | { | 39 | { |
40 | public class TestAssetService : IAssetService | 40 | public class MockAssetService : IAssetService |
41 | { | 41 | { |
42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 42 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | 43 | ||
44 | private readonly Dictionary<string, AssetBase> Assets = new Dictionary<string, AssetBase>(); | 44 | private readonly Dictionary<string, AssetBase> Assets = new Dictionary<string, AssetBase>(); |
45 | 45 | ||
46 | public TestAssetService() {} | 46 | public MockAssetService() {} |
47 | 47 | ||
48 | /// <summary> | 48 | /// <summary> |
49 | /// This constructor is required if the asset service is being created reflectively (which is the case in some | 49 | /// This constructor is required if the asset service is being created reflectively (which is the case in some |
50 | /// tests). | 50 | /// tests). |
51 | /// </summary> | 51 | /// </summary> |
52 | /// <param name="config"></param> | 52 | /// <param name="config"></param> |
53 | public TestAssetService(IConfigSource config) {} | 53 | public MockAssetService(IConfigSource config) {} |
54 | 54 | ||
55 | public AssetBase Get(string id) | 55 | public AssetBase Get(string id) |
56 | { | 56 | { |
diff --git a/OpenSim/Tests/Common/Mock/TestInventoryService.cs b/OpenSim/Tests/Common/Mock/MockInventoryService.cs index 5a0ee7c..1ea4bc1 100644 --- a/OpenSim/Tests/Common/Mock/TestInventoryService.cs +++ b/OpenSim/Tests/Common/Mock/MockInventoryService.cs | |||
@@ -35,13 +35,13 @@ using Nini.Config; | |||
35 | 35 | ||
36 | namespace OpenSim.Tests.Common.Mock | 36 | namespace OpenSim.Tests.Common.Mock |
37 | { | 37 | { |
38 | public class TestInventoryService : IInventoryService | 38 | public class MockInventoryService : IInventoryService |
39 | { | 39 | { |
40 | public TestInventoryService() | 40 | public MockInventoryService() |
41 | { | 41 | { |
42 | } | 42 | } |
43 | 43 | ||
44 | public TestInventoryService(IConfigSource config) | 44 | public MockInventoryService(IConfigSource config) |
45 | { | 45 | { |
46 | } | 46 | } |
47 | 47 | ||
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs index eab5422..8b18d07 100644 --- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs +++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs | |||
@@ -219,7 +219,7 @@ namespace OpenSim.Tests.Common.Setup | |||
219 | if (real) | 219 | if (real) |
220 | config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService"); | 220 | config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService"); |
221 | else | 221 | else |
222 | config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:TestAssetService"); | 222 | config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:MockAssetService"); |
223 | config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); | 223 | config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); |
224 | assetService.Initialise(config); | 224 | assetService.Initialise(config); |
225 | assetService.AddRegion(testScene); | 225 | assetService.AddRegion(testScene); |
@@ -238,7 +238,7 @@ namespace OpenSim.Tests.Common.Setup | |||
238 | if (real) | 238 | if (real) |
239 | config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:InventoryService"); | 239 | config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:InventoryService"); |
240 | else | 240 | else |
241 | config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:TestInventoryService"); | 241 | config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:MockInventoryService"); |
242 | config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); | 242 | config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll"); |
243 | inventoryService.Initialise(config); | 243 | inventoryService.Initialise(config); |
244 | inventoryService.AddRegion(testScene); | 244 | inventoryService.AddRegion(testScene); |