Close client after each test to avoid intermittent failures on MacOS. (…

…#5155) Signed-off-by: Santiago Pericasgeertsen <santiago.pericasgeertsen@oracle.com> Signed-off-by: Santiago Pericasgeertsen <santiago.pericasgeertsen@oracle.com>
helidon-io · Oct 11, 2022 · f030bf1 · f030bf1
1 parent 7c09327
commit f030bf1
Showing 1 changed file with 26 additions and 17 deletions.
diff --git a/reactive/webserver/webserver/src/test/java/io/helidon/reactive/webserver/XssServerTest.java b/reactive/webserver/webserver/src/test/java/io/helidon/reactive/webserver/XssServerTest.java
@@ -22,6 +22,7 @@
 import io.helidon.common.http.HtmlEncoder;
 import io.helidon.common.http.Http;
 
+import io.helidon.common.testing.http.junit5.SocketHttpClient;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
@@ -42,34 +43,42 @@ static void startServer() throws Exception {
 
     @Test
     void testScriptInjection() throws Exception {
-        String s = socketClient().sendAndReceive("/bar%3cscript%3eevil%3c%2fscript%3e",
-                                                   Http.Method.GET, null);
-        assertThat(s, not(containsString("<script>")));
-        assertThat(s, not(containsString("</script>")));
+        try (SocketHttpClient client = socketClient()) {
+            String s = client.sendAndReceive("/bar%3cscript%3eevil%3c%2fscript%3e",
+                    Http.Method.GET, null);
+            assertThat(s, not(containsString("<script>")));
+            assertThat(s, not(containsString("</script>")));
+        }
     }
 
     @Test
     void testScriptInjectionIllegalUrlChar() throws Exception {
-        String s = socketClient().sendAndReceive("/bar<script/>evil</script>",
-                Http.Method.GET, null);
-        assertThat(s, not(containsString("<script>")));
-        assertThat(s, not(containsString("</script>")));
+        try (SocketHttpClient client = socketClient()) {
+            String s = client.sendAndReceive("/bar<script/>evil</script>",
+                    Http.Method.GET, null);
+            assertThat(s, not(containsString("<script>")));
+            assertThat(s, not(containsString("</script>")));
+        }
     }
 
     @Test
     void testScriptInjectionContentType() throws Exception {
-        List<String> requestHeaders = Arrays.asList("Content-Type: <script>evil</script>");
-        String s = socketClient().sendAndReceive("/foo",
-                Http.Method.GET, null, requestHeaders);
-        assertThat(s, not(containsString("<script>")));
-        assertThat(s, not(containsString("</script>")));
+        try (SocketHttpClient client = socketClient()) {
+            List<String> requestHeaders = Arrays.asList("Content-Type: <script>evil</script>");
+            String s = client.sendAndReceive("/foo",
+                    Http.Method.GET, null, requestHeaders);
+            assertThat(s, not(containsString("<script>")));
+            assertThat(s, not(containsString("</script>")));
+        }
     }
 
     @Test
     void testResponseEncoding() throws Exception {
-        String s = socketClient().sendAndReceive("/foo",
-                Http.Method.GET, null);
-        assertThat(s, not(containsString("<script>")));
-        assertThat(s, not(containsString("</script>")));
+        try (SocketHttpClient client = socketClient()) {
+            String s = client.sendAndReceive("/foo",
+                    Http.Method.GET, null);
+            assertThat(s, not(containsString("<script>")));
+            assertThat(s, not(containsString("</script>")));
+        }
     }
 }