From 84af1075fd9f981d62d435fb21fe15b2944de0c7 Mon Sep 17 00:00:00 2001 From: DJGosnell Date: Thu, 24 Aug 2023 17:49:35 -0400 Subject: [PATCH] Added more detailed method names. Fixed warning. --- src/NexNet.IntegrationTests/BaseTests.cs | 1 - .../NexusClientTests_NexusDuplexPipe.cs | 28 ++++++++--------- .../NexusServerTests_NexusDuplexPipe.cs | 31 +++++++++---------- 3 files changed, 29 insertions(+), 31 deletions(-) diff --git a/src/NexNet.IntegrationTests/BaseTests.cs b/src/NexNet.IntegrationTests/BaseTests.cs index b09b44cf..40ee0a22 100644 --- a/src/NexNet.IntegrationTests/BaseTests.cs +++ b/src/NexNet.IntegrationTests/BaseTests.cs @@ -60,7 +60,6 @@ public virtual void TearDown() CurrentPath = null; CurrentTcpPort = null; CurrentUdpPort = null; - _logger = null; } protected ServerConfig CreateServerConfigWithLog(Type type, INexusLogger? logger = null) diff --git a/src/NexNet.IntegrationTests/NexusClientTests_NexusDuplexPipe.cs b/src/NexNet.IntegrationTests/NexusClientTests_NexusDuplexPipe.cs index 665eb324..62f93159 100644 --- a/src/NexNet.IntegrationTests/NexusClientTests_NexusDuplexPipe.cs +++ b/src/NexNet.IntegrationTests/NexusClientTests_NexusDuplexPipe.cs @@ -10,13 +10,13 @@ internal class NexusClientTests_NexusDuplexPipe : BasePipeTests [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeReaderReceivesDataMultipleTimes(Type type) + public async Task Client_PipeReaderReceivesDataMultipleTimes(Type type) { var (_, sNexus, _, cNexus, tcs) = await Setup(type); int count = 0; // Ensure that the ids will properly wrap around. - const int iterations = 1000; + const int iterations = 400; cNexus.ClientTaskValueWithDuplexPipeEvent = async (nexus, pipe) => { var result = await pipe.Input.ReadAsync(); @@ -48,7 +48,7 @@ public async Task PipeReaderReceivesDataMultipleTimes(Type type) [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeReaderReceivesData(Type type) + public async Task Client_PipeReaderReceivesData(Type type) { var (_, sNexus, _, cNexus, tcs) = await Setup(type); @@ -73,7 +73,7 @@ public async Task PipeReaderReceivesData(Type type) [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeWriterSendsData(Type type) + public async Task Client_PipeWriterSendsData(Type type) { var (_, sNexus, _, cNexus, _) = await Setup(type); @@ -95,7 +95,7 @@ public async Task PipeWriterSendsData(Type type) [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeReaderCompletesUponPipeCompleteAsync(Type type) + public async Task Client_PipeReaderCompletesUponPipeCompleteAsync(Type type) { var (_, sNexus, _, cNexus, tcs) = await Setup(type); @@ -119,7 +119,7 @@ public async Task PipeReaderCompletesUponPipeCompleteAsync(Type type) [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeWriterCompletesUponCompleteAsync(Type type) + public async Task Client_PipeWriterCompletesUponCompleteAsync(Type type) { var (_, sNexus, _, cNexus, tcs) = await Setup(type); cNexus.ClientTaskValueWithDuplexPipeEvent = async (nexus, pipe) => @@ -152,7 +152,7 @@ public async Task PipeWriterCompletesUponCompleteAsync(Type type) [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeReaderCompletesUponDisconnection(Type type) + public async Task Client_PipeReaderCompletesUponDisconnection(Type type) { var (_, sNexus, _, cNexus, tcs) = await Setup(type); @@ -177,7 +177,7 @@ public async Task PipeReaderCompletesUponDisconnection(Type type) [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeWriterCompletesUponDisconnection(Type type) + public async Task Client_PipeWriterCompletesUponDisconnection(Type type) { var tcsDisconnected = new TaskCompletionSource(); var (_, sNexus, _, cNexus, tcs) = await Setup(type); @@ -207,7 +207,7 @@ await sNexus.Context.Clients.Caller.ClientTaskValueWithDuplexPipe(pipe).AsTask() [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeReaderCompletesUponWriterCompletion(Type type) + public async Task Client_PipeReaderCompletesUponWriterCompletion(Type type) { var (_, sNexus, _, cNexus, tcs) = await Setup(type); @@ -233,7 +233,7 @@ public async Task PipeReaderCompletesUponWriterCompletion(Type type) [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeWriterCompletesUponWriterCompletion(Type type) + public async Task Client_PipeWriterCompletesUponWriterCompletion(Type type) { var (_, sNexus, _, cNexus, tcs) = await Setup(type); @@ -264,7 +264,7 @@ public async Task PipeWriterCompletesUponWriterCompletion(Type type) [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeWriterRemainsOpenUponOtherWriterCompletion(Type type) + public async Task Client_PipeWriterRemainsOpenUponOtherWriterCompletion(Type type) { var (_, sNexus, _, cNexus, _) = await Setup(type); @@ -291,7 +291,7 @@ public async Task PipeWriterRemainsOpenUponOtherWriterCompletion(Type type) [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeReaderRemainsOpenUponOtherReaderCompletion(Type type) + public async Task Client_PipeReaderRemainsOpenUponOtherReaderCompletion(Type type) { var (_, sNexus, _, cNexus, tcs) = await Setup(type); var outputComplete = new TaskCompletionSource(); @@ -327,7 +327,7 @@ public async Task PipeReaderRemainsOpenUponOtherReaderCompletion(Type type) [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeNotifiesWhenReady(Type type) + public async Task Client_PipeNotifiesWhenReady(Type type) { var (_, sNexus, _, cNexus, _) = await Setup(type); @@ -348,7 +348,7 @@ public async Task PipeNotifiesWhenReady(Type type) [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeReadyCancelsOnDisconnection(Type type) + public async Task Client_PipeReadyCancelsOnDisconnection(Type type) { var (server, _, client, _, _) = await Setup(type, true); diff --git a/src/NexNet.IntegrationTests/NexusServerTests_NexusDuplexPipe.cs b/src/NexNet.IntegrationTests/NexusServerTests_NexusDuplexPipe.cs index fbb54103..bcf9d5a8 100644 --- a/src/NexNet.IntegrationTests/NexusServerTests_NexusDuplexPipe.cs +++ b/src/NexNet.IntegrationTests/NexusServerTests_NexusDuplexPipe.cs @@ -6,12 +6,11 @@ namespace NexNet.IntegrationTests; internal class NexusServerTests_NexusDuplexPipe : BasePipeTests { - [TestCase(Type.Uds)] [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeReaderReceivesDataMultipleTimes(Type type) + public async Task Server_PipeReaderReceivesDataMultipleTimes(Type type) { var (_, sNexus, _, cNexus, tcs) = await Setup(type); int count = 0; @@ -49,7 +48,7 @@ public async Task PipeReaderReceivesDataMultipleTimes(Type type) [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeReaderReceivesData(Type type) + public async Task Server_PipeReaderReceivesData(Type type) { var (_, sNexus, _, cNexus, tcs) = await Setup(type); @@ -73,7 +72,7 @@ public async Task PipeReaderReceivesData(Type type) [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeWriterSendsData(Type type) + public async Task Server_PipeWriterSendsData(Type type) { var (_, sNexus, _, cNexus, _) = await Setup(type); @@ -95,7 +94,7 @@ public async Task PipeWriterSendsData(Type type) [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeReaderCompletesUponCompleteAsync(Type type) + public async Task Server_PipeReaderCompletesUponCompleteAsync(Type type) { var (_, sNexus, _, cNexus, tcs) = await Setup(type); @@ -119,7 +118,7 @@ public async Task PipeReaderCompletesUponCompleteAsync(Type type) [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeWriterCompletesUponCompleteAsync(Type type) + public async Task Server_PipeWriterCompletesUponCompleteAsync(Type type) { //Console.WriteLine("Starting test"); var (_, sNexus, _, cNexus, tcs) = await Setup(type); @@ -160,7 +159,7 @@ public async Task PipeWriterCompletesUponCompleteAsync(Type type) [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeReaderCompletesUponDisconnection(Type type) + public async Task Server_PipeReaderCompletesUponDisconnection(Type type) { var (_, sNexus, _, cNexus, tcs) = await Setup(type); @@ -186,7 +185,7 @@ await cNexus.Context.Proxy.ServerTaskValueWithDuplexPipe(pipe).AsTask() [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeWriterCompletesUponDisconnection(Type type) + public async Task Server_PipeWriterCompletesUponDisconnection(Type type) { var tcsDisconnected = new TaskCompletionSource(); var (_, sNexus, _, cNexus, tcs) = await Setup(type); @@ -216,7 +215,7 @@ await cNexus.Context.Proxy.ServerTaskValueWithDuplexPipe(pipe).AsTask() [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeReaderCompletesUponWriterCompletion(Type type) + public async Task Server_PipeReaderCompletesUponWriterCompletion(Type type) { var (_, sNexus, _, cNexus, tcs) = await Setup(type); @@ -241,7 +240,7 @@ public async Task PipeReaderCompletesUponWriterCompletion(Type type) [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeWriterCompletesUponWriterCompletion(Type type) + public async Task Server_PipeWriterCompletesUponWriterCompletion(Type type) { var (_, sNexus, _, cNexus, tcs) = await Setup(type); @@ -273,7 +272,7 @@ public async Task PipeWriterCompletesUponWriterCompletion(Type type) [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeWriterRemainsOpenUponOtherWriterCompletion(Type type) + public async Task Server_PipeWriterRemainsOpenUponOtherWriterCompletion(Type type) { var (_, sNexus, _, cNexus, tcs) = await Setup(type); @@ -301,7 +300,7 @@ public async Task PipeWriterRemainsOpenUponOtherWriterCompletion(Type type) [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeReaderRemainsOpenUponOtherReaderCompletion(Type type) + public async Task Server_PipeReaderRemainsOpenUponOtherReaderCompletion(Type type) { var (_, sNexus, _, cNexus, tcs) = await Setup(type); var outputComplete = new TaskCompletionSource(); @@ -338,7 +337,7 @@ public async Task PipeReaderRemainsOpenUponOtherReaderCompletion(Type type) [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeNotifiesWhenReady(Type type) + public async Task Server_PipeNotifiesWhenReady(Type type) { var (_, sNexus, _, cNexus, _) = await Setup(type); @@ -359,7 +358,7 @@ public async Task PipeNotifiesWhenReady(Type type) [TestCase(Type.Tcp)] [TestCase(Type.TcpTls)] [TestCase(Type.Quic)] - public async Task PipeReadyCancelsOnDisconnection(Type type) + public async Task Server_PipeReadyCancelsOnDisconnection(Type type) { var (_, sNexus, client, _, _) = await Setup(type); @@ -378,7 +377,7 @@ public async Task PipeReadyCancelsOnDisconnection(Type type) } [Test] - public async Task PipesThrowWhenInvokingOnMultipleConnections() + public async Task Server_PipesThrowWhenInvokingOnMultipleConnections() { var (_, sNexus, _, cNexus, tcs) = await Setup(Type.Uds); await AssertThrows(async () => @@ -408,7 +407,7 @@ await AssertThrows(async () => } [Test] - public async Task PipesAllowInvocationOnSingleConnections() + public async Task Server_PipesAllowInvocationOnSingleConnections() { var (_, sNexus, _, cNexus, tcs) = await Setup(Type.Uds);