diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs index b8097a43a6c6da..6ce1540fba5996 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/MsQuicTests.cs @@ -216,7 +216,7 @@ public async Task WaitForAvailableBidirectionStreamsAsyncWorks() public async Task SetListenerTimeoutWorksWithSmallTimeout() { var quicOptions = new QuicListenerOptions(); - quicOptions.IdleTimeout = TimeSpan.FromSeconds(10); + quicOptions.IdleTimeout = TimeSpan.FromSeconds(1); quicOptions.ServerAuthenticationOptions = GetSslServerAuthenticationOptions(); quicOptions.ListenEndPoint = new IPEndPoint(IPAddress.Loopback, 0); @@ -476,7 +476,7 @@ await RunClientServer( byte[] buffer = new byte[data.Length]; int bytesRead = await ReadAll(stream, buffer); Assert.Equal(data.Length, bytesRead); - AssertArrayEqual(data, buffer); + AssertExtensions.SequenceEqual(data, buffer); for (int pos = 0; pos < data.Length; pos += writeSize) { @@ -499,7 +499,7 @@ await RunClientServer( byte[] buffer = new byte[data.Length]; int bytesRead = await ReadAll(stream, buffer); Assert.Equal(data.Length, bytesRead); - AssertArrayEqual(data, buffer); + AssertExtensions.SequenceEqual(data, buffer); await stream.ShutdownCompleted(); } diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamTests.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamTests.cs index 7b40903651824f..b21135000aca65 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamTests.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicStreamTests.cs @@ -190,7 +190,7 @@ await RunClientServer( byte[] buffer = new byte[data.Length]; int bytesRead = await ReadAll(stream, buffer); Assert.Equal(data.Length, bytesRead); - AssertArrayEqual(data, buffer); + AssertExtensions.SequenceEqual(data, buffer); for (int pos = 0; pos < data.Length; pos += writeSize) { @@ -213,7 +213,7 @@ await RunClientServer( byte[] buffer = new byte[data.Length]; int bytesRead = await ReadAll(stream, buffer); Assert.Equal(data.Length, bytesRead); - AssertArrayEqual(data, buffer); + AssertExtensions.SequenceEqual(data, buffer); await stream.ShutdownCompleted(); } @@ -391,7 +391,7 @@ await RunClientServer( } Assert.Equal(testBuffer.Length, totalBytesRead); - AssertArrayEqual(testBuffer, receiveBuffer); + AssertExtensions.SequenceEqual(testBuffer, receiveBuffer); await serverStream.ShutdownCompleted(); }); diff --git a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicTestBase.cs b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicTestBase.cs index 4d9ab4de6a3aa2..803b2d40705921 100644 --- a/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicTestBase.cs +++ b/src/libraries/System.Net.Quic/tests/FunctionalTests/QuicTestBase.cs @@ -171,40 +171,6 @@ internal static async Task WriteForever(QuicStream stream) await stream.WriteAsync(buffer); } } - - internal static void AssertArrayEqual(byte[] expected, byte[] actual) - { - for (int i = 0; i < expected.Length; ++i) - { - if (expected[i] == actual[i]) - { - continue; - } - - var message = $"Wrong data starting from idx={i}\n" + - $"Expected: {ToStringAroundIndex(expected, i)}\n" + - $"Actual: {ToStringAroundIndex(actual, i)}"; - - Assert.True(expected[i] == actual[i], message); - } - } - - private static string ToStringAroundIndex(byte[] arr, int idx, int dl = 3, int dr = 7) - { - var sb = new StringBuilder(idx - (dl+1) >= 0 ? "[..., " : "["); - - for (int i = idx - dl; i <= idx + dr; ++i) - { - if (i >= 0 && i < arr.Length) - { - sb.Append($"{arr[i]}, "); - } - } - - sb.Append(idx + (dr+1) < arr.Length ? "...]" : "]"); - - return sb.ToString(); - } } public interface IQuicImplProviderFactory