From 55694807f94bf3837fd669a3f49c94d124c0f2ba Mon Sep 17 00:00:00 2001 From: Forest Date: Thu, 27 Dec 2018 23:23:03 -0800 Subject: [PATCH] Fix some tests I didn't notice I broke --- Hazel.UnitTests/TestHelper.cs | 16 ++++++++-------- Hazel.UnitTests/UdpConnectionTests.cs | 14 +++++++------- Hazel.UnitTests/UnitTest1.cs | 19 +++++++++---------- Hazel/Udp/UdpClientConnection.cs | 2 +- 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/Hazel.UnitTests/TestHelper.cs b/Hazel.UnitTests/TestHelper.cs index 6cb83a8..21857ff 100644 --- a/Hazel.UnitTests/TestHelper.cs +++ b/Hazel.UnitTests/TestHelper.cs @@ -23,7 +23,7 @@ namespace Hazel.UnitTests ManualResetEvent mutex = new ManualResetEvent(false); //Setup listener - listener.NewConnection += delegate(object sender, NewConnectionEventArgs ncArgs) + listener.NewConnection += delegate(NewConnectionEventArgs ncArgs) { ncArgs.Connection.SendBytes(data, sendOption); }; @@ -32,7 +32,7 @@ namespace Hazel.UnitTests DataReceivedEventArgs args = null; //Setup conneciton - connection.DataReceived += delegate(object sender, DataReceivedEventArgs a) + connection.DataReceived += delegate(DataReceivedEventArgs a) { Trace.WriteLine("Data was received correctly."); @@ -75,9 +75,9 @@ namespace Hazel.UnitTests //Setup listener DataReceivedEventArgs result = null; - listener.NewConnection += delegate(object sender, NewConnectionEventArgs args) + listener.NewConnection += delegate(NewConnectionEventArgs args) { - args.Connection.DataReceived += delegate(object innerSender, DataReceivedEventArgs innerArgs) + args.Connection.DataReceived += delegate(DataReceivedEventArgs innerArgs) { Trace.WriteLine("Data was received correctly."); @@ -125,9 +125,9 @@ namespace Hazel.UnitTests mutex.Set(); }; - listener.NewConnection += delegate(object sender, NewConnectionEventArgs args) + listener.NewConnection += delegate(NewConnectionEventArgs args) { - args.Connection.Close(); + args.Connection.Disconnect("Testing"); }; listener.Start(); @@ -147,7 +147,7 @@ namespace Hazel.UnitTests ManualResetEvent mutex = new ManualResetEvent(false); ManualResetEvent mutex2 = new ManualResetEvent(false); - listener.NewConnection += delegate(object sender, NewConnectionEventArgs args) + listener.NewConnection += delegate(NewConnectionEventArgs args) { args.Connection.Disconnected += delegate(object sender2, DisconnectedEventArgs args2) { @@ -163,7 +163,7 @@ namespace Hazel.UnitTests mutex.WaitOne(); - connection.Close(); + connection.Disconnect("Testing"); mutex2.WaitOne(); } diff --git a/Hazel.UnitTests/UdpConnectionTests.cs b/Hazel.UnitTests/UdpConnectionTests.cs index e5bc74a..408eebd 100644 --- a/Hazel.UnitTests/UdpConnectionTests.cs +++ b/Hazel.UnitTests/UdpConnectionTests.cs @@ -46,7 +46,7 @@ namespace Hazel.UnitTests listener.Start(); MessageReader output = null; - listener.NewConnection += delegate (object sender, NewConnectionEventArgs e) + listener.NewConnection += delegate (NewConnectionEventArgs e) { output = e.HandshakeData; }; @@ -69,9 +69,9 @@ namespace Hazel.UnitTests using (UdpConnection connection = new UdpClientConnection(new NetworkEndPoint(IPAddress.Loopback, 4296, IPMode.IPv4))) { MessageReader output = null; - listener.NewConnection += delegate (object sender, NewConnectionEventArgs e) + listener.NewConnection += delegate (NewConnectionEventArgs e) { - e.Connection.DataReceived += delegate (object s, DataReceivedEventArgs evt) + e.Connection.DataReceived += delegate (DataReceivedEventArgs evt) { output = evt.Message; }; @@ -103,9 +103,9 @@ namespace Hazel.UnitTests using (UdpConnection connection = new UdpClientConnection(new NetworkEndPoint(IPAddress.Loopback, 4296, IPMode.IPv4))) { listener.Start(); - listener.NewConnection += delegate (object sender, NewConnectionEventArgs e) + listener.NewConnection += delegate (NewConnectionEventArgs e) { - e.Connection.DataReceived += delegate (object s, DataReceivedEventArgs evt) + e.Connection.DataReceived += delegate (DataReceivedEventArgs evt) { Assert.IsTrue(Enumerable.SequenceEqual(evt.Message.Buffer, new byte[] { 3, 4 })); }; @@ -141,7 +141,7 @@ namespace Hazel.UnitTests { listener2.Start(); - listener2.NewConnection += (sender, evt) => + listener2.NewConnection += (evt) => { Console.WriteLine("v6 connection: " + ((NetworkConnection)evt.Connection).GetIP4Address()); }; @@ -264,7 +264,7 @@ namespace Hazel.UnitTests using (UdpConnectionListener listener = new UdpConnectionListener(new NetworkEndPoint(IPAddress.Any, 4296))) using (UdpConnection connection = new UdpClientConnection(new NetworkEndPoint(IPAddress.Loopback, 4296))) { - listener.NewConnection += delegate(object sender, NewConnectionEventArgs args) + listener.NewConnection += delegate(NewConnectionEventArgs args) { ((UdpConnection)args.Connection).KeepAliveInterval = 100; diff --git a/Hazel.UnitTests/UnitTest1.cs b/Hazel.UnitTests/UnitTest1.cs index 0abb779..7b0eb6e 100644 --- a/Hazel.UnitTests/UnitTest1.cs +++ b/Hazel.UnitTests/UnitTest1.cs @@ -10,19 +10,18 @@ namespace Hazel.UnitTests [TestClass] public class UnitTest1 { - // [TestMethod] + [TestMethod] public void StressTest() { + var ep = new NetworkEndPoint(IPAddress.Loopback, 22023); Parallel.For(0, 10000, - new ParallelOptions { MaxDegreeOfParallelism = 16 }, - (i) => - { - var ep = new NetworkEndPoint(IPAddress.Loopback, 22023); - using (var connection = new UdpClientConnection(ep)) - { - connection.Connect(); - Thread.Sleep(100); - } + new ParallelOptions { MaxDegreeOfParallelism = 64 }, + (i) => { + + var connection = new UdpClientConnection(ep); + connection.KeepAliveInterval = 50; + + connection.Connect(new byte[5]); }); } } diff --git a/Hazel/Udp/UdpClientConnection.cs b/Hazel/Udp/UdpClientConnection.cs index fb3a86f..1a74a46 100644 --- a/Hazel/Udp/UdpClientConnection.cs +++ b/Hazel/Udp/UdpClientConnection.cs @@ -278,7 +278,7 @@ namespace Hazel.Udp if (this.state == ConnectionState.Connected || this.state == ConnectionState.Disconnecting) { - SendDisconnect(); + // SendDisconnect(); this.state = ConnectionState.NotConnected; } } -- 2.39.5