aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tests/Robust
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Tests/Robust/Clients/Grid/GridClient.cs4
-rw-r--r--OpenSim/Tests/Robust/Clients/Inventory/InventoryClient.cs7
-rw-r--r--OpenSim/Tests/Robust/Server/DemonServer.cs4
3 files changed, 7 insertions, 8 deletions
diff --git a/OpenSim/Tests/Robust/Clients/Grid/GridClient.cs b/OpenSim/Tests/Robust/Clients/Grid/GridClient.cs
index 671aca7..1549851 100644
--- a/OpenSim/Tests/Robust/Clients/Grid/GridClient.cs
+++ b/OpenSim/Tests/Robust/Clients/Grid/GridClient.cs
@@ -95,7 +95,7 @@ namespace Robust.Tests
95 Assert.AreNotEqual(regions, null, "GetRegionsByName failed"); 95 Assert.AreNotEqual(regions, null, "GetRegionsByName failed");
96 Assert.AreEqual(regions.Count, 3, "GetRegionsByName should return 3"); 96 Assert.AreEqual(regions.Count, 3, "GetRegionsByName should return 3");
97 97
98 regions = m_Connector.GetRegionRange(UUID.Zero, 98 regions = m_Connector.GetRegionRange(UUID.Zero,
99 (int)Util.RegionToWorldLoc(900), (int)Util.RegionToWorldLoc(1002), 99 (int)Util.RegionToWorldLoc(900), (int)Util.RegionToWorldLoc(1002),
100 (int)Util.RegionToWorldLoc(900), (int)Util.RegionToWorldLoc(1002) ); 100 (int)Util.RegionToWorldLoc(900), (int)Util.RegionToWorldLoc(1002) );
101 Assert.AreNotEqual(regions, null, "GetRegionRange failed"); 101 Assert.AreNotEqual(regions, null, "GetRegionRange failed");
@@ -126,7 +126,7 @@ namespace Robust.Tests
126 region.ExternalHostName = "127.0.0.1"; 126 region.ExternalHostName = "127.0.0.1";
127 region.HttpPort = 9000; 127 region.HttpPort = 9000;
128 region.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 9000); 128 region.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 9000);
129 129
130 return region; 130 return region;
131 } 131 }
132 } 132 }
diff --git a/OpenSim/Tests/Robust/Clients/Inventory/InventoryClient.cs b/OpenSim/Tests/Robust/Clients/Inventory/InventoryClient.cs
index 0280b73..fe46a4f 100644
--- a/OpenSim/Tests/Robust/Clients/Inventory/InventoryClient.cs
+++ b/OpenSim/Tests/Robust/Clients/Inventory/InventoryClient.cs
@@ -159,8 +159,7 @@ namespace Robust.Tests
159 XInventoryServicesConnector m_Connector = new XInventoryServicesConnector(DemonServer.Address); 159 XInventoryServicesConnector m_Connector = new XInventoryServicesConnector(DemonServer.Address);
160 160
161 // Prefetch Notecard 1, will be cached from here on 161 // Prefetch Notecard 1, will be cached from here on
162 InventoryItemBase item = new InventoryItemBase(new UUID("10000000-0000-0000-0000-000000000001"), m_userID); 162 InventoryItemBase item = m_Connector.GetItem(m_userID, new UUID("10000000-0000-0000-0000-000000000001"));
163 item = m_Connector.GetItem(item);
164 Assert.NotNull(item, "Failed to get Notecard 1"); 163 Assert.NotNull(item, "Failed to get Notecard 1");
165 Assert.AreEqual("Test Notecard 1", item.Name, "Wrong name for Notecard 1"); 164 Assert.AreEqual("Test Notecard 1", item.Name, "Wrong name for Notecard 1");
166 165
@@ -177,7 +176,7 @@ namespace Robust.Tests
177 Assert.NotNull(items, "(Repeat) Failed to get multiple items"); 176 Assert.NotNull(items, "(Repeat) Failed to get multiple items");
178 Assert.IsTrue(items.Length == 2, "(Repeat) Requested 2 items, but didn't receive 2 items"); 177 Assert.IsTrue(items.Length == 2, "(Repeat) Requested 2 items, but didn't receive 2 items");
179 178
180 // This item doesn't exist, but [0] does, and it's cached. 179 // This item doesn't exist, but [0] does, and it's cached.
181 uuids[1] = new UUID("bb000000-0000-0000-0000-0000000000bb"); 180 uuids[1] = new UUID("bb000000-0000-0000-0000-0000000000bb");
182 // Fetching should return 2 items, but [1] should be null 181 // Fetching should return 2 items, but [1] should be null
183 items = m_Connector.GetMultipleItems(m_userID, uuids); 182 items = m_Connector.GetMultipleItems(m_userID, uuids);
@@ -186,7 +185,7 @@ namespace Robust.Tests
186 Assert.AreEqual("Test Notecard 1", items[0].Name, "(Three times) Wrong name for Notecard 1"); 185 Assert.AreEqual("Test Notecard 1", items[0].Name, "(Three times) Wrong name for Notecard 1");
187 Assert.IsNull(items[1], "(Three times) Expecting 2nd item to be null"); 186 Assert.IsNull(items[1], "(Three times) Expecting 2nd item to be null");
188 187
189 // Now both don't exist 188 // Now both don't exist
190 uuids[0] = new UUID("aa000000-0000-0000-0000-0000000000aa"); 189 uuids[0] = new UUID("aa000000-0000-0000-0000-0000000000aa");
191 items = m_Connector.GetMultipleItems(m_userID, uuids); 190 items = m_Connector.GetMultipleItems(m_userID, uuids);
192 Assert.Null(items[0], "Request to multiple non-existent items is supposed to return null [0]"); 191 Assert.Null(items[0], "Request to multiple non-existent items is supposed to return null [0]");
diff --git a/OpenSim/Tests/Robust/Server/DemonServer.cs b/OpenSim/Tests/Robust/Server/DemonServer.cs
index 205abfb..1e0797e 100644
--- a/OpenSim/Tests/Robust/Server/DemonServer.cs
+++ b/OpenSim/Tests/Robust/Server/DemonServer.cs
@@ -48,8 +48,8 @@ namespace Robust.Tests
48 [SetUp] 48 [SetUp]
49 public void StartDemon() 49 public void StartDemon()
50 { 50 {
51 if (File.Exists("../logs/Robust.Tests.log")) 51 if (File.Exists("Robust.Tests.log"))
52 File.Delete("../logs/Robust.Tests.log"); 52 File.Delete("Robust.Tests.log");
53 53
54 Console.WriteLine("**** Starting demon Robust server ****"); 54 Console.WriteLine("**** Starting demon Robust server ****");
55 m_demon = new Thread( () => Main(new string[] {"-inifile=Robust.Tests.ini"})); 55 m_demon = new Thread( () => Main(new string[] {"-inifile=Robust.Tests.ini"}));