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. --- .../Presence/LocalPresenceServiceConnector.cs | 13 ++- .../Presence/Tests/PresenceConnectorsTests.cs | 104 +++++++++++++++++++++ 2 files changed, 115 insertions(+), 2 deletions(-) create mode 100644 OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut') diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs index 644d755..2cb18c7 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs @@ -44,13 +44,22 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - #region ISharedRegionModule - private bool m_Enabled = false; private PresenceDetector m_PresenceDetector; private IPresenceService m_PresenceService; + public LocalPresenceServicesConnector() + { + } + + public LocalPresenceServicesConnector(IConfigSource source) + { + Initialise(source); + } + + #region ISharedRegionModule + public Type ReplaceableInterface { get { return null; } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs new file mode 100644 index 0000000..ebb2c3e --- /dev/null +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs @@ -0,0 +1,104 @@ +/* + * 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.Generic; +using System.IO; +using System.Reflection; +using System.Threading; +using log4net.Config; +using NUnit.Framework; +using NUnit.Framework.SyntaxHelpers; +using OpenMetaverse; +using OpenSim.Framework; +using Nini.Config; + +using OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence; +using OpenSim.Region.Framework.Scenes; +using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo; +using OpenSim.Tests.Common; +using OpenSim.Tests.Common.Setup; + +namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.Tests +{ + [TestFixture] + public class PresenceConnectorsTests + { + LocalPresenceServicesConnector m_LocalConnector; + private void SetUp() + { + IConfigSource config = new IniConfigSource(); + config.AddConfig("Modules"); + config.AddConfig("PresenceService"); + config.Configs["Modules"].Set("PresenceServices", "LocalPresenceServicesConnector"); + config.Configs["PresenceService"].Set("LocalServiceModule", "OpenSim.Services.PresenceService.dll:PresenceService"); + config.Configs["PresenceService"].Set("StorageProvider", "OpenSim.Data.Null.dll:NullPresenceData"); + + m_LocalConnector = new LocalPresenceServicesConnector(config); + } + + /// + /// Test OpenSim Presence. + /// + [Test] + public void TestPresenceV0_1() + { + SetUp(); + + string user1 = UUID.Zero.ToString(); + UUID session1 = UUID.Zero; + + // this is not implemented by this connector + //m_LocalConnector.LoginAgent(user1, session1, UUID.Zero); + PresenceInfo result = m_LocalConnector.GetAgent(session1); + Assert.IsNotNull(result, "Retrieved GetAgent is null"); + Assert.That(result.UserID, Is.EqualTo(user1), "Retrieved userID does not match"); + Assert.IsTrue(result.Online, "Agent just logged in but is offline"); + + UUID region1 = UUID.Random(); + bool r = m_LocalConnector.ReportAgent(session1, region1, Vector3.Zero, Vector3.Zero); + Assert.IsTrue(r, "First ReportAgent returned false"); + result = m_LocalConnector.GetAgent(session1); + Assert.That(result.RegionID, Is.EqualTo(region1), "Agent is not in the right region (region1)"); + + UUID region2 = UUID.Random(); + r = m_LocalConnector.ReportAgent(session1, region2, Vector3.Zero, Vector3.Zero); + Assert.IsTrue(r, "Second ReportAgent returned false"); + result = m_LocalConnector.GetAgent(session1); + Assert.That(result.RegionID, Is.EqualTo(region2), "Agent is not in the right region (region2)"); + + r = m_LocalConnector.LogoutAgent(session1); + Assert.IsTrue(r, "LogoutAgent returned false"); + result = m_LocalConnector.GetAgent(session1); + Assert.IsNotNull(result, "Agent session disappeared from storage after logout"); + Assert.IsFalse(result.Online, "Agent is reported to be Online after logout"); + + r = m_LocalConnector.ReportAgent(session1, region1, Vector3.Zero, Vector3.Zero); + Assert.IsFalse(r, "ReportAgent of non-logged in user returned true"); + } + } +} -- cgit v1.1