Address PR feedback

dotnet · May 29, 2020 · 502e169 · 502e169
1 parent 9fd0c2b
commit 502e169
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamStreamToStreamTest.cs b/src/libraries/System.Net.Security/tests/FunctionalTests/SslStreamStreamToStreamTest.cs
@@ -262,15 +262,9 @@ public async Task SslStream_StreamToStream_Successive_ClientWrite_WithZeroBytes_
         [Fact]
         public async Task SslStream_StreamToStream_ZeroByteRead_SucceedsWhenDataAvailable()
         {
-            using var listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-            using var client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-            listener.Bind(new IPEndPoint(IPAddress.Loopback, 0));
-            listener.Listen(1);
-            client.Connect(listener.LocalEndPoint);
-            using Socket server = listener.Accept();
-
-            using var clientSslStream = new SslStream(new NetworkStream(client, ownsSocket: true), leaveInnerStreamOpen: false, AllowAnyServerCertificate);
-            using var serverSslStream = new SslStream(new NetworkStream(server, ownsSocket: true));
+            (NetworkStream clientStream, NetworkStream serverStream) = TestHelper.GetConnectedTcpStreams();
+            using var clientSslStream = new SslStream(clientStream, leaveInnerStreamOpen: false, AllowAnyServerCertificate);
+            using var serverSslStream = new SslStream(serverStream);
             await DoHandshake(clientSslStream, serverSslStream);
 
             for (int iter = 0; iter < 2; iter++)
@@ -285,7 +279,9 @@ public async Task SslStream_StreamToStream_ZeroByteRead_SucceedsWhenDataAvailabl
                 int count = 0;
                 while (count < readBytes.Length)
                 {
-                    count += await clientSslStream.ReadAsync(readBytes.AsMemory(count));
+                    int n = await clientSslStream.ReadAsync(readBytes.AsMemory(count));
+                    Assert.InRange(n, 1, readBytes.Length - count);
+                    count += n;
                 }
                 Assert.Equal("hello", Encoding.UTF8.GetString(readBytes));
             }