8373893: Refactor networking http server tests to use JUnit

Reviewed-by: djelinski

Author: Michael-Mc-Mahon

test/jdk/com/sun/net/httpserver/BasicAuthenticatorRealm.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
  *           with HttpURLConnection and HttpClient
  * @modules jdk.httpserver
  * @library /test/lib
- * @run testng/othervm BasicAuthenticatorRealm
+ * @run junit/othervm BasicAuthenticatorRealm
  */
 
 import com.sun.net.httpserver.BasicAuthenticator;
@@ -47,12 +47,20 @@
 import java.net.http.HttpResponse.BodyHandlers;
 
 import jdk.test.lib.net.URIBuilder;
-import org.testng.annotations.Test;
 
 import static java.net.http.HttpClient.Builder.NO_PROXY;
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.testng.Assert.assertEquals;
 
+import org.junit.jupiter.api.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.junit.jupiter.api.Test;
+
+/**
+ * The second test @Order(2) must run after the first test because it
+ * sets a VM wide authenticator and the first test depends on no authenticator
+ * being set.
+ */
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
 public class BasicAuthenticatorRealm {
 
     static final String REALM = "U\u00ffU@realm";  // non-ASCII char
@@ -61,7 +69,8 @@ public class BasicAuthenticatorRealm {
     static final InetAddress LOOPBACK_ADDR = InetAddress.getLoopbackAddress();
 
     @Test
-    public static void testURLConnection() throws Exception {
+    @Order(1)
+    public void testURLConnection() throws Exception {
         var server = HttpServer.create(new InetSocketAddress(LOOPBACK_ADDR, 0), 0);
         var handler = HttpHandlers.of(200, Headers.of(), "");
         var context = server.createContext("/test", handler);
@@ -73,15 +82,16 @@ public static void testURLConnection() throws Exception {
             server.start();
             var url = uri(server).toURL();
             var connection = (HttpURLConnection)url.openConnection(Proxy.NO_PROXY);
-            assertEquals(connection.getResponseCode(), 401);
-            assertEquals(connection.getHeaderField("WWW-Authenticate"), EXPECTED_AUTH_HEADER_VALUE);
+            assertEquals(401, connection.getResponseCode());
+            assertEquals(EXPECTED_AUTH_HEADER_VALUE, connection.getHeaderField("WWW-Authenticate"));
         } finally {
             server.stop(0);
         }
     }
 
     @Test
-    public static void testURLConnectionAuthenticated() throws Exception {
+    @Order(2)
+    public void testURLConnectionAuthenticated() throws Exception {
         var server = HttpServer.create(new InetSocketAddress(LOOPBACK_ADDR, 0), 0);
         var handler = HttpHandlers.of(200, Headers.of(), "foo");
         var context = server.createContext("/test", handler);
@@ -94,15 +104,16 @@ public static void testURLConnectionAuthenticated() throws Exception {
             server.start();
             var url = uri(server).toURL();
             var connection = (HttpURLConnection)url.openConnection(Proxy.NO_PROXY);
-            assertEquals(connection.getResponseCode(), 200);
-            assertEquals(connection.getInputStream().readAllBytes(), "foo".getBytes(UTF_8));
+            assertEquals(200, connection.getResponseCode());
+            Assertions.assertArrayEquals("foo".getBytes(UTF_8), connection.getInputStream().readAllBytes());
         } finally {
             server.stop(0);
         }
     }
 
     @Test
-    public static void testHttpClient() throws Exception {
+    @Order(3)
+    public void testHttpClient() throws Exception {
         var server = HttpServer.create(new InetSocketAddress(LOOPBACK_ADDR, 0), 0);
         var client = HttpClient.newBuilder().proxy(NO_PROXY).build();
         var request = HttpRequest.newBuilder(uri(server)).build();
@@ -115,15 +126,16 @@ public static void testHttpClient() throws Exception {
         try {
             server.start();
             var response = client.send(request, BodyHandlers.ofString(UTF_8));
-            assertEquals(response.statusCode(), 401);
-            assertEquals(response.headers().firstValue("WWW-Authenticate").orElseThrow(), EXPECTED_AUTH_HEADER_VALUE);
+            assertEquals(401, response.statusCode());
+            assertEquals(EXPECTED_AUTH_HEADER_VALUE, response.headers().firstValue("WWW-Authenticate").orElseThrow());
         } finally {
             server.stop(0);
         }
     }
 
     @Test
-    public static void testHttpClientAuthenticated() throws Exception {
+    @Order(4)
+    public void testHttpClientAuthenticated() throws Exception {
         var server = HttpServer.create(new InetSocketAddress(LOOPBACK_ADDR, 0), 0);
         var request = HttpRequest.newBuilder(uri(server)).build();
         var handler = HttpHandlers.of(200, Headers.of(), "foo");
@@ -139,8 +151,8 @@ public static void testHttpClientAuthenticated() throws Exception {
         try {
             server.start();
             var response = client.send(request, BodyHandlers.ofString(UTF_8));
-            assertEquals(response.statusCode(), 200);
-            assertEquals(response.body(), "foo");
+            assertEquals(200, response.statusCode());
+            assertEquals("foo", response.body());
         } finally {
             server.stop(0);
         }

test/jdk/com/sun/net/httpserver/CreateHttpServerTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,17 +25,17 @@
  * @test
  * @bug 8251496
  * @summary summary
- * @run testng/othervm CreateHttpServerTest
+ * @run junit/othervm CreateHttpServerTest
  */
 
 import com.sun.net.httpserver.HttpServer;
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
 
 public class CreateHttpServerTest {
     @Test

test/jdk/com/sun/net/httpserver/DateFormatterTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,12 +39,13 @@
 import java.util.regex.Pattern;
 
 import jdk.test.lib.net.URIBuilder;
-import org.testng.annotations.AfterTest;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Test;
 import static java.net.http.HttpResponse.BodyHandlers.ofString;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+
+import org.junit.jupiter.api.AfterAll;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /**
  * @test
@@ -53,19 +54,19 @@
  * @modules java.net.http
  * @library /test/lib
  * @build DateFormatterTest
- * @run testng/othervm DateFormatterTest
+ * @run junit/othervm DateFormatterTest
  */
 public class DateFormatterTest {
 
-    private HttpServer server;
+    private static HttpServer server;
 
     static URI httpURI;
     static final Integer ITERATIONS = 10;
     static String format;
     static Pattern pattern;
 
-    @BeforeTest
-    public void setUp() throws IOException, URISyntaxException {
+    @BeforeAll
+    public static void setUp() throws IOException, URISyntaxException {
         String days = "(Mon|Tue|Wed|Thu|Fri|Sat|Sun)(,)";
         String dayNo = "(\\s\\d\\d\\s)";
         String month = "(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)";
@@ -85,8 +86,8 @@ public void setUp() throws IOException, URISyntaxException {
         server.start();
     }
 
-    @AfterTest
-    public void cleanUp() {
+    @AfterAll
+    public static void cleanUp() {
         server.stop(0);
     }