Fix merge formatting issues and cross plat tests

test/Microsoft.AspNetCore.Server.KestrelTests/HttpsConnectionFilterTests.cs

@@ -28,8 +28,6 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
                     (sender, cert, chain, sslPolicyErrors) => true;
         private static X509Certificate2 _x509Certificate2 = new X509Certificate2(@"TestResources/testCert.pfx", "testPassword");
 
-        private HttpMessageHandler _handler;
-
 #if NET451
         static HttpsConnectionFilterTests()
         {
@@ -43,12 +41,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
         public HttpsConnectionFilterTests()
         {
 #if NET451
-            _handler = new HttpClientHandler();
             ServicePointManager.ServerCertificateValidationCallback += _alwaysValidCallback;
-#else
-            var handler = new WinHttpHandler();
-            handler.ServerCertificateValidationCallback += (sender, cert, chain, sslPolicyErrors) => true;
-            _handler = handler;
 #endif
         }
 
@@ -74,7 +67,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
 
             using (var server = new TestServer(App, serviceContext, _serverAddress))
             {
-                using (var client = new HttpClient(_handler))
+                using (var client = new HttpClient(GetHandler()))
                 {
                     var result = await client.PostAsync($"https://localhost:{server.Port}/", new FormUrlEncodedContent(new[] {
                             new KeyValuePair<string, string>("content", "Hello World?")
@@ -101,7 +94,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
 
             using (var server = new TestServer(App, serviceContext, _serverAddress))
             {
-                using (var client = new HttpClient(_handler))
+                using (var client = new HttpClient(GetHandler()))
                 {
                     await Assert.ThrowsAnyAsync<Exception>(
                         () => client.GetAsync($"https://localhost:{server.Port}/"));
@@ -131,7 +124,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
 
             using (var server = new TestServer(app, serviceContext, _serverAddress))
             {
-                using (var client = new HttpClient(_handler))
+                using (var client = new HttpClient(GetHandler()))
                 {
                     var result = await client.GetAsync($"https://localhost:{server.Port}/");
 
@@ -230,7 +223,7 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
 
             using (var server = new TestServer(app, serviceContext, _serverAddress))
             {
-                using (var client = new HttpClient(_handler))
+                using (var client = new HttpClient(GetHandler()))
                 {
                     var result = await client.GetAsync($"https://localhost:{server.Port}/");
 
@@ -265,8 +258,8 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
                 using (var client = new TcpClient())
                 {
                     var stream = await OpenSslStream(client, server);
-                    var ex =  await Assert.ThrowsAsync(typeof(IOException), async () =>
+                    var ex = await Assert.ThrowsAsync(typeof(IOException),
-                            await stream.AuthenticateAsClientAsync("localhost", new X509CertificateCollection(), SslProtocols.Tls, false));
+                        async () => await stream.AuthenticateAsClientAsync("localhost", new X509CertificateCollection(), SslProtocols.Tls, false));
                 }
             }
         }
@@ -446,5 +439,16 @@ namespace Microsoft.AspNetCore.Server.KestrelTests
                 Assert.Null(line);
             }
         }
+
+        private HttpMessageHandler GetHandler()
+        {
+#if NET451
+            return new HttpClientHandler();
+#else
+            var handler = new WinHttpHandler();
+            handler.ServerCertificateValidationCallback += (sender, cert, chain, sslPolicyErrors) => true;
+            return handler;
+#endif
+        }
     }
 }