From 1d2a332b96794e2011b0527cf590c3ceedcd8af4 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 30 Dec 2009 14:17:18 -0800 Subject: Unit tests for presence. They helped fix a couple of wrongnesses. --- OpenSim/Data/Null/NullPresenceData.cs | 223 ++++++++++++++++++++++++++++++++++ 1 file changed, 223 insertions(+) create mode 100644 OpenSim/Data/Null/NullPresenceData.cs (limited to 'OpenSim/Data/Null/NullPresenceData.cs') diff --git a/OpenSim/Data/Null/NullPresenceData.cs b/OpenSim/Data/Null/NullPresenceData.cs new file mode 100644 index 0000000..52fdc6f --- /dev/null +++ b/OpenSim/Data/Null/NullPresenceData.cs @@ -0,0 +1,223 @@ +/* + * 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 OpenSimulator 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; +using System.Collections.Generic; +using OpenMetaverse; +using OpenSim.Framework; +using OpenSim.Data; + +namespace OpenSim.Data.Null +{ + public class NullPresenceData : IPresenceData + { + Dictionary m_presenceData = new Dictionary(); + + public NullPresenceData(string connectionString, string realm) + { + //Console.WriteLine("[XXX] NullRegionData constructor"); + // Let's stick in a test presence + PresenceData p = new PresenceData(); + p.SessionID = UUID.Zero; + p.UserID = UUID.Zero.ToString(); + p.Data = new Dictionary(); + p.Data["Online"] = "true"; + m_presenceData.Add(UUID.Zero, p); + } + + public bool Store(PresenceData data) + { + m_presenceData[data.SessionID] = data; + return true; + } + + public PresenceData Get(UUID sessionID) + { + if (m_presenceData.ContainsKey(sessionID)) + return m_presenceData[sessionID]; + + return null; + } + + public void LogoutRegionAgents(UUID regionID) + { + List toBeDeleted = new List(); + foreach (KeyValuePair kvp in m_presenceData) + if (kvp.Value.RegionID == regionID) + toBeDeleted.Add(kvp.Key); + + foreach (UUID u in toBeDeleted) + m_presenceData.Remove(u); + } + + public bool ReportAgent(UUID sessionID, UUID regionID, string position, string lookAt) + { + if (m_presenceData.ContainsKey(sessionID)) + { + m_presenceData[sessionID].RegionID = regionID; + m_presenceData[sessionID].Data["Position"] = position; + m_presenceData[sessionID].Data["LookAt"] = lookAt; + return true; + } + + return false; + } + + public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt) + { + bool foundone = false; + foreach (PresenceData p in m_presenceData.Values) + { + if (p.UserID == userID) + { + p.Data["HomeRegionID"] = regionID.ToString(); + p.Data["HomePosition"] = position.ToString(); + p.Data["HomeLookAt"] = lookAt.ToString(); + foundone = true; + } + } + + return foundone; + } + + public PresenceData[] Get(string field, string data) + { + List presences = new List(); + if (field == "UserID") + { + foreach (PresenceData p in m_presenceData.Values) + if (p.UserID == data) + presences.Add(p); + return presences.ToArray(); + } + else if (field == "SessionID") + { + UUID session = UUID.Zero; + if (!UUID.TryParse(data, out session)) + return presences.ToArray(); + + if (m_presenceData.ContainsKey(session)) + { + presences.Add(m_presenceData[session]); + return presences.ToArray(); + } + } + else if (field == "RegionID") + { + UUID region = UUID.Zero; + if (!UUID.TryParse(data, out region)) + return presences.ToArray(); + foreach (PresenceData p in m_presenceData.Values) + if (p.RegionID == region) + presences.Add(p); + return presences.ToArray(); + } + else + { + foreach (PresenceData p in m_presenceData.Values) + { + if (p.Data.ContainsKey(field) && p.Data[field] == data) + presences.Add(p); + } + return presences.ToArray(); + } + + return presences.ToArray(); + } + + public void Prune(string userID) + { + List deleteSessions = new List(); + int online = 0; + + foreach (KeyValuePair kvp in m_presenceData) + { + bool on = false; + if (bool.TryParse(kvp.Value.Data["Online"], out on) && on) + online++; + else + deleteSessions.Add(kvp.Key); + } + if (online == 0 && deleteSessions.Count > 0) + deleteSessions.RemoveAt(0); + + foreach (UUID s in deleteSessions) + m_presenceData.Remove(s); + + } + + public bool Delete(string field, string data) + { + List presences = new List(); + if (field == "UserID") + { + foreach (KeyValuePair p in m_presenceData) + if (p.Value.UserID == data) + presences.Add(p.Key); + } + else if (field == "SessionID") + { + UUID session = UUID.Zero; + if (UUID.TryParse(data, out session)) + { + if (m_presenceData.ContainsKey(session)) + { + presences.Add(session); + } + } + } + else if (field == "RegionID") + { + UUID region = UUID.Zero; + if (UUID.TryParse(data, out region)) + { + foreach (KeyValuePair p in m_presenceData) + if (p.Value.RegionID == region) + presences.Add(p.Key); + } + } + else + { + foreach (KeyValuePair p in m_presenceData) + { + if (p.Value.Data.ContainsKey(field) && p.Value.Data[field] == data) + presences.Add(p.Key); + } + } + + foreach (UUID u in presences) + m_presenceData.Remove(u); + + if (presences.Count == 0) + return false; + + return true; + } + + } +} -- cgit v1.1 From ef8b2d2f90794f845772fc55dede46b6312af251 Mon Sep 17 00:00:00 2001 From: Melanie Date: Mon, 8 Feb 2010 21:38:49 +0000 Subject: Convert null presence data to a singleton as well. Standalone logins now work --- OpenSim/Data/Null/NullPresenceData.cs | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'OpenSim/Data/Null/NullPresenceData.cs') diff --git a/OpenSim/Data/Null/NullPresenceData.cs b/OpenSim/Data/Null/NullPresenceData.cs index 52fdc6f..40700cf 100644 --- a/OpenSim/Data/Null/NullPresenceData.cs +++ b/OpenSim/Data/Null/NullPresenceData.cs @@ -36,10 +36,15 @@ namespace OpenSim.Data.Null { public class NullPresenceData : IPresenceData { + private static NullPresenceData Instance; + Dictionary m_presenceData = new Dictionary(); public NullPresenceData(string connectionString, string realm) { + if (Instance == null) + Instance = this; + //Console.WriteLine("[XXX] NullRegionData constructor"); // Let's stick in a test presence PresenceData p = new PresenceData(); @@ -52,12 +57,18 @@ namespace OpenSim.Data.Null public bool Store(PresenceData data) { + if (Instance != this) + return Instance.Store(data); + m_presenceData[data.SessionID] = data; return true; } public PresenceData Get(UUID sessionID) { + if (Instance != this) + return Instance.Get(sessionID); + if (m_presenceData.ContainsKey(sessionID)) return m_presenceData[sessionID]; @@ -66,6 +77,12 @@ namespace OpenSim.Data.Null public void LogoutRegionAgents(UUID regionID) { + if (Instance != this) + { + Instance.LogoutRegionAgents(regionID); + return; + } + List toBeDeleted = new List(); foreach (KeyValuePair kvp in m_presenceData) if (kvp.Value.RegionID == regionID) @@ -77,6 +94,8 @@ namespace OpenSim.Data.Null public bool ReportAgent(UUID sessionID, UUID regionID, string position, string lookAt) { + if (Instance != this) + return Instance.ReportAgent(sessionID, regionID, position, lookAt); if (m_presenceData.ContainsKey(sessionID)) { m_presenceData[sessionID].RegionID = regionID; @@ -90,6 +109,9 @@ namespace OpenSim.Data.Null public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt) { + if (Instance != this) + return Instance.SetHomeLocation(userID, regionID, position, lookAt); + bool foundone = false; foreach (PresenceData p in m_presenceData.Values) { @@ -107,6 +129,9 @@ namespace OpenSim.Data.Null public PresenceData[] Get(string field, string data) { + if (Instance != this) + return Instance.Get(field, data); + List presences = new List(); if (field == "UserID") { @@ -152,6 +177,12 @@ namespace OpenSim.Data.Null public void Prune(string userID) { + if (Instance != this) + { + Instance.Prune(userID); + return; + } + List deleteSessions = new List(); int online = 0; @@ -173,6 +204,9 @@ namespace OpenSim.Data.Null public bool Delete(string field, string data) { + if (Instance != this) + return Delete(field, data); + List presences = new List(); if (field == "UserID") { -- cgit v1.1 From 70de6956ff6a3d833149156b6293122ef734b73d Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 21 Feb 2010 18:56:44 -0800 Subject: Small bug fixes for making tests work. --- OpenSim/Data/Null/NullPresenceData.cs | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'OpenSim/Data/Null/NullPresenceData.cs') diff --git a/OpenSim/Data/Null/NullPresenceData.cs b/OpenSim/Data/Null/NullPresenceData.cs index 40700cf..5f78691 100644 --- a/OpenSim/Data/Null/NullPresenceData.cs +++ b/OpenSim/Data/Null/NullPresenceData.cs @@ -43,16 +43,18 @@ namespace OpenSim.Data.Null public NullPresenceData(string connectionString, string realm) { if (Instance == null) + { Instance = this; - //Console.WriteLine("[XXX] NullRegionData constructor"); - // Let's stick in a test presence - PresenceData p = new PresenceData(); - p.SessionID = UUID.Zero; - p.UserID = UUID.Zero.ToString(); - p.Data = new Dictionary(); - p.Data["Online"] = "true"; - m_presenceData.Add(UUID.Zero, p); + //Console.WriteLine("[XXX] NullRegionData constructor"); + // Let's stick in a test presence + PresenceData p = new PresenceData(); + p.SessionID = UUID.Zero; + p.UserID = UUID.Zero.ToString(); + p.Data = new Dictionary(); + p.Data["Online"] = true.ToString(); + m_presenceData.Add(UUID.Zero, p); + } } public bool Store(PresenceData data) @@ -70,7 +72,9 @@ namespace OpenSim.Data.Null return Instance.Get(sessionID); if (m_presenceData.ContainsKey(sessionID)) + { return m_presenceData[sessionID]; + } return null; } -- cgit v1.1