Update tests for https

Author: mmanes

src/test/java/io/fusionauth/http/BaseTest.java

@@ -15,7 +15,6 @@
  */
 package io.fusionauth.http;
 
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -144,6 +143,18 @@ public HttpClient makeClient(String scheme, CookieHandler cookieHandler) throws
     return builder.connectTimeout(ClientTimeout).build();
   }
 
+  public Socket makeClientSocket(String scheme) throws GeneralSecurityException, IOException {
+    Socket socket;
+    if (scheme.equals("https")) {
+      var ctx = SecurityTools.clientContext(rootCertificate);
+      socket = ctx.getSocketFactory().createSocket("127.0.0.1", 4242);
+    } else {
+      socket = new Socket("127.0.0.1", 4242);
+    }
+
+    return socket;
+  }
+
   public HTTPServer makeServer(String scheme, HTTPHandler handler, Instrumenter instrumenter) {
     return makeServer(scheme, handler, instrumenter, null);
   }

src/test/java/io/fusionauth/http/CoreTest.java

@@ -790,7 +790,7 @@ public void unicode(String scheme) throws Exception {
   @Test(dataProvider = "schemes")
   public void utf8HeaderValues(String scheme) throws Exception {
 
-    String city = "São Paulo";
+    var city = "São Paulo";
 
     HTTPHandler handler = (req, res) -> {
       res.setHeader(Headers.ContentType, "text/plain");
@@ -807,28 +807,31 @@ public void utf8HeaderValues(String scheme) throws Exception {
       }
     };
 
-    // Java HTTPClient only supports ASCII header values, so send it directly
-    try (HTTPServer ignore = makeServer(scheme, handler).start(); Socket sock = new Socket("127.0.0.1", 4242)) {
+    // Java HttpClient only supports ASCII header values, so send request directly
+    try (HTTPServer ignore = makeServer(scheme, handler).start();
+         Socket sock = makeClientSocket(scheme)) {
+
       var os = sock.getOutputStream();
       var is = sock.getInputStream();
-      os.write("""
-          GET /api/status HTTP/1.1\r
-          Host: localhost:42\r
-          X-Request-Header: São Paulo\r
-          \r
-          """.getBytes(StandardCharsets.UTF_8));
+      os.write(String.format("""
+                         GET /api/status HTTP/1.1\r
+                         Host: localhost:42\r
+                         X-Request-Header: %s\r
+                         \r
+                         """, city)
+                     .getBytes(StandardCharsets.UTF_8));
       os.flush();
 
       var resp = new String(is.readAllBytes(), StandardCharsets.UTF_8);
 
-      assertEquals(resp, """
+      assertEquals(resp, String.format("""
           HTTP/1.1 200 \r
           content-length: 16\r
           content-type: text/plain\r
           connection: keep-alive\r
-          x-response-header: São Paulo\r
+          x-response-header: %s\r
           \r
-          {"version":"42"}""");
+          {"version":"42"}""", city));
     }
   }