ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add automated test at the opensim 'api' level to check that a given item goes to the correct directory

Browse Source 
Also removes some mono compiler warnings
This commit is contained in:
Justin Clark-Casey (justincc)
2010-08-24 16:50:31 +01:00
parent c72d298202
commit 289c21099c
11 changed files with 170 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Tests/Common/Mock/MockInventoryService.cs
View File

@@ -37,13 +37,9 @@ namespace OpenSim.Tests.Common.Mock
{
public class MockInventoryService : IInventoryService
{
public MockInventoryService()
{
}
public MockInventoryService() {}
public MockInventoryService(IConfigSource config)
{
}
public MockInventoryService(IConfigSource config) {}
/// <summary>
/// <see cref="OpenSim.Framework.Communications.IInterServiceInventoryServices"/>
@@ -140,7 +136,7 @@ namespace OpenSim.Tests.Common.Mock
public bool AddItem(InventoryItemBase item)
{
return false;
return true;
}
public bool UpdateItem(InventoryItemBase item)
@@ -187,4 +183,4 @@ namespace OpenSim.Tests.Common.Mock
return 1;
}
}
}
}

31
OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
View File

@@ -42,7 +42,7 @@ namespace OpenSim.Tests.Common.Mock
/// </summary>
public class TestInventoryDataPlugin : IInventoryDataPlugin
{
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <value>
/// Inventory folders
@@ -84,14 +84,19 @@ namespace OpenSim.Tests.Common.Mock
public List<InventoryItemBase> getInventoryInFolder(UUID folderID)
{
// m_log.DebugFormat("[MOCK INV DB]: Getting items in folder {0}", folderID);
InventoryFolderBase folder = m_folders[folderID];
m_log.DebugFormat("[MOCK INV DB]: Getting items in folder {0} {1}", folder.Name, folder.ID);
List<InventoryItemBase> items = new List<InventoryItemBase>();
foreach (InventoryItemBase item in m_items.Values)
{
if (item.Folder == folderID)
{
m_log.DebugFormat("[MOCK INV DB]: getInventoryInFolder() adding item {0}", item.Name);
items.Add(item);
}
}
return items;
@@ -101,7 +106,7 @@ namespace OpenSim.Tests.Common.Mock
public InventoryFolderBase getUserRootFolder(UUID user)
{
// m_log.DebugFormat("[MOCK INV DB]: Looking for root folder for {0}", user);
m_log.DebugFormat("[MOCK INV DB]: Looking for root folder for {0}", user);
InventoryFolderBase folder = null;
m_rootFolders.TryGetValue(user, out folder);
@@ -111,12 +116,22 @@ namespace OpenSim.Tests.Common.Mock
public List<InventoryFolderBase> getInventoryFolders(UUID parentID)
{
InventoryFolderBase parentFolder = m_folders[parentID];
m_log.DebugFormat("[MOCK INV DB]: Getting folders in folder {0} {1}", parentFolder.Name, parentFolder.ID);
List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
foreach (InventoryFolderBase folder in m_folders.Values)
{
if (folder.ParentID == parentID)
{
m_log.DebugFormat(
"[MOCK INV DB]: Found folder {0} {1} in {2} {3}",
folder.Name, folder.ID, parentFolder.Name, parentFolder.ID);
folders.Add(folder);
}
}
return folders;
@@ -137,6 +152,10 @@ namespace OpenSim.Tests.Common.Mock
public void addInventoryFolder(InventoryFolderBase folder)
{
m_log.DebugFormat(
"[MOCK INV DB]: Adding inventory folder {0} {1} type {2}",
folder.Name, folder.ID, (AssetType)folder.Type);
m_folders[folder.ID] = folder;
if (folder.ParentID == UUID.Zero)
@@ -166,8 +185,10 @@ namespace OpenSim.Tests.Common.Mock
public void addInventoryItem(InventoryItemBase item)
{
// m_log.DebugFormat(
// "[MOCK INV DB]: Adding inventory item {0} {1} in {2}", item.Name, item.ID, item.Folder);
InventoryFolderBase folder = m_folders[item.Folder];
m_log.DebugFormat(
"[MOCK INV DB]: Adding inventory item {0} {1} in {2} {3}", item.Name, item.ID, folder.Name, folder.ID);
m_items[item.ID] = item;
}

6
OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
View File

@@ -285,10 +285,16 @@ namespace OpenSim.Tests.Common.Setup
config.AddConfig("Modules");
config.AddConfig("InventoryService");
config.Configs["Modules"].Set("InventoryServices", "LocalInventoryServicesConnector");
if (real)
{
config.Configs["InventoryService"].Set("LocalServiceModule", "OpenSim.Services.InventoryService.dll:InventoryService");
}
else
{
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);