From 9377c6f2b28c75a093fa554d64e0d63e6bdf2fa5 Mon Sep 17 00:00:00 2001 From: Mike Mazur Date: Tue, 3 Feb 2009 05:20:26 +0000 Subject: - move OpenSim/Framework/IInventoryData.cs to OpenSim/Data/IInventoryData.cs - trim trailing whitespace --- .../Tests/Common/Mock/TestCommunicationsManager.cs | 23 ++++---- .../Tests/Common/Mock/TestInventoryDataPlugin.cs | 69 +++++++++++----------- 2 files changed, 47 insertions(+), 45 deletions(-) (limited to 'OpenSim/Tests') diff --git a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs index 1663ac1..566d8d2 100644 --- a/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs +++ b/OpenSim/Tests/Common/Mock/TestCommunicationsManager.cs @@ -30,6 +30,7 @@ using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Servers; using OpenSim.Region.Communications.Local; +using OpenSim.Data; namespace OpenSim.Tests.Common.Mock { @@ -40,36 +41,36 @@ namespace OpenSim.Tests.Common.Mock get { return m_userDataPlugin; } } private IUserDataPlugin m_userDataPlugin; - + public IInventoryDataPlugin InventoryDataPlugin { get { return m_inventoryDataPlugin; } } private IInventoryDataPlugin m_inventoryDataPlugin; - + public TestCommunicationsManager() : this(null) - { + { } - + public TestCommunicationsManager(NetworkServersInfo serversInfo) : base(serversInfo, new BaseHttpServer(666), null, false, null) - { + { m_userDataPlugin = new TestUserDataPlugin(); m_inventoryDataPlugin = new TestInventoryDataPlugin(); - + LocalInventoryService lis = new LocalInventoryService(); lis.AddPlugin(m_inventoryDataPlugin); m_interServiceInventoryService = lis; - AddInventoryService(lis); - + AddInventoryService(lis); + LocalUserServices lus = new LocalUserServices(991, 992, lis); lus.AddPlugin(m_userDataPlugin); m_userService = lus; - m_userAdminService = lus; - + m_userAdminService = lus; + LocalBackEndServices gs = new LocalBackEndServices(); - m_gridService = gs; + m_gridService = gs; m_interRegion = gs; } } diff --git a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs index 8e19aec..59d923c 100644 --- a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs +++ b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs @@ -29,6 +29,7 @@ using System; using System.Collections.Generic; using OpenMetaverse; using OpenSim.Framework; +using OpenSim.Data; namespace OpenSim.Tests.Common.Mock { @@ -43,12 +44,12 @@ namespace OpenSim.Tests.Common.Mock /// Known inventory folders /// private Dictionary m_folders = new Dictionary(); - + /// /// User root folders /// private Dictionary m_rootFolders = new Dictionary(); - + public string Version { get { return "0"; } } public string Name { get { return "TestInventoryDataPlugin"; } } @@ -56,10 +57,10 @@ namespace OpenSim.Tests.Common.Mock public void Initialise(string connect) {} public void Dispose() {} - public List getFolderHierarchy(UUID parentID) + public List getFolderHierarchy(UUID parentID) { List folders = new List(); - + foreach (InventoryFolderBase folder in m_folders.Values) { if (folder.ParentID == parentID) @@ -68,77 +69,77 @@ namespace OpenSim.Tests.Common.Mock folders.Add(folder); } } - + return folders; } - - public List getInventoryInFolder(UUID folderID) - { - return new List(); + + public List getInventoryInFolder(UUID folderID) + { + return new List(); } - + public List getUserRootFolders(UUID user) { return null; } - - public InventoryFolderBase getUserRootFolder(UUID user) - { + + public InventoryFolderBase getUserRootFolder(UUID user) + { InventoryFolderBase folder = null; m_rootFolders.TryGetValue(user, out folder); - + return folder; } - - public List getInventoryFolders(UUID parentID) + + public List getInventoryFolders(UUID parentID) { List folders = new List(); - + foreach (InventoryFolderBase folder in m_folders.Values) { if (folder.ParentID == parentID) folders.Add(folder); } - + return folders; } - + public InventoryItemBase getInventoryItem(UUID item) { return null; } - - public InventoryFolderBase getInventoryFolder(UUID folderId) + + public InventoryFolderBase getInventoryFolder(UUID folderId) { InventoryFolderBase folder = null; m_folders.TryGetValue(folderId, out folder); - + return folder; } - + public void addInventoryItem(InventoryItemBase item) {} public void updateInventoryItem(InventoryItemBase item) {} public void deleteInventoryItem(UUID item) {} - - public void addInventoryFolder(InventoryFolderBase folder) + + public void addInventoryFolder(InventoryFolderBase folder) { m_folders[folder.ID] = folder; - + if (folder.ParentID == UUID.Zero) m_rootFolders[folder.Owner] = folder; } - + public void updateInventoryFolder(InventoryFolderBase folder) { m_folders[folder.ID] = folder; } - - public void moveInventoryFolder(InventoryFolderBase folder) + + public void moveInventoryFolder(InventoryFolderBase folder) { // Simple replace - updateInventoryFolder(folder); + updateInventoryFolder(folder); } - - public void deleteInventoryFolder(UUID folderId) + + public void deleteInventoryFolder(UUID folderId) { if (m_folders.ContainsKey(folderId)) m_folders.Remove(folderId); } - - public List fetchActiveGestures(UUID avatarID) { return null; } + + public List fetchActiveGestures(UUID avatarID) { return null; } } } -- cgit v1.1