Add simple login test with online friends. Add IFriendsModule.GrantRights() for granting rights via a module call.

Rename IFriendsModule.GetFriendPerms() -> GetRightsGrantedByFriend() to be more self-documenting and consistent with friends module terminology.
Add some method doc.

2 files changed, 30 insertions, 2 deletions

diff --git a/OpenSim/Data/Null/NullFriendsData.cs b/OpenSim/Data/Null/NullFriendsData.cs
index 0a4b242..0be32a4 100644
--- a/OpenSim/Data/Null/NullFriendsData.cs
+++ b/OpenSim/Data/Null/NullFriendsData.cs
@@ -28,6 +28,8 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Reflection;
+using log4net;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Data;
@@ -36,12 +38,25 @@ namespace OpenSim.Data.Null
 {
     public class NullFriendsData : IFriendsData
     {
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private static List<FriendsData> m_Data = new List<FriendsData>();
 
         public NullFriendsData(string connectionString, string realm)
         {
         }
 
+        /// <summary>
+        /// Clear all friends data
+        /// </summary>
+        /// <remarks>
+        /// This is required by unit tests to clear the static data between test runs.
+        /// </remarks>
+        public static void Clear()
+        {
+            m_Data.Clear();
+        }
+
         public FriendsData[] GetFriends(UUID principalID)
         {
             return GetFriends(principalID.ToString());
@@ -66,9 +81,16 @@ namespace OpenSim.Data.Null
                 lst.ForEach(f =>
                 {
                     FriendsData f2 = m_Data.Find(candidateF2 => f.Friend == candidateF2.PrincipalID);
-                    if (f2 != null) { f.Data["TheirFlags"] = f2.Data["Flags"]; }
+                    if (f2 != null)
+                        f.Data["TheirFlags"] = f2.Data["Flags"];
+
+//                    m_log.DebugFormat(
+//                        "[NULL FRIENDS DATA]: Got {0} {1} {2} for {3}",
+//                        f.Friend, f.Data["Flags"], f2 != null ? f.Data["TheirFlags"] : "not found!", f.PrincipalID);
                 });
 
+//                m_log.DebugFormat("[NULL FRIENDS DATA]: Got {0} friends for {1}", lst.Count, userID);
+
                 return lst.ToArray();
             }
 
@@ -80,6 +102,9 @@ namespace OpenSim.Data.Null
             if (data == null)
                 return false;
 
+//            m_log.DebugFormat(
+//                "[NULL FRIENDS DATA]: Storing {0} {1} {2}", data.PrincipalID, data.Friend, data.Data["Flags"]);
+
             m_Data.Add(data);
 
             return true;
@@ -98,6 +123,10 @@ namespace OpenSim.Data.Null
                 FriendsData friend = lst.Find(delegate(FriendsData fdata) { return fdata.Friend == friendID; });
                 if (friendID != null)
                 {
+//                    m_log.DebugFormat(
+//                        "[NULL FRIENDS DATA]: Deleting friend {0} {1} for {2}",
+//                        friend.Friend, friend.Data["Flags"], friend.PrincipalID);
+
                     m_Data.Remove(friend);
                     return true;
                 }
diff --git a/OpenSim/Data/Null/NullPresenceData.cs b/OpenSim/Data/Null/NullPresenceData.cs
index 91f1cc5..c06c223 100644
--- a/OpenSim/Data/Null/NullPresenceData.cs
+++ b/OpenSim/Data/Null/NullPresenceData.cs
@@ -110,7 +110,6 @@ namespace OpenSim.Data.Null
             return false;
         }
 
-
         public PresenceData[] Get(string field, string data)
         {
             if (Instance != this)