From ee205e7e812e170f670e690a4e0fa9caa652f226 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 1 Oct 2009 01:00:09 +0900 Subject: Formatting cleanup. --- .../LindenUDP/Tests/BasicCircuitTests.cs | 46 +++++++++++----------- .../LindenUDP/Tests/PacketHandlerTests.cs | 12 +++--- .../LindenUDP/Tests/TestLLPacketServer.cs | 4 +- .../ClientStack/LindenUDP/Tests/TestLLUDPServer.cs | 6 +-- 4 files changed, 34 insertions(+), 34 deletions(-) (limited to 'OpenSim/Region/ClientStack/LindenUDP/Tests') diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs index 9fb1041..32c0397 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs @@ -54,7 +54,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests catch { // I don't care, just leave log4net off - } + } } /// @@ -63,20 +63,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests /// /// /// - /// Agent circuit manager used in setting up the stack + /// Agent circuit manager used in setting up the stack protected void SetupStack( IScene scene, out TestLLUDPServer testLLUDPServer, out TestLLPacketServer testPacketServer, out AgentCircuitManager acm) { IConfigSource configSource = new IniConfigSource(); ClientStackUserSettings userSettings = new ClientStackUserSettings(); - testLLUDPServer = new TestLLUDPServer(); + testLLUDPServer = new TestLLUDPServer(); acm = new AgentCircuitManager(); - uint port = 666; + uint port = 666; testLLUDPServer.Initialise(null, ref port, 0, false, configSource, acm); testPacketServer = new TestLLPacketServer(testLLUDPServer, userSettings); - testLLUDPServer.LocalScene = scene; + testLLUDPServer.LocalScene = scene; } /// @@ -124,7 +124,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests acm.AddNewCircuit(circuitCode, acd); - testLLUDPServer.LoadReceive(uccp, epSender); + testLLUDPServer.LoadReceive(uccp, epSender); testLLUDPServer.ReceiveData(null); } @@ -142,15 +142,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests onp.ObjectData = new ObjectNamePacket.ObjectDataBlock[] { odb }; onp.Header.Zerocoded = false; - return onp; + return onp; } /// /// Test adding a client to the stack /// - [Test, LongRunning] + [Test, LongRunning] public void TestAddClient() - { + { TestHelper.InMethod(); uint myCircuitCode = 123456; @@ -177,7 +177,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests EndPoint testEp = new IPEndPoint(IPAddress.Loopback, 999); - testLLUDPServer.LoadReceive(uccp, testEp); + testLLUDPServer.LoadReceive(uccp, testEp); testLLUDPServer.ReceiveData(null); // Circuit shouildn't exist since the circuit manager doesn't know about this circuit for authentication yet @@ -185,8 +185,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests acm.AddNewCircuit(myCircuitCode, acd); - testLLUDPServer.LoadReceive(uccp, testEp); - testLLUDPServer.ReceiveData(null); + testLLUDPServer.LoadReceive(uccp, testEp); + testLLUDPServer.ReceiveData(null); // Should succeed now Assert.IsTrue(testLLUDPServer.HasCircuit(myCircuitCode)); @@ -196,24 +196,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests /// /// Test removing a client from the stack /// - [Test] + [Test] public void TestRemoveClient() { TestHelper.InMethod(); - uint myCircuitCode = 123457; + uint myCircuitCode = 123457; TestLLUDPServer testLLUDPServer; TestLLPacketServer testLLPacketServer; AgentCircuitManager acm; - SetupStack(new MockScene(), out testLLUDPServer, out testLLPacketServer, out acm); + SetupStack(new MockScene(), out testLLUDPServer, out testLLPacketServer, out acm); AddClient(myCircuitCode, new IPEndPoint(IPAddress.Loopback, 1000), testLLUDPServer, acm); - testLLUDPServer.RemoveClientCircuit(myCircuitCode); + testLLUDPServer.RemoveClientCircuit(myCircuitCode); Assert.IsFalse(testLLUDPServer.HasCircuit(myCircuitCode)); // Check that removing a non-existant circuit doesn't have any bad effects - testLLUDPServer.RemoveClientCircuit(101); + testLLUDPServer.RemoveClientCircuit(101); Assert.IsFalse(testLLUDPServer.HasCircuit(101)); } @@ -232,7 +232,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests TestLLUDPServer testLLUDPServer; TestLLPacketServer testLLPacketServer; AgentCircuitManager acm; - SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm); + SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm); AddClient(myCircuitCode, testEp, testLLUDPServer, acm); byte[] data = new byte[] { 0x01, 0x02, 0x03, 0x04 }; @@ -270,17 +270,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests uint circuitCodeA = 130000; EndPoint epA = new IPEndPoint(IPAddress.Loopback, 1300); UUID agentIdA = UUID.Parse("00000000-0000-0000-0000-000000001300"); - UUID sessionIdA = UUID.Parse("00000000-0000-0000-0000-000000002300"); + UUID sessionIdA = UUID.Parse("00000000-0000-0000-0000-000000002300"); uint circuitCodeB = 130001; EndPoint epB = new IPEndPoint(IPAddress.Loopback, 1301); UUID agentIdB = UUID.Parse("00000000-0000-0000-0000-000000001301"); - UUID sessionIdB = UUID.Parse("00000000-0000-0000-0000-000000002301"); + UUID sessionIdB = UUID.Parse("00000000-0000-0000-0000-000000002301"); TestLLUDPServer testLLUDPServer; TestLLPacketServer testLLPacketServer; AgentCircuitManager acm; - SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm); + SetupStack(scene, out testLLUDPServer, out testLLPacketServer, out acm); AddClient(circuitCodeA, epA, agentIdA, sessionIdA, testLLUDPServer, acm); AddClient(circuitCodeB, epB, agentIdB, sessionIdB, testLLUDPServer, acm); @@ -293,7 +293,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests Assert.IsFalse(testLLUDPServer.HasCircuit(circuitCodeA)); Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3)); - Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3)); - } + Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3)); + } } } diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs index 8b11ccc..cde155b 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/PacketHandlerTests.cs @@ -45,7 +45,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests [Test] /// /// More a placeholder, really - /// + /// public void InPacketTest() { TestHelper.InMethod(); @@ -87,20 +87,20 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests /// /// /// - /// Agent circuit manager used in setting up the stack + /// Agent circuit manager used in setting up the stack protected void SetupStack( IScene scene, out TestLLUDPServer testLLUDPServer, out TestLLPacketServer testPacketServer, out AgentCircuitManager acm) { IConfigSource configSource = new IniConfigSource(); ClientStackUserSettings userSettings = new ClientStackUserSettings(); - testLLUDPServer = new TestLLUDPServer(); + testLLUDPServer = new TestLLUDPServer(); acm = new AgentCircuitManager(); - uint port = 666; + uint port = 666; testLLUDPServer.Initialise(null, ref port, 0, false, configSource, acm); testPacketServer = new TestLLPacketServer(testLLUDPServer, userSettings); - testLLUDPServer.LocalScene = scene; - } + testLLUDPServer.LocalScene = scene; + } } } diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs index d055969..1fba847 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLPacketServer.cs @@ -31,7 +31,7 @@ using OpenMetaverse.Packets; namespace OpenSim.Region.ClientStack.LindenUDP.Tests { public class TestLLPacketServer : LLPacketServer - { + { /// /// Record counts of packets received /// @@ -49,7 +49,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests m_packetsReceived[packet.Type]++; else m_packetsReceived[packet.Type] = 1; - } + } public int GetTotalPacketsReceived() { diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs index 1dffefb..f98586d 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/TestLLUDPServer.cs @@ -66,7 +66,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests ChunkSenderTuple tuple = m_chunksToLoad.Dequeue(); RecvBuffer = tuple.Data; numBytes = tuple.Data.Length; - epSender = tuple.Sender; + epSender = tuple.Sender; return true; } @@ -114,7 +114,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests { while (m_chunksToLoad.Count > 0) OnReceivedData(result); - } + } /// /// Has a circuit with the given code been established? @@ -134,7 +134,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests /// Record the data and sender tuple /// public class ChunkSenderTuple - { + { public byte[] Data; public EndPoint Sender; public bool BeginReceiveException; -- cgit v1.1