4 files changed, 145 insertions, 7 deletions

diff --git a/OpenSim/Tests/Common/Mock/TestAssetService.cs b/OpenSim/Tests/Common/Mock/MockAssetService.cs
index 317ec06..cb38043 100644
--- a/OpenSim/Tests/Common/Mock/TestAssetService.cs
+++ b/OpenSim/Tests/Common/Mock/MockAssetService.cs
@@ -27,6 +27,8 @@
 
 using System;
 using System.Collections.Generic;
+using System.Reflection;
+using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Data;
@@ -35,16 +37,25 @@ 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(IConfigSource config)
-        {
-        }
+        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 MockAssetService(IConfigSource config) {}
         
         public AssetBase Get(string id)
         {
+            m_log.DebugFormat("[MOCK ASSET SERVICE]: Getting asset with id {0}", id);
+            
             AssetBase asset;
             if (Assets.ContainsKey(id))
                 asset = Assets[id];
@@ -73,6 +84,8 @@ namespace OpenSim.Tests.Common.Mock
 
         public string Store(AssetBase asset)
         {
+            m_log.DebugFormat("[MOCK ASSET SERVICE]: Storing asset {0}", asset.ID);
+            
             Assets[asset.ID] = asset;
 
             return asset.ID;
diff --git a/OpenSim/Tests/Common/Mock/TestInventoryService.cs b/OpenSim/Tests/Common/Mock/MockInventoryService.cs
index 5a0ee7c..1ea4bc1 100644
--- a/OpenSim/Tests/Common/Mock/TestInventoryService.cs
+++ b/OpenSim/Tests/Common/Mock/MockInventoryService.cs
@@ -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)
         {
         }
 
diff --git a/OpenSim/Tests/Common/Mock/MockUserService.cs b/OpenSim/Tests/Common/Mock/MockUserService.cs
new file mode 100644
index 0000000..1e27fb7
--- /dev/null
+++ b/OpenSim/Tests/Common/Mock/MockUserService.cs
@@ -0,0 +1,123 @@
+
+using System;
+using System.Collections.Generic;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Communications.Cache;
+using OpenSim.Services.Interfaces;
+
+namespace OpenSim.Tests.Common
+{        
+    public class MockUserService : IUserService
+    {
+        public void AddTemporaryUserProfile(UserProfileData userProfile)
+        {
+            throw new NotImplementedException();
+        }
+        
+        public UserProfileData GetUserProfile(string firstName, string lastName)
+        {
+            throw new NotImplementedException();
+        }
+
+        public UserProfileData GetUserProfile(UUID userId)
+        {
+            throw new NotImplementedException();
+        }
+
+        public UserProfileData GetUserProfile(Uri uri)
+        {
+            UserProfileData userProfile = new UserProfileData();
+
+//                userProfile.ID = new UUID(Util.GetHashGuid(uri.ToString(), AssetCache.AssetInfo.Secret));
+
+            return userProfile;
+        }
+
+        public Uri GetUserUri(UserProfileData userProfile)
+        {
+            throw new NotImplementedException();
+        }
+
+        public UserAgentData GetAgentByUUID(UUID userId)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void ClearUserAgent(UUID avatarID)
+        {
+            throw new NotImplementedException();
+        }
+
+        public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID QueryID, string Query)
+        {
+            throw new NotImplementedException();
+        }
+
+        public UserProfileData SetupMasterUser(string firstName, string lastName)
+        {
+            throw new NotImplementedException();
+        }
+
+        public UserProfileData SetupMasterUser(string firstName, string lastName, string password)
+        {
+            throw new NotImplementedException();
+        }
+
+        public UserProfileData SetupMasterUser(UUID userId)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool UpdateUserProfile(UserProfileData data)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void AddNewUserFriend(UUID friendlistowner, UUID friend, uint perms)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void RemoveUserFriend(UUID friendlistowner, UUID friend)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void UpdateUserFriendPerms(UUID friendlistowner, UUID friend, uint perms)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, Vector3 position, Vector3 lookat)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz)
+        {
+            throw new NotImplementedException();
+        }
+
+        public List<FriendListItem> GetUserFriendList(UUID friendlistowner)
+        {
+            throw new NotImplementedException();
+        }
+
+        public bool VerifySession(UUID userID, UUID sessionID)
+        {
+            return true;
+        }
+
+        public void SetInventoryService(IInventoryService inv)
+        {
+            throw new NotImplementedException();
+        }
+
+        public virtual bool AuthenticateUserByPassword(UUID userID, string password)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 0f642b9..27025d9 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -191,6 +191,7 @@ namespace OpenSim.Tests.Common.Mock
         public event FriendActionDelegate OnApproveFriendRequest;
         public event FriendActionDelegate OnDenyFriendRequest;
         public event FriendshipTermination OnTerminateFriendship;
+        public event GrantUserFriendRights OnGrantUserRights;
 
         public event EconomyDataRequest OnEconomyDataRequest;
         public event MoneyBalanceRequest OnMoneyBalanceRequest;
@@ -631,6 +632,7 @@ namespace OpenSim.Tests.Common.Mock
         public virtual void SendInventoryFolderDetails(UUID ownerID, UUID folderID,
                                                        List<InventoryItemBase> items,
                                                        List<InventoryFolderBase> folders,
+                                                       int version, 
                                                        bool fetchFolders,
                                                        bool fetchItems)
         {