Rename test services to mock services, since this is a more accurate description

remove duplicate mock inventory service
This commit is contained in:
Justin Clark-Casey (justincc)
2009-11-12 18:44:03 +00:00
parent d21fc1cefb
commit 2f092d271e
5 changed files with 13 additions and 156 deletions

View File

@@ -37,20 +37,20 @@ using Nini.Config;
namespace OpenSim.Tests.Common.Mock
{
public class TestAssetService : IAssetService
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 TestAssetService() {}
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 TestAssetService(IConfigSource config) {}
public MockAssetService(IConfigSource config) {}
public AssetBase Get(string id)
{

View File

@@ -35,13 +35,13 @@ using Nini.Config;
namespace OpenSim.Tests.Common.Mock
{
public class TestInventoryService : IInventoryService
public class MockInventoryService : IInventoryService
{
public TestInventoryService()
public MockInventoryService()
{
}
public TestInventoryService(IConfigSource config)
public MockInventoryService(IConfigSource config)
{
}

View File

@@ -219,7 +219,7 @@ namespace OpenSim.Tests.Common.Setup
if (real)
config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Services.AssetService.dll:AssetService");
else
config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:TestAssetService");
config.Configs["AssetService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:MockAssetService");
config.Configs["AssetService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
assetService.Initialise(config);
assetService.AddRegion(testScene);
@@ -238,7 +238,7 @@ namespace OpenSim.Tests.Common.Setup
if (real)
config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:InventoryService");
else
config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:TestInventoryService");
config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Tests.Common.dll:MockInventoryService");
config.Configs["InventoryService"].Set("StorageProvider", "OpenSim.Tests.Common.dll");
inventoryService.Initialise(config);
inventoryService.AddRegion(testScene);