From f2fef4fa36af392e3eb7b96292b7b01f758f60aa Mon Sep 17 00:00:00 2001 From: Tyler Jensen Date: Sat, 14 Dec 2024 11:29:11 -0700 Subject: [PATCH] parallel tests create own client --- src/Tests/Unit/ServiceWireTests/NpTests.cs | 37 ++++++---- src/Tests/Unit/ServiceWireTests/TcpTests.cs | 71 ++++++++++--------- src/Tests/Unit/ServiceWireTests/TcpZkTests.cs | 65 +++++++++-------- 3 files changed, 95 insertions(+), 78 deletions(-) diff --git a/src/Tests/Unit/ServiceWireTests/NpTests.cs b/src/Tests/Unit/ServiceWireTests/NpTests.cs index bf0f794..5f070be 100644 --- a/src/Tests/Unit/ServiceWireTests/NpTests.cs +++ b/src/Tests/Unit/ServiceWireTests/NpTests.cs @@ -105,10 +105,13 @@ public void SimpleParallelTest() var a = rnd.Next(0, 100); var b = rnd.Next(0, 100); - var result = _clientProxy.Proxy.Min(a, b); - - if (Math.Min(a, b) != result) state.Break(); - Assert.Equal(Math.Min(a, b), result); + using (var clientProxy = new NpClient(CreateEndPoint())) + { + var result = clientProxy.Proxy.Min(a, b); + if (Math.Min(a, b) != result) state.Break(); + Assert.Equal(Math.Min(a, b), result); + } + Task.Delay(100); }); } @@ -137,21 +140,25 @@ public void ResponseParallelTest() const int count = 5; const int start = 0; - var result = _clientProxy.Proxy.Range(start, count); - for (var i = start; i < count; i++) + using (var clientProxy = new NpClient(CreateEndPoint())) { - int temp; - if (result.TryGetValue(i, out temp)) - { - if (i != temp) state.Break(); - Assert.Equal(i, temp); - } - else + var result = clientProxy.Proxy.Range(start, count); + for (var i = start; i < count; i++) { - state.Break(); - Assert.True(false); + int temp; + if (result.TryGetValue(i, out temp)) + { + if (i != temp) state.Break(); + Assert.Equal(i, temp); + } + else + { + state.Break(); + Assert.True(false); + } } } + Task.Delay(100); }); } diff --git a/src/Tests/Unit/ServiceWireTests/TcpTests.cs b/src/Tests/Unit/ServiceWireTests/TcpTests.cs index 8a4edbd..ca6745d 100644 --- a/src/Tests/Unit/ServiceWireTests/TcpTests.cs +++ b/src/Tests/Unit/ServiceWireTests/TcpTests.cs @@ -29,14 +29,14 @@ public TcpTests() _tcphost = new TcpHost(CreateEndPoint()); _tcphost.AddService(_tester); _tcphost.Open(); - Task.Delay(500); + Task.Delay(100); _clientProxy = new TcpClient(CreateEndPoint()); } [Fact] public void SimpleTest() { - Task.Delay(500); + Task.Delay(100); var rnd = new Random(); var a = rnd.Next(0, 100); @@ -44,13 +44,13 @@ public void SimpleTest() var result = _clientProxy.Proxy.Min(a, b); Assert.Equal(Math.Min(a, b), result); - Task.Delay(500); + Task.Delay(100); } [Fact] public async Task CalculateAsyncTest() { - await Task.Delay(500); + await Task.Delay(100); var rnd = new Random(); var a = rnd.Next(0, 100); @@ -58,13 +58,13 @@ public async Task CalculateAsyncTest() var result = await _clientProxy.Proxy.CalculateAsync(a, b); Assert.Equal(a + b, result); - await Task.Delay(500); + await Task.Delay(100); } [Fact] public void SimpleParallelTest() { - Task.Delay(500); + Task.Delay(100); var rnd = new Random(); Parallel.For(0, 4, (index, state) => @@ -72,22 +72,24 @@ public void SimpleParallelTest() var a = rnd.Next(0, 100); var b = rnd.Next(0, 100); - var result = _clientProxy.Proxy.Min(a, b); - - if (Math.Min(a, b) != result) + using (var clientProxy = new TcpClient(CreateEndPoint())) { - state.Break(); - Assert.Equal(Math.Min(a, b), result); + var result = clientProxy.Proxy.Min(a, b); + if (Math.Min(a, b) != result) + { + state.Break(); + Assert.Equal(Math.Min(a, b), result); + } } - Task.Delay(500); + Task.Delay(100); }); - Task.Delay(500); + Task.Delay(100); } [Fact] public void ResponseTest() { - Task.Delay(500); + Task.Delay(100); const int count = 50; const int start = 0; @@ -99,58 +101,61 @@ public void ResponseTest() Assert.True(result.TryGetValue(i, out temp)); Assert.Equal(i, temp); } - Task.Delay(500); + Task.Delay(100); } [Fact] public void ResponseParallelTest() { - Task.Delay(500); + Task.Delay(100); Parallel.For(0, 4, (index, state) => { const int count = 50; const int start = 0; - var result = _clientProxy.Proxy.Range(start, count); - for (var i = start; i < count; i++) + using (var clientProxy = new TcpClient(CreateEndPoint())) { - int temp; - if (result.TryGetValue(i, out temp)) + var result = clientProxy.Proxy.Range(start, count); + for (var i = start; i < count; i++) { - if (i != temp) state.Break(); - Assert.Equal(i, temp); - } - else - { - state.Break(); - Assert.True(false); + int temp; + if (result.TryGetValue(i, out temp)) + { + if (i != temp) state.Break(); + Assert.Equal(i, temp); + } + else + { + state.Break(); + Assert.True(false); + } } } - Task.Delay(500); + Task.Delay(100); }); - Task.Delay(500); + Task.Delay(100); } [Fact] public void ResponseWithOutParameterTest() { - Task.Delay(500); + Task.Delay(100); int quantity = 0; var result = _clientProxy.Proxy.Get(Guid.NewGuid(), "SomeLabel", 45.65, out quantity); Assert.Equal(44, quantity); Assert.NotEqual(default(TestResponse), result); Assert.Equal("MyLabel", result.Label); - Task.Delay(500); + Task.Delay(100); } [Fact] public void GetStringsTest() { - Task.Delay(500); + Task.Delay(100); var result = _clientProxy.Proxy.GetStrings(); Assert.Equal(4, result.Length); Assert.Null(result[2]); - Task.Delay(500); + Task.Delay(100); } diff --git a/src/Tests/Unit/ServiceWireTests/TcpZkTests.cs b/src/Tests/Unit/ServiceWireTests/TcpZkTests.cs index a5ae2d0..da98e52 100644 --- a/src/Tests/Unit/ServiceWireTests/TcpZkTests.cs +++ b/src/Tests/Unit/ServiceWireTests/TcpZkTests.cs @@ -52,14 +52,14 @@ public TcpZkTests() _tcphost = new TcpHost(CreateEndPoint(), zkRepository: _repo); _tcphost.AddService(_tester); _tcphost.Open(); - Task.Delay(500); + Task.Delay(100); _clientProxy = new TcpClient(CreateZkClientEndPoint()); } [Fact] public void SimpleZkTest() { - Task.Delay(500); + Task.Delay(100); var rnd = new Random(); var a = rnd.Next(0, 100); @@ -67,13 +67,13 @@ public void SimpleZkTest() var result = _clientProxy.Proxy.Min(a, b); Assert.Equal(Math.Min(a, b), result); - Task.Delay(500); + Task.Delay(100); } [Fact] public async Task CalculateAsyncTest() { - Task.Delay(500); + Task.Delay(100); var rnd = new Random(); var a = rnd.Next(0, 100); @@ -81,35 +81,37 @@ public async Task CalculateAsyncTest() var result = await _clientProxy.Proxy.CalculateAsync(a, b); Assert.Equal(a + b, result); - Task.Delay(500); + Task.Delay(100); } [Fact] public void SimpleParallelZkTest() { - Task.Delay(500); + Task.Delay(100); var rnd = new Random(); Parallel.For(0, 12, (index, state) => { var a = rnd.Next(0, 100); var b = rnd.Next(0, 100); - var result = _clientProxy.Proxy.Min(a, b); - - if (Math.Min(a, b) != result) + using (var clientProxy = new TcpClient(CreateZkClientEndPoint())) { - state.Break(); - Assert.Equal(Math.Min(a, b), result); + var result = _clientProxy.Proxy.Min(a, b); + if (Math.Min(a, b) != result) + { + state.Break(); + Assert.Equal(Math.Min(a, b), result); + } } - Task.Delay(500); + Task.Delay(100); }); - Task.Delay(500); + Task.Delay(100); } [Fact] public void ResponseZkTest() { - Task.Delay(500); + Task.Delay(100); const int count = 50; const int start = 0; @@ -127,38 +129,41 @@ public void ResponseZkTest() Assert.True(false); } } - Task.Delay(500); + Task.Delay(100); } [Fact] public void ResponseParallelTest() { - Task.Delay(500); + Task.Delay(100); Random rnd = new Random(DateTime.Now.Millisecond); Parallel.For(0, 12, (index, state) => { const int count = 50; const int start = 0; - var result = _clientProxy.Proxy.Range(start, count); - - for (var i = start; i < count; i++) + using (var clientProxy = new TcpClient(CreateZkClientEndPoint())) { - int temp; - if (result.TryGetValue(i, out temp)) - { - if(i != temp) state.Break(); - Assert.Equal(i, temp); - } - else + var result = clientProxy.Proxy.Range(start, count); + + for (var i = start; i < count; i++) { - state.Break(); - Assert.True(false); + int temp; + if (result.TryGetValue(i, out temp)) + { + if (i != temp) state.Break(); + Assert.Equal(i, temp); + } + else + { + state.Break(); + Assert.True(false); + } } } - Task.Delay(500); + Task.Delay(100); }); - Task.Delay(500); + Task.Delay(100); } public void Dispose()