diff options
author | Diva Canto | 2009-09-23 20:51:04 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-23 20:51:04 -0700 |
commit | 1260c81a9cfc19306e2053a8b066e50c78dbc7c1 (patch) | |
tree | 8c7dc9c5ff495b5f258b8653dcb02ab0708a7d00 | |
parent | First test passes -- regions being registered and retrieved correctly in Data... (diff) | |
download | opensim-SC_OLD-1260c81a9cfc19306e2053a8b066e50c78dbc7c1.zip opensim-SC_OLD-1260c81a9cfc19306e2053a8b066e50c78dbc7c1.tar.gz opensim-SC_OLD-1260c81a9cfc19306e2053a8b066e50c78dbc7c1.tar.bz2 opensim-SC_OLD-1260c81a9cfc19306e2053a8b066e50c78dbc7c1.tar.xz |
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.
-rw-r--r-- | OpenSim/Data/Null/NullRegionData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs index 03489f9..e976c40 100644 --- a/OpenSim/Data/Null/NullRegionData.cs +++ b/OpenSim/Data/Null/NullRegionData.cs | |||
@@ -40,7 +40,7 @@ namespace OpenSim.Data.Null | |||
40 | 40 | ||
41 | public NullRegionData(string connectionString, string realm) | 41 | public NullRegionData(string connectionString, string realm) |
42 | { | 42 | { |
43 | Console.WriteLine("[XXX] NullRegionData constructor"); | 43 | //Console.WriteLine("[XXX] NullRegionData constructor"); |
44 | } | 44 | } |
45 | 45 | ||
46 | public List<RegionData> Get(string regionName, UUID scopeID) | 46 | public List<RegionData> Get(string regionName, UUID scopeID) |
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 | |||
116 | List<GridRegion> results = m_LocalConnector.GetNeighbours(UUID.Zero, new UUID(1)); | 116 | List<GridRegion> results = m_LocalConnector.GetNeighbours(UUID.Zero, new UUID(1)); |
117 | Assert.IsNotNull(results, "Retrieved neighbours list is null"); | 117 | Assert.IsNotNull(results, "Retrieved neighbours list is null"); |
118 | Assert.That(results.Count, Is.EqualTo(1), "Retrieved neighbour collection is greater than expected"); | 118 | Assert.That(results.Count, Is.EqualTo(1), "Retrieved neighbour collection is greater than expected"); |
119 | Assert.That(results[0].RegionID, Is.EqualTo(new UUID(2))); | 119 | Assert.That(results[0].RegionID, Is.EqualTo(new UUID(2)), "Retrieved region's UUID does not match"); |
120 | |||
121 | results = m_LocalConnector.GetRegionsByName(UUID.Zero, "Test", 10); | ||
122 | Assert.IsNotNull(results, "Retrieved GetRegionsByName list is null"); | ||
123 | Assert.That(results.Count, Is.EqualTo(3), "Retrieved neighbour collection is less than expected"); | ||
124 | |||
125 | results = m_LocalConnector.GetRegionRange(UUID.Zero, 900 * (int)Constants.RegionSize, 1002 * (int)Constants.RegionSize, | ||
126 | 900 * (int)Constants.RegionSize, 1100 * (int)Constants.RegionSize); | ||
127 | Assert.IsNotNull(results, "Retrieved GetRegionRange list is null"); | ||
128 | Assert.That(results.Count, Is.EqualTo(2), "Retrieved neighbour collection is not the number expected"); | ||
120 | } | 129 | } |
121 | } | 130 | } |
122 | } | 131 | } |