From c2cf22ea4fc42d8582aa6aa2df48a3ce06813d56 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 10 May 2015 21:04:46 -0700
Subject: Added the beginning of a new test framework for robust connectors and
services. For now, just Grid and Presence. This framework starts a robust
server (as a thread) listening on a port in localhost, then the tests are
client code.
---
OpenSim/Server/Base/ServicesServerBase.cs | 10 +-
OpenSim/Tests/Robust/Clients/Grid/GridClient.cs | 133 +++++++++++++++++++++
.../Robust/Clients/Presence/PresenceClient.cs | 81 +++++++++++++
OpenSim/Tests/Robust/Server/DemonServer.cs | 67 +++++++++++
4 files changed, 289 insertions(+), 2 deletions(-)
create mode 100644 OpenSim/Tests/Robust/Clients/Grid/GridClient.cs
create mode 100644 OpenSim/Tests/Robust/Clients/Presence/PresenceClient.cs
create mode 100644 OpenSim/Tests/Robust/Server/DemonServer.cs
(limited to 'OpenSim')
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index d7d1306..1f2c54d 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -82,7 +82,9 @@ namespace OpenSim.Server.Base
argvConfig.AddSwitch("Startup", "logconfig", "g");
// Automagically create the ini file name
- string fileName = Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly().Location);
+ string fileName = "";
+ if (Assembly.GetEntryAssembly() != null)
+ fileName = Path.GetFileNameWithoutExtension(Assembly.GetEntryAssembly().Location);
string iniFile = fileName + ".ini";
string logConfig = null;
@@ -158,7 +160,11 @@ namespace OpenSim.Server.Base
MainConsole.Instance = new RemoteConsole(prompt);
((RemoteConsole)MainConsole.Instance).ReadConfig(Config);
}
- else
+ else if (consoleType == "mock")
+ {
+ MainConsole.Instance = new MockConsole();
+ }
+ else if (consoleType == "local")
{
MainConsole.Instance = new LocalConsole(prompt, startupConfig);
}
diff --git a/OpenSim/Tests/Robust/Clients/Grid/GridClient.cs b/OpenSim/Tests/Robust/Clients/Grid/GridClient.cs
new file mode 100644
index 0000000..671aca7
--- /dev/null
+++ b/OpenSim/Tests/Robust/Clients/Grid/GridClient.cs
@@ -0,0 +1,133 @@
+/*
+ * 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.Text;
+using System.Reflection;
+
+using OpenMetaverse;
+using NUnit.Framework;
+
+using OpenSim.Framework;
+using OpenSim.Services.Interfaces;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using OpenSim.Services.Connectors;
+
+namespace Robust.Tests
+{
+ [TestFixture]
+ public class GridClient
+ {
+// private static readonly ILog m_log =
+// LogManager.GetLogger(
+// MethodBase.GetCurrentMethod().DeclaringType);
+
+ [Test]
+ public void Grid_001()
+ {
+ GridServicesConnector m_Connector = new GridServicesConnector(DemonServer.Address);
+
+ GridRegion r1 = CreateRegion("Test Region 1", 1000, 1000);
+ GridRegion r2 = CreateRegion("Test Region 2", 1001, 1000);
+ GridRegion r3 = CreateRegion("Test Region 3", 1005, 1000);
+
+ string msg = m_Connector.RegisterRegion(UUID.Zero, r1);
+ Assert.AreEqual(msg, string.Empty, "Region 1 failed to register");
+
+ msg = m_Connector.RegisterRegion(UUID.Zero, r2);
+ Assert.AreEqual(msg, string.Empty, "Region 2 failed to register");
+
+ msg = m_Connector.RegisterRegion(UUID.Zero, r3);
+ Assert.AreEqual(msg, string.Empty, "Region 3 failed to register");
+
+ bool success;
+ success = m_Connector.DeregisterRegion(r3.RegionID);
+ Assert.AreEqual(success, true, "Region 3 failed to deregister");
+
+ msg = m_Connector.RegisterRegion(UUID.Zero, r3);
+ Assert.AreEqual(msg, string.Empty, "Region 3 failed to re-register");
+
+ List<GridRegion> regions = m_Connector.GetNeighbours(UUID.Zero, r1.RegionID);
+ Assert.AreNotEqual(regions, null, "GetNeighbours of region 1 failed");
+ Assert.AreEqual(regions.Count, 1, "Region 1 should have 1 neighbor");
+ Assert.AreEqual(regions[0].RegionName, "Test Region 2", "Region 1 has the wrong neighbor");
+
+ GridRegion region = m_Connector.GetRegionByUUID(UUID.Zero, r2.RegionID);
+ Assert.AreNotEqual(region, null, "GetRegionByUUID for region 2 failed");
+ Assert.AreEqual(region.RegionName, "Test Region 2", "GetRegionByUUID of region 2 returned wrong region");
+
+ region = m_Connector.GetRegionByUUID(UUID.Zero, UUID.Random());
+ Assert.AreEqual(region, null, "Region with randon id should not exist");
+
+ region = m_Connector.GetRegionByName(UUID.Zero, r3.RegionName);
+ Assert.AreNotEqual(region, null, "GetRegionByUUID for region 3 failed");
+ Assert.AreEqual(region.RegionName, "Test Region 3", "GetRegionByUUID of region 3 returned wrong region");
+
+ region = m_Connector.GetRegionByName(UUID.Zero, "Foo");
+ Assert.AreEqual(region, null, "Region Foo should not exist");
+
+ regions = m_Connector.GetRegionsByName(UUID.Zero, "Test", 10);
+ Assert.AreNotEqual(regions, null, "GetRegionsByName failed");
+ Assert.AreEqual(regions.Count, 3, "GetRegionsByName should return 3");
+
+ regions = m_Connector.GetRegionRange(UUID.Zero,
+ (int)Util.RegionToWorldLoc(900), (int)Util.RegionToWorldLoc(1002),
+ (int)Util.RegionToWorldLoc(900), (int)Util.RegionToWorldLoc(1002) );
+ Assert.AreNotEqual(regions, null, "GetRegionRange failed");
+ Assert.AreEqual(regions.Count, 2, "GetRegionRange should return 2");
+
+ regions = m_Connector.GetRegionRange(UUID.Zero,
+ (int)Util.RegionToWorldLoc(900), (int)Util.RegionToWorldLoc(950),
+ (int)Util.RegionToWorldLoc(900), (int)Util.RegionToWorldLoc(950) );
+ Assert.AreNotEqual(regions, null, "GetRegionRange (bis) failed");
+ Assert.AreEqual(regions.Count, 0, "GetRegionRange (bis) should return 0");
+
+ // Deregister them all
+ success = m_Connector.DeregisterRegion(r1.RegionID);
+ Assert.AreEqual(success, true, "Region 1 failed to deregister");
+
+ success = m_Connector.DeregisterRegion(r2.RegionID);
+ Assert.AreEqual(success, true, "Region 2 failed to deregister");
+
+ success = m_Connector.DeregisterRegion(r3.RegionID);
+ Assert.AreEqual(success, true, "Region 3 failed to deregister");
+ }
+
+ private static GridRegion CreateRegion(string name, uint xcell, uint ycell)
+ {
+ GridRegion region = new GridRegion(xcell, ycell);
+ region.RegionName = name;
+ region.RegionID = UUID.Random();
+ region.ExternalHostName = "127.0.0.1";
+ region.HttpPort = 9000;
+ region.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 9000);
+
+ return region;
+ }
+ }
+}
diff --git a/OpenSim/Tests/Robust/Clients/Presence/PresenceClient.cs b/OpenSim/Tests/Robust/Clients/Presence/PresenceClient.cs
new file mode 100644
index 0000000..31c8ee9
--- /dev/null
+++ b/OpenSim/Tests/Robust/Clients/Presence/PresenceClient.cs
@@ -0,0 +1,81 @@
+/*
+ * 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.Text;
+using System.Reflection;
+
+using OpenMetaverse;
+using NUnit.Framework;
+
+using OpenSim.Framework;
+using OpenSim.Services.Interfaces;
+using OpenSim.Services.Connectors;
+
+namespace Robust.Tests
+{
+ [TestFixture]
+ public class PresenceClient
+ {
+ [Test]
+ public void Presence_001()
+ {
+ PresenceServicesConnector m_Connector = new PresenceServicesConnector(DemonServer.Address);
+
+ UUID user1 = UUID.Random();
+ UUID session1 = UUID.Random();
+ UUID region1 = UUID.Random();
+
+ bool success = m_Connector.LoginAgent(user1.ToString(), session1, UUID.Zero);
+ Assert.AreEqual(success, true, "Failed to add user session");
+
+ PresenceInfo pinfo = m_Connector.GetAgent(session1);
+ Assert.AreNotEqual(pinfo, null, "Unable to retrieve session");
+ Assert.AreEqual(pinfo.UserID, user1.ToString(), "Retrieved session does not match expected userID");
+ Assert.AreNotEqual(pinfo.RegionID, region1, "Retrieved session is unexpectedly in region");
+
+ success = m_Connector.ReportAgent(session1, region1);
+ Assert.AreEqual(success, true, "Failed to report session in region 1");
+
+ pinfo = m_Connector.GetAgent(session1);
+ Assert.AreNotEqual(pinfo, null, "Unable to session presence");
+ Assert.AreEqual(pinfo.UserID, user1.ToString(), "Retrieved session does not match expected userID");
+ Assert.AreEqual(pinfo.RegionID, region1, "Retrieved session is not in expected region");
+
+ success = m_Connector.LogoutAgent(session1);
+ Assert.AreEqual(success, true, "Failed to remove session");
+
+ pinfo = m_Connector.GetAgent(session1);
+ Assert.AreEqual(pinfo, null, "Session is still there, even though it shouldn't");
+
+ success = m_Connector.ReportAgent(session1, UUID.Random());
+ Assert.AreEqual(success, false, "Remove non-existing session should fail");
+ }
+
+ }
+}
diff --git a/OpenSim/Tests/Robust/Server/DemonServer.cs b/OpenSim/Tests/Robust/Server/DemonServer.cs
new file mode 100644
index 0000000..b51a6bb
--- /dev/null
+++ b/OpenSim/Tests/Robust/Server/DemonServer.cs
@@ -0,0 +1,67 @@
+/*
+ * 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.Threading;
+
+using Nini.Config;
+using log4net;
+using NUnit.Framework;
+
+using OpenSim.Server;
+
+namespace Robust.Tests
+{
+ [SetUpFixture]
+ public class DemonServer : OpenSimServer
+ {
+ private Thread m_demon;
+
+ public static string Address = "http://localhost:8888";
+
+ [SetUp]
+ public void StartDemon()
+ {
+ if (File.Exists("Robust.Tests.log"))
+ File.Delete("Robust.Tests.log");
+
+ Console.WriteLine("**** Starting demon Robust server ****");
+ m_demon = new Thread( () => Main(new string[] {"-inifile=Robust.Tests.ini"}));
+ m_demon.Start();
+ Console.WriteLine("**** Setup Finished ****");
+ }
+
+ [TearDown]
+ public void StopDemon()
+ {
+ Console.WriteLine("**** Killing demon Robust Server ****");
+ m_Server.Shutdown();
+ }
+ }
+}
--
cgit v1.1