diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs index a935dd2..0e1a9e3 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs | |||
@@ -70,7 +70,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
70 | m_scene = new SceneHelpers().SetupScene(); | 70 | m_scene = new SceneHelpers().SetupScene(); |
71 | StatsManager.SimExtraStats = new SimExtraStatsCollector(); | 71 | StatsManager.SimExtraStats = new SimExtraStatsCollector(); |
72 | } | 72 | } |
73 | 73 | ||
74 | // /// <summary> | 74 | // /// <summary> |
75 | // /// Build an object name packet for test purposes | 75 | // /// Build an object name packet for test purposes |
76 | // /// </summary> | 76 | // /// </summary> |
@@ -84,7 +84,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
84 | // odb.Name = Utils.StringToBytes(objectName); | 84 | // odb.Name = Utils.StringToBytes(objectName); |
85 | // onp.ObjectData = new ObjectNamePacket.ObjectDataBlock[] { odb }; | 85 | // onp.ObjectData = new ObjectNamePacket.ObjectDataBlock[] { odb }; |
86 | // onp.Header.Zerocoded = false; | 86 | // onp.Header.Zerocoded = false; |
87 | // | 87 | // |
88 | // return onp; | 88 | // return onp; |
89 | // } | 89 | // } |
90 | // | 90 | // |
@@ -156,7 +156,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
156 | config.Set("AckTimeout", -1); | 156 | config.Set("AckTimeout", -1); |
157 | TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(m_scene, ics); | 157 | TestLLUDPServer udpServer = ClientStackHelpers.AddUdpServer(m_scene, ics); |
158 | 158 | ||
159 | ScenePresence sp | 159 | ScenePresence sp |
160 | = ClientStackHelpers.AddChildClient( | 160 | = ClientStackHelpers.AddChildClient( |
161 | m_scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456); | 161 | m_scene, udpServer, TestHelpers.ParseTail(0x1), TestHelpers.ParseTail(0x2), 123456); |
162 | 162 | ||
@@ -175,21 +175,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
175 | // TestHelper.InMethod(); | 175 | // TestHelper.InMethod(); |
176 | // | 176 | // |
177 | // uint myCircuitCode = 123457; | 177 | // uint myCircuitCode = 123457; |
178 | // | 178 | // |
179 | // TestLLUDPServer testLLUDPServer; | 179 | // TestLLUDPServer testLLUDPServer; |
180 | // TestLLPacketServer testLLPacketServer; | 180 | // TestLLPacketServer testLLPacketServer; |
181 | // AgentCircuitManager acm; | 181 | // AgentCircuitManager acm; |
182 | // SetupStack(new MockScene(), out testLLUDPServer, out testLLPacketServer, out acm); | 182 | // SetupStack(new MockScene(), out testLLUDPServer, out testLLPacketServer, out acm); |
183 | // AddClient(myCircuitCode, new IPEndPoint(IPAddress.Loopback, 1000), testLLUDPServer, acm); | 183 | // AddClient(myCircuitCode, new IPEndPoint(IPAddress.Loopback, 1000), testLLUDPServer, acm); |
184 | // | 184 | // |
185 | // testLLUDPServer.RemoveClientCircuit(myCircuitCode); | 185 | // testLLUDPServer.RemoveClientCircuit(myCircuitCode); |
186 | // Assert.IsFalse(testLLUDPServer.HasCircuit(myCircuitCode)); | 186 | // Assert.IsFalse(testLLUDPServer.HasCircuit(myCircuitCode)); |
187 | // | 187 | // |
188 | // // Check that removing a non-existent circuit doesn't have any bad effects | 188 | // // Check that removing a non-existent circuit doesn't have any bad effects |
189 | // testLLUDPServer.RemoveClientCircuit(101); | 189 | // testLLUDPServer.RemoveClientCircuit(101); |
190 | // Assert.IsFalse(testLLUDPServer.HasCircuit(101)); | 190 | // Assert.IsFalse(testLLUDPServer.HasCircuit(101)); |
191 | // } | 191 | // } |
192 | // | 192 | // |
193 | // /// <summary> | 193 | // /// <summary> |
194 | // /// Make sure that the client stack reacts okay to malformed packets | 194 | // /// Make sure that the client stack reacts okay to malformed packets |
195 | // /// </summary> | 195 | // /// </summary> |
@@ -200,8 +200,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
200 | // | 200 | // |
201 | // uint myCircuitCode = 123458; | 201 | // uint myCircuitCode = 123458; |
202 | // EndPoint testEp = new IPEndPoint(IPAddress.Loopback, 1001); | 202 | // EndPoint testEp = new IPEndPoint(IPAddress.Loopback, 1001); |
203 | // MockScene scene = new MockScene(); | 203 | // MockScene scene = new MockScene(); |
204 | // | 204 | // |
205 | // TestLLUDPServer testLLUDPServer; | 205 | // TestLLUDPServer testLLUDPServer; |
206 | // TestLLPacketServer testLLPacketServer; | 206 | // TestLLPacketServer testLLPacketServer; |
207 | // AgentCircuitManager acm; | 207 | // AgentCircuitManager acm; |
@@ -213,24 +213,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
213 | // // Send two garbled 'packets' in succession | 213 | // // Send two garbled 'packets' in succession |
214 | // testLLUDPServer.LoadReceive(data, testEp); | 214 | // testLLUDPServer.LoadReceive(data, testEp); |
215 | // testLLUDPServer.LoadReceive(data, testEp); | 215 | // testLLUDPServer.LoadReceive(data, testEp); |
216 | // testLLUDPServer.ReceiveData(null); | 216 | // testLLUDPServer.ReceiveData(null); |
217 | // | 217 | // |
218 | // // Check that we are still here | 218 | // // Check that we are still here |
219 | // Assert.IsTrue(testLLUDPServer.HasCircuit(myCircuitCode)); | 219 | // Assert.IsTrue(testLLUDPServer.HasCircuit(myCircuitCode)); |
220 | // Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(0)); | 220 | // Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(0)); |
221 | // | 221 | // |
222 | // // Check that sending a valid packet to same circuit still succeeds | 222 | // // Check that sending a valid packet to same circuit still succeeds |
223 | // Assert.That(scene.ObjectNameCallsReceived, Is.EqualTo(0)); | 223 | // Assert.That(scene.ObjectNameCallsReceived, Is.EqualTo(0)); |
224 | // | 224 | // |
225 | // testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(1, "helloooo"), testEp); | 225 | // testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(1, "helloooo"), testEp); |
226 | // testLLUDPServer.ReceiveData(null); | 226 | // testLLUDPServer.ReceiveData(null); |
227 | // | 227 | // |
228 | // Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(1)); | 228 | // Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(1)); |
229 | // Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(1)); | 229 | // Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(1)); |
230 | // } | 230 | // } |
231 | // | 231 | // |
232 | // /// <summary> | 232 | // /// <summary> |
233 | // /// Test that the stack continues to work even if some client has caused a | 233 | // /// Test that the stack continues to work even if some client has caused a |
234 | // /// SocketException on Socket.BeginReceive() | 234 | // /// SocketException on Socket.BeginReceive() |
235 | // /// </summary> | 235 | // /// </summary> |
236 | // [Test] | 236 | // [Test] |
@@ -239,32 +239,32 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
239 | // TestHelper.InMethod(); | 239 | // TestHelper.InMethod(); |
240 | // | 240 | // |
241 | // MockScene scene = new MockScene(); | 241 | // MockScene scene = new MockScene(); |
242 | // | 242 | // |
243 | // uint circuitCodeA = 130000; | 243 | // uint circuitCodeA = 130000; |
244 | // EndPoint epA = new IPEndPoint(IPAddress.Loopback, 1300); | 244 | // EndPoint epA = new IPEndPoint(IPAddress.Loopback, 1300); |
245 | // UUID agentIdA = UUID.Parse("00000000-0000-0000-0000-000000001300"); | 245 | // UUID agentIdA = UUID.Parse("00000000-0000-0000-0000-000000001300"); |
246 | // UUID sessionIdA = UUID.Parse("00000000-0000-0000-0000-000000002300"); | 246 | // UUID sessionIdA = UUID.Parse("00000000-0000-0000-0000-000000002300"); |
247 | // | 247 | // |
248 | // uint circuitCodeB = 130001; | 248 | // uint circuitCodeB = 130001; |
249 | // EndPoint epB = new IPEndPoint(IPAddress.Loopback, 1301); | 249 | // EndPoint epB = new IPEndPoint(IPAddress.Loopback, 1301); |
250 | // UUID agentIdB = UUID.Parse("00000000-0000-0000-0000-000000001301"); | 250 | // UUID agentIdB = UUID.Parse("00000000-0000-0000-0000-000000001301"); |
251 | // UUID sessionIdB = UUID.Parse("00000000-0000-0000-0000-000000002301"); | 251 | // UUID sessionIdB = UUID.Parse("00000000-0000-0000-0000-000000002301"); |
252 | // | 252 | // |
253 | // TestLLUDPServer testLLUDPServer; | 253 | // TestLLUDPServer testLLUDPServer; |
254 | // TestLLPacketServer testLLPacketServer; | 254 | // TestLLPacketServer testLLPacketServer; |
255 | // AgentCircuitManager acm; | 255 | // AgentCircuitManager acm; |
256 | // SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm); | 256 | // SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm); |
257 | // AddClient(circuitCodeA, epA, agentIdA, sessionIdA, testLLUDPServer, acm); | 257 | // AddClient(circuitCodeA, epA, agentIdA, sessionIdA, testLLUDPServer, acm); |
258 | // AddClient(circuitCodeB, epB, agentIdB, sessionIdB, testLLUDPServer, acm); | 258 | // AddClient(circuitCodeB, epB, agentIdB, sessionIdB, testLLUDPServer, acm); |
259 | // | 259 | // |
260 | // testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(1, "packet1"), epA); | 260 | // testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(1, "packet1"), epA); |
261 | // testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(1, "packet2"), epB); | 261 | // testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(1, "packet2"), epB); |
262 | // testLLUDPServer.LoadReceiveWithBeginException(epA); | 262 | // testLLUDPServer.LoadReceiveWithBeginException(epA); |
263 | // testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(2, "packet3"), epB); | 263 | // testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(2, "packet3"), epB); |
264 | // testLLUDPServer.ReceiveData(null); | 264 | // testLLUDPServer.ReceiveData(null); |
265 | // | 265 | // |
266 | // Assert.IsFalse(testLLUDPServer.HasCircuit(circuitCodeA)); | 266 | // Assert.IsFalse(testLLUDPServer.HasCircuit(circuitCodeA)); |
267 | // | 267 | // |
268 | // Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3)); | 268 | // Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3)); |
269 | // Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3)); | 269 | // Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3)); |
270 | // } | 270 | // } |