Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

4 files changed, 45 insertions, 15 deletions

diff --git a/OpenSim/Tests/Common/Mock/MockInventoryService.cs b/OpenSim/Tests/Common/Mock/MockInventoryService.cs
index 1ea4bc1..4ac1078 100644
--- a/OpenSim/Tests/Common/Mock/MockInventoryService.cs
+++ b/OpenSim/Tests/Common/Mock/MockInventoryService.cs
@@ -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;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
index 7c4f689..b70b47d 100644
--- a/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
+++ b/OpenSim/Tests/Common/Mock/TestInventoryDataPlugin.cs
@@ -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;
@@ -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) 
         {
+            InventoryFolderBase folder = m_folders[item.Folder];
+            
 //            m_log.DebugFormat(
-//                "[MOCK INV DB]: Adding inventory item {0} {1} in {2}", item.Name, item.ID, item.Folder);
+//                "[MOCK INV DB]: Adding inventory item {0} {1} in {2} {3}", item.Name, item.ID, folder.Name, folder.ID);
             
             m_items[item.ID] = item;
         }
diff --git a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
index eaa0d33..d9ded2d 100644
--- a/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/SceneSetupHelpers.cs
@@ -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);
diff --git a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
index 380f258..26156f3 100644
--- a/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
+++ b/OpenSim/Tests/Common/Setup/UserProfileTestUtils.cs
@@ -127,12 +127,19 @@ namespace OpenSim.Tests.Common.Setup
         {
             UserAccount ua 
                 = new UserAccount(userId) 
-                    { FirstName = firstName, LastName = lastName, ServiceURLs = new Dictionary<string, object>() };
+                    { FirstName = firstName, LastName = lastName };
+            CreateUserWithInventory(scene, ua, pw);
+            return ua;
+        }
+        
+        public static void CreateUserWithInventory(Scene scene, UserAccount ua, string pw)
+        {
+            // FIXME: This should really be set up by UserAccount itself
+            ua.ServiceURLs = new Dictionary<string, object>();
+                
             scene.UserAccountService.StoreUserAccount(ua);
             scene.InventoryService.CreateUserInventory(ua.PrincipalID);
             scene.AuthenticationService.SetPassword(ua.PrincipalID, pw);
-
-            return ua;
-        }        
+        }             
     }
 }
\ No newline at end of file