8373808: Refactor java/net/httpclient qpack and hpack tests to use JUnit

Reviewed-by: djelinski

Author: AlekseiEfimov

test/jdk/java/net/httpclient/http2/HpackBinaryTestDriver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 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
@@ -29,6 +29,6 @@
  * @compile/module=java.net.http jdk/internal/net/http/hpack/SpecHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/TestHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/BuffersTestingKit.java
- * @run testng/othervm/timeout=240 java.net.http/jdk.internal.net.http.hpack.BinaryPrimitivesTest
+ * @run junit/othervm/timeout=240 java.net.http/jdk.internal.net.http.hpack.BinaryPrimitivesTest
  */
 public class HpackBinaryTestDriver { }

test/jdk/java/net/httpclient/http2/HpackCircularBufferDriver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -29,6 +29,6 @@
  * @compile/module=java.net.http jdk/internal/net/http/hpack/SpecHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/TestHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/BuffersTestingKit.java
- * @run testng/othervm java.net.http/jdk.internal.net.http.hpack.CircularBufferTest
+ * @run junit/othervm java.net.http/jdk.internal.net.http.hpack.CircularBufferTest
  */
 public class HpackCircularBufferDriver { }

test/jdk/java/net/httpclient/http2/HpackDecoderDriver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -29,6 +29,6 @@
  * @compile/module=java.net.http jdk/internal/net/http/hpack/SpecHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/TestHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/BuffersTestingKit.java
- * @run testng/othervm java.net.http/jdk.internal.net.http.hpack.DecoderTest
+ * @run junit/othervm java.net.http/jdk.internal.net.http.hpack.DecoderTest
  */
 public class HpackDecoderDriver { }

test/jdk/java/net/httpclient/http2/HpackEncoderDriver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -29,6 +29,6 @@
  * @compile/module=java.net.http jdk/internal/net/http/hpack/SpecHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/TestHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/BuffersTestingKit.java
- * @run testng/othervm java.net.http/jdk.internal.net.http.hpack.EncoderTest
+ * @run junit/othervm java.net.http/jdk.internal.net.http.hpack.EncoderTest
  */
 public class HpackEncoderDriver { }

test/jdk/java/net/httpclient/http2/HpackHeaderTableDriver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -30,6 +30,6 @@
  * @compile/module=java.net.http jdk/internal/net/http/hpack/SpecHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/TestHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/BuffersTestingKit.java
- * @run testng/othervm java.net.http/jdk.internal.net.http.hpack.HeaderTableTest
+ * @run junit/othervm java.net.http/jdk.internal.net.http.hpack.HeaderTableTest
  */
 public class HpackHeaderTableDriver { }

test/jdk/java/net/httpclient/http2/HpackHuffmanDriver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -29,6 +29,6 @@
  * @compile/module=java.net.http jdk/internal/net/http/hpack/SpecHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/TestHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/BuffersTestingKit.java
- * @run testng/othervm/timeout=300 java.net.http/jdk.internal.net.http.hpack.HuffmanTest
+ * @run junit/othervm/timeout=300 java.net.http/jdk.internal.net.http.hpack.HuffmanTest
  */
 public class HpackHuffmanDriver { }

test/jdk/java/net/httpclient/http2/HpackTestHelper.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -29,6 +29,6 @@
  * @compile/module=java.net.http jdk/internal/net/http/hpack/SpecHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/TestHelper.java
  * @compile/module=java.net.http jdk/internal/net/http/hpack/BuffersTestingKit.java
- * @run testng/othervm java.net.http/jdk.internal.net.http.hpack.TestHelper
+ * @run junit/othervm java.net.http/jdk.internal.net.http.hpack.TestHelper
  */
 public class HpackTestHelperDriver { }

test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/BinaryPrimitivesTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -22,7 +22,6 @@
  */
 package jdk.internal.net.http.hpack;
 
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -33,10 +32,11 @@
 import java.util.List;
 import java.util.Random;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
 import static jdk.internal.net.http.hpack.BuffersTestingKit.*;
 import static jdk.internal.net.http.hpack.TestHelper.newRandom;
+import org.junit.jupiter.api.Test;
 
 //
 // Some of the tests below overlap in what they test. This allows to diagnose
@@ -96,7 +96,7 @@ public void integerIdentity() throws IOException {
                 totalCases++;
                 maxFilling = Math.max(maxFilling, buf.remaining());
                 r.reset().configure(N).read(buf);
-                assertEquals(r.get(), expected);
+                assertEquals(expected, r.get());
                 buf.clear();
             }
         }
@@ -127,7 +127,7 @@ public void integerReadChunked() {
                                 throw new UncheckedIOException(e);
                             }
                         }
-                        assertEquals(r.get(), expected);
+                        assertEquals(expected, r.get());
                         r.reset();
                     });
             bb.clear();
@@ -167,7 +167,7 @@ public void integerWriteChunked() {
                             throw new UncheckedIOException(e);
                         }
                         // TODO: check payload here
-                        assertEquals(r.get(), expected);
+                        assertEquals(expected, r.get());
                         w.reset();
                         r.reset();
                         bb.clear();
@@ -209,7 +209,7 @@ public void stringIdentity() throws IOException {
                 bytes.flip();
                 reader.read(bytes, chars);
                 chars.flip();
-                assertEquals(chars.toString(), expected);
+                assertEquals(expected, chars.toString());
                 reader.reset();
                 writer.reset();
             }
@@ -257,7 +257,7 @@ public void stringWriteChunked() {
                     throw new UncheckedIOException(e);
                 }
                 chars.flip();
-                assertEquals(chars.toString(), expected);
+                assertEquals(expected, chars.toString());
                 reader.reset();
                 writer.reset();
                 chars.clear();
@@ -301,7 +301,7 @@ public void stringReadChunked() {
                     buf.position(p0);
                 }
                 chars.flip();
-                assertEquals(chars.toString(), expected);
+                assertEquals(expected, chars.toString());
                 reader.reset();
                 chars.clear();
             });
@@ -356,14 +356,14 @@ private static void verifyRead(byte[] data, int expected, int N) {
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
-        assertEquals(reader.get(), expected);
+        assertEquals(expected, reader.get());
     }
 
     private void verifyWrite(byte[] expected, int data, int N) {
         IntegerWriter w = new IntegerWriter();
         ByteBuffer buf = ByteBuffer.allocate(2 * expected.length);
         w.configure(data, N, 1).write(buf);
         buf.flip();
-        assertEquals(buf, ByteBuffer.wrap(expected));
+        assertEquals(ByteBuffer.wrap(expected), buf);
     }
 }

test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/CircularBufferTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 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
@@ -22,7 +22,6 @@
  */
 package jdk.internal.net.http.hpack;
 
-import org.testng.annotations.Test;
 import jdk.internal.net.http.hpack.SimpleHeaderTable.CircularBuffer;
 
 import java.util.Arrays;
@@ -31,10 +30,11 @@
 import java.util.concurrent.ArrayBlockingQueue;
 
 import static jdk.internal.net.http.common.Utils.pow2Size;
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static jdk.internal.net.http.hpack.TestHelper.assertVoidThrows;
 import static jdk.internal.net.http.hpack.TestHelper.newRandom;
-import static org.testng.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.Test;
 
 public final class CircularBufferTest {
 
@@ -143,7 +143,7 @@ private void queueOnce(int capacity, int numWraps) {
             for (int i = 0; i < gets; i++) {
                 Integer expected = referenceQueue.poll();
                 Integer actual = buffer.remove();
-                assertEquals(actual, expected);
+                assertEquals(expected, actual);
             }
         }
     }

test/jdk/java/net/httpclient/http2/java.net.http/jdk/internal/net/http/hpack/DecoderTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 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
@@ -22,7 +22,6 @@
  */
 package jdk.internal.net.http.hpack;
 
-import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -33,9 +32,9 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static jdk.internal.net.http.hpack.TestHelper.*;
+import org.junit.jupiter.api.Test;
 
 //
 // Tests whose names start with "testX" are the ones captured from real HPACK
@@ -402,9 +401,9 @@ public void testX1() {
     @Test
     public void sizeUpdate() throws IOException {
         Decoder d = new Decoder(4096);
-        assertEquals(d.getTable().maxSize(), 4096);
+        assertEquals(4096, d.getTable().maxSize());
         d.decode(ByteBuffer.wrap(new byte[]{0b00111110}), true, nopCallback()); // newSize = 30
-        assertEquals(d.getTable().maxSize(), 30);
+        assertEquals(30, d.getTable().maxSize());
     }
 
     @Test
@@ -650,8 +649,8 @@ private static void testAllSplits(Supplier<Decoder> supplier,
                     throw new UncheckedIOException(e);
                 }
             } while (i.hasNext());
-            assertEquals(d.getTable().getStateString(), expectedHeaderTable);
-            assertEquals(actual.stream().collect(Collectors.joining("\n")), expectedHeaderList);
+            assertEquals(expectedHeaderTable, d.getTable().getStateString());
+            assertEquals(expectedHeaderList, actual.stream().collect(Collectors.joining("\n")));
         });
 
         // Now introduce last ByteBuffer which is empty and EOF (mimics idiom
@@ -690,8 +689,8 @@ private static void testAllSplits(Supplier<Decoder> supplier,
                 throw new UncheckedIOException(e);
             }
 
-            assertEquals(d.getTable().getStateString(), expectedHeaderTable);
-            assertEquals(actual.stream().collect(Collectors.joining("\n")), expectedHeaderList);
+            assertEquals(expectedHeaderTable, d.getTable().getStateString());
+            assertEquals(expectedHeaderList, actual.stream().collect(Collectors.joining("\n")));
         });
     }
 
@@ -717,8 +716,8 @@ private static void test(Decoder d, String hexdump,
             throw new UncheckedIOException(e);
         }
 
-        assertEquals(d.getTable().getStateString(), expectedHeaderTable);
-        assertEquals(actual.stream().collect(Collectors.joining("\n")), expectedHeaderList);
+        assertEquals(expectedHeaderTable, d.getTable().getStateString());
+        assertEquals(expectedHeaderList, actual.stream().collect(Collectors.joining("\n")));
     }
 
     private static DecodingCallback nopCallback() {