From caa12b8f5c59e8b1f1b8c3fac6bf7db37bfdbf4b Mon Sep 17 00:00:00 2001
From: BrennanConroy <brecon@microsoft.com>
Date: Fri, 16 Mar 2018 10:51:53 -0700
Subject: [PATCH] cleanup

---
 .../ConnectionManagerTests.cs                 | 42 ++++---------------
 1 file changed, 9 insertions(+), 33 deletions(-)

diff --git a/test/Microsoft.AspNetCore.Sockets.Tests/ConnectionManagerTests.cs b/test/Microsoft.AspNetCore.Sockets.Tests/ConnectionManagerTests.cs
index fb7ef34077..007d7c32f8 100644
--- a/test/Microsoft.AspNetCore.Sockets.Tests/ConnectionManagerTests.cs
+++ b/test/Microsoft.AspNetCore.Sockets.Tests/ConnectionManagerTests.cs
@@ -43,10 +43,7 @@ public void NewConnectionsCanBeRetrieved()
         public void AddNewConnection()
         {
             var connectionManager = CreateConnectionManager();
-            var connection = connectionManager.CreateConnection();
-            var pair = DuplexPipe.CreateConnectionPair(PipeOptions.Default, PipeOptions.Default);
-            connection.Application = pair.Transport;
-            connection.Transport = pair.Application;
+            var connection = connectionManager.CreateConnection(PipeOptions.Default, PipeOptions.Default);
 
             var transport = connection.Transport;
 
@@ -62,10 +59,7 @@ public void AddNewConnection()
         public void RemoveConnection()
         {
             var connectionManager = CreateConnectionManager();
-            var connection = connectionManager.CreateConnection();
-            var pair = DuplexPipe.CreateConnectionPair(PipeOptions.Default, PipeOptions.Default);
-            connection.Application = pair.Transport;
-            connection.Transport = pair.Application;
+            var connection = connectionManager.CreateConnection(PipeOptions.Default, PipeOptions.Default);
 
             var transport = connection.Transport;
 
@@ -84,10 +78,7 @@ public void RemoveConnection()
         public async Task CloseConnectionsEndsAllPendingConnections()
         {
             var connectionManager = CreateConnectionManager();
-            var connection = connectionManager.CreateConnection();
-            var pair = DuplexPipe.CreateConnectionPair(PipeOptions.Default, PipeOptions.Default);
-            connection.Application = pair.Transport;
-            connection.Transport = pair.Application;
+            var connection = connectionManager.CreateConnection(PipeOptions.Default, PipeOptions.Default);
 
             connection.ApplicationTask = Task.Run(async () =>
             {
@@ -99,7 +90,7 @@ public async Task CloseConnectionsEndsAllPendingConnections()
                 }
                 finally
                 {
-                    connection.Transport.Input.AdvanceTo(result.Buffer.End);    
+                    connection.Transport.Input.AdvanceTo(result.Buffer.End);
                 }
             });
 
@@ -125,10 +116,7 @@ public async Task CloseConnectionsEndsAllPendingConnections()
         public async Task DisposingConnectionMultipleTimesWaitsOnConnectionClose()
         {
             var connectionManager = CreateConnectionManager();
-            var connection = connectionManager.CreateConnection();
-            var pair = DuplexPipe.CreateConnectionPair(PipeOptions.Default, PipeOptions.Default);
-            connection.Application = pair.Transport;
-            connection.Transport = pair.Application;
+            var connection = connectionManager.CreateConnection(PipeOptions.Default, PipeOptions.Default);
             var tcs = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             connection.ApplicationTask = tcs.Task;
@@ -148,10 +136,7 @@ public async Task DisposingConnectionMultipleTimesWaitsOnConnectionClose()
         public async Task DisposingConnectionMultipleGetsExceptionFromTransportOrApp()
         {
             var connectionManager = CreateConnectionManager();
-            var connection = connectionManager.CreateConnection();
-            var pair = DuplexPipe.CreateConnectionPair(PipeOptions.Default, PipeOptions.Default);
-            connection.Application = pair.Transport;
-            connection.Transport = pair.Application;
+            var connection = connectionManager.CreateConnection(PipeOptions.Default, PipeOptions.Default);
             var tcs = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             connection.ApplicationTask = tcs.Task;
@@ -175,10 +160,7 @@ public async Task DisposingConnectionMultipleGetsExceptionFromTransportOrApp()
         public async Task DisposingConnectionMultipleGetsCancellation()
         {
             var connectionManager = CreateConnectionManager();
-            var connection = connectionManager.CreateConnection();
-            var pair = DuplexPipe.CreateConnectionPair(PipeOptions.Default, PipeOptions.Default);
-            connection.Application = pair.Transport;
-            connection.Transport = pair.Application;
+            var connection = connectionManager.CreateConnection(PipeOptions.Default, PipeOptions.Default);
             var tcs = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
 
             connection.ApplicationTask = tcs.Task;
@@ -199,10 +181,7 @@ public async Task DisposingConnectionMultipleGetsCancellation()
         public async Task DisposeInactiveConnection()
         {
             var connectionManager = CreateConnectionManager();
-            var connection = connectionManager.CreateConnection();
-            var pair = DuplexPipe.CreateConnectionPair(PipeOptions.Default, PipeOptions.Default);
-            connection.Application = pair.Transport;
-            connection.Transport = pair.Application;
+            var connection = connectionManager.CreateConnection(PipeOptions.Default, PipeOptions.Default);
 
             Assert.NotNull(connection.ConnectionId);
 
@@ -230,10 +209,7 @@ public async Task ApplicationLifetimeIsHookedUp()
 
             appLifetime.Start();
 
-            var connection = connectionManager.CreateConnection();
-            var pair = DuplexPipe.CreateConnectionPair(PipeOptions.Default, PipeOptions.Default);
-            connection.Application = pair.Transport;
-            connection.Transport = pair.Application;
+            var connection = connectionManager.CreateConnection(PipeOptions.Default, PipeOptions.Default);
 
             connection.Application.Output.OnReaderCompleted((error, state) =>
             {