From 3c19bd5142479e468aa9841a2177ddd33b46f8f6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 23 Sep 2009 20:35:16 -0700
Subject: Unit tests for the grid service. Yey!
---
.../Grid/Tests/GridConnectorsTests.cs | 122 +++++++++++++++++++++
1 file changed, 122 insertions(+)
create mode 100644 OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
(limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs')
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
new file mode 100644
index 0000000..8d44249
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
@@ -0,0 +1,122 @@
+/*
+ * 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.Grid;
+using OpenSim.Region.Framework.Scenes;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Setup;
+
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
+{
+ [TestFixture]
+ public class GridConnectorsTests
+ {
+ LocalGridServicesConnector m_LocalConnector;
+ private void SetUp()
+ {
+ IConfigSource config = new IniConfigSource();
+ config.AddConfig("Modules");
+ config.AddConfig("GridService");
+ config.Configs["Modules"].Set("GridServices", "LocalGridServicesConnector");
+ config.Configs["GridService"].Set("LocalServiceModule", "OpenSim.Services.GridService.dll:GridService");
+ config.Configs["GridService"].Set("StorageProvider", "OpenSim.Data.Null.dll:NullRegionData");
+
+ m_LocalConnector = new LocalGridServicesConnector(config);
+ }
+
+ ///
+ /// Test saving a V0.2 OpenSim Region Archive.
+ ///
+ [Test]
+ public void TestRegisterRegionV0_2()
+ {
+ SetUp();
+
+ // Create 3 regions
+ GridRegion r1 = new GridRegion();
+ r1.RegionName = "Test Region 1";
+ r1.RegionID = new UUID(1);
+ r1.RegionLocX = 1000 * (int)Constants.RegionSize;
+ r1.RegionLocY = 1000 * (int)Constants.RegionSize;
+ r1.ExternalHostName = "127.0.0.1";
+ r1.HttpPort = 9001;
+ r1.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0);
+
+ GridRegion r2 = new GridRegion();
+ r2.RegionName = "Test Region 2";
+ r2.RegionID = new UUID(2);
+ r2.RegionLocX = 1000 * (int)Constants.RegionSize + 1;
+ r2.RegionLocY = 1000 * (int)Constants.RegionSize;
+ r2.ExternalHostName = "127.0.0.1";
+ r2.HttpPort = 9002;
+ r2.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0);
+
+ GridRegion r3 = new GridRegion();
+ r3.RegionName = "Test Region 3";
+ r3.RegionID = new UUID(3);
+ r3.RegionLocX = 1000 * (int)Constants.RegionSize + 5;
+ r3.RegionLocY = 1000 * (int)Constants.RegionSize;
+ r3.ExternalHostName = "127.0.0.1";
+ r3.HttpPort = 9003;
+ r3.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0);
+
+ m_LocalConnector.RegisterRegion(UUID.Zero, r1);
+ GridRegion result = m_LocalConnector.GetRegionByName(UUID.Zero, "Test");
+ Assert.IsNotNull(result, "Retrieved GetRegionByName is null");
+ Assert.That(result.RegionName, Is.EqualTo("Test Region 1"), "Retrieved region's name does not match");
+
+ result = m_LocalConnector.GetRegionByUUID(UUID.Zero, new UUID(1));
+ Assert.IsNotNull(result, "Retrieved GetRegionByUUID is null");
+ Assert.That(result.RegionID, Is.EqualTo(new UUID(1)), "Retrieved region's UUID does not match");
+
+ result = m_LocalConnector.GetRegionByPosition(UUID.Zero, 1000 * (int)Constants.RegionSize, 1000 * (int)Constants.RegionSize);
+ Assert.IsNotNull(result, "Retrieved GetRegionByPosition is null");
+ Assert.That(result.RegionLocX, Is.EqualTo(1000 * (int)Constants.RegionSize), "Retrieved region's position does not match");
+
+ m_LocalConnector.RegisterRegion(UUID.Zero, r2);
+ m_LocalConnector.RegisterRegion(UUID.Zero, r3);
+
+ List results = m_LocalConnector.GetNeighbours(UUID.Zero, new UUID(1));
+ Assert.IsNotNull(results, "Retrieved neighbours list is null");
+ Assert.That(results.Count, Is.EqualTo(1), "Retrieved neighbour collection is greater than expected");
+ Assert.That(results[0].RegionID, Is.EqualTo(new UUID(2)));
+ }
+ }
+}
--
cgit v1.1
From fd8fb7735b0eb6150679ccad84b2a32fd5315a38 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 23 Sep 2009 20:39:25 -0700
Subject: First test passes -- regions being registered and retrieved correctly
in Data.Null.
---
.../ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs')
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
index 8d44249..bd3293d 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
@@ -82,7 +82,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
GridRegion r2 = new GridRegion();
r2.RegionName = "Test Region 2";
r2.RegionID = new UUID(2);
- r2.RegionLocX = 1000 * (int)Constants.RegionSize + 1;
+ r2.RegionLocX = 1001 * (int)Constants.RegionSize;
r2.RegionLocY = 1000 * (int)Constants.RegionSize;
r2.ExternalHostName = "127.0.0.1";
r2.HttpPort = 9002;
@@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
GridRegion r3 = new GridRegion();
r3.RegionName = "Test Region 3";
r3.RegionID = new UUID(3);
- r3.RegionLocX = 1000 * (int)Constants.RegionSize + 5;
+ r3.RegionLocX = 1005 * (int)Constants.RegionSize;
r3.RegionLocY = 1000 * (int)Constants.RegionSize;
r3.ExternalHostName = "127.0.0.1";
r3.HttpPort = 9003;
--
cgit v1.1
From 1260c81a9cfc19306e2053a8b066e50c78dbc7c1 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 23 Sep 2009 20:51:04 -0700
Subject: More tests. Seems to be working. Grid connector modules are enabled
for standalones only, but nothing in the simulator uses them yet, so it's
safe to go in.
---
.../ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs')
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
index bd3293d..be32d6b 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs
@@ -116,7 +116,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests
List results = m_LocalConnector.GetNeighbours(UUID.Zero, new UUID(1));
Assert.IsNotNull(results, "Retrieved neighbours list is null");
Assert.That(results.Count, Is.EqualTo(1), "Retrieved neighbour collection is greater than expected");
- Assert.That(results[0].RegionID, Is.EqualTo(new UUID(2)));
+ Assert.That(results[0].RegionID, Is.EqualTo(new UUID(2)), "Retrieved region's UUID does not match");
+
+ results = m_LocalConnector.GetRegionsByName(UUID.Zero, "Test", 10);
+ Assert.IsNotNull(results, "Retrieved GetRegionsByName list is null");
+ Assert.That(results.Count, Is.EqualTo(3), "Retrieved neighbour collection is less than expected");
+
+ results = m_LocalConnector.GetRegionRange(UUID.Zero, 900 * (int)Constants.RegionSize, 1002 * (int)Constants.RegionSize,
+ 900 * (int)Constants.RegionSize, 1100 * (int)Constants.RegionSize);
+ Assert.IsNotNull(results, "Retrieved GetRegionRange list is null");
+ Assert.That(results.Count, Is.EqualTo(2), "Retrieved neighbour collection is not the number expected");
}
}
}
--
cgit v1.1