4 files changed, 71 insertions, 7 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
index 216dce5..7f6fa3c 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/SceneObjectTests.cs
@@ -102,9 +102,11 @@ namespace OpenSim.Region.Environment.Scenes.Tests
             SceneObjectPart part = SceneTestUtils.AddSceneObject(scene);
             
             ((LocalUserServices)scene.CommsManager.UserService).AddPlugin(new TestUserDataPlugin());
-//            Assert.That(
-//                scene.CommsManager.AddUser("Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId),
-//                Is.EqualTo(agentId));  
+            ((LocalInventoryService)scene.CommsManager.InventoryService).AddPlugin(new TestInventoryDataPlugin());
+            
+            Assert.That(
+                scene.CommsManager.AddUser("Bob", "Hoskins", "test", "test@test.com", 1000, 1000, agentId),
+                Is.EqualTo(agentId));  
             
             IClientAPI client = SceneTestUtils.AddRootAgent(scene, agentId);
             scene.DeRezObject(client, part.LocalId, UUID.Zero, 9, UUID.Zero);
@@ -116,8 +118,8 @@ namespace OpenSim.Region.Environment.Scenes.Tests
             SceneObjectPart retrievedPart2 = scene.GetSceneObjectPart(part.LocalId);
             Assert.That(retrievedPart2, Is.Null);
                                     
-//            CachedUserInfo userInfo = scene.CommsManager.UserProfileCacheService.GetUserDetails(agentId);
-//            Assert.That(userInfo, Is.Not.Null);
+            CachedUserInfo userInfo = scene.CommsManager.UserProfileCacheService.GetUserDetails(agentId);
+            Assert.That(userInfo, Is.Not.Null);
             
             // TODO: test that the object actually made it successfully into inventory
         }
diff --git a/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs b/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs
index 9b2046b..07cd429 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/TestCommunicationsManager.cs
@@ -41,6 +41,10 @@ namespace OpenSim.Region.Environment.Scenes.Tests
             LocalUserServices lus = new LocalUserServices(null, 991, 992, null);
             m_userService = lus;
             m_userServiceAdmin = lus;
+            
+            LocalInventoryService lis = new LocalInventoryService();
+            m_interServiceInventoryService = lis;
+            AddInventoryService(lis);
         }
     }
 }
diff --git a/OpenSim/Region/Environment/Scenes/Tests/TestInventoryDataPlugin.cs b/OpenSim/Region/Environment/Scenes/Tests/TestInventoryDataPlugin.cs
new file mode 100644
index 0000000..2d4edd6
--- /dev/null
+++ b/OpenSim/Region/Environment/Scenes/Tests/TestInventoryDataPlugin.cs
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSim Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using OpenMetaverse;
+using OpenSim.Framework;
+
+namespace OpenSim.Region.Environment.Scenes.Tests
+{
+    public class TestInventoryDataPlugin : IInventoryDataPlugin
+    {
+        public string Version { get { return "0"; } }
+        public string Name { get { return "TestInventoryDataPlugin"; } }
+
+        public void Initialise() {}
+        public void Initialise(string connect) {}
+        public void Dispose() {}
+
+        public List<InventoryFolderBase> getFolderHierarchy(UUID parentID) { return null; } 
+        public List<InventoryItemBase> getInventoryInFolder(UUID folderID) { return null; }
+        public List<InventoryFolderBase> getUserRootFolders(UUID user) { return null; }
+        public InventoryFolderBase getUserRootFolder(UUID user) { return null; }
+        public List<InventoryFolderBase> getInventoryFolders(UUID parentID) { return null; }
+        public InventoryItemBase getInventoryItem(UUID item) { return null; }
+        public InventoryFolderBase getInventoryFolder(UUID folder) { return null; }
+        public void addInventoryItem(InventoryItemBase item) {}
+        public void updateInventoryItem(InventoryItemBase item) {}
+        public void deleteInventoryItem(UUID item) {}
+        public void addInventoryFolder(InventoryFolderBase folder) {}
+        public void updateInventoryFolder(InventoryFolderBase folder) {}
+        public void moveInventoryFolder(InventoryFolderBase folder) {}
+        public void deleteInventoryFolder(UUID folder) {}
+        public List<InventoryItemBase> fetchActiveGestures(UUID avatarID) { return null; }          
+    }
+}
diff --git a/OpenSim/Region/Environment/Scenes/Tests/TestUserDataPlugin.cs b/OpenSim/Region/Environment/Scenes/Tests/TestUserDataPlugin.cs
index ab63fb9..85fa1f5 100644
--- a/OpenSim/Region/Environment/Scenes/Tests/TestUserDataPlugin.cs
+++ b/OpenSim/Region/Environment/Scenes/Tests/TestUserDataPlugin.cs
@@ -39,7 +39,6 @@ namespace OpenSim.Region.Environment.Scenes.Tests
     public class TestUserDataPlugin : IUserDataPlugin
     {        
         public string Version { get { return "0"; } }
-
         public string Name { get { return "TestUserDataPlugin"; } }
 
         /// <summary>
@@ -53,7 +52,6 @@ namespace OpenSim.Region.Environment.Scenes.Tests
         private Dictionary<UUID, UserProfileData> m_userProfilesByUuid = new Dictionary<UUID, UserProfileData>();
 
         public void Initialise() {}
-        
         public void Dispose() {}
         
         public void AddNewUserProfile(UserProfileData user)