Migrate the rest of codec-http2 to junit5 (#11424)

Motivation:

8c73dbe9bd did migrate the codec-http2 code to use junit5 but missed two classes.

Modifications:

Adjust the rest of codec-http2 tests to use junit5

Result:

Part of https://github.com/netty/netty/issues/10757

codec-http2/src/test/java/io/netty/handler/codec/http2/HpackHuffmanTest.java

@@ -34,12 +34,15 @@ package io.netty.handler.codec.http2;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.util.AsciiString;
-import org.junit.Assert;
+import org.junit.jupiter.api.Test;
-import org.junit.Test;
+import org.junit.jupiter.api.function.Executable;
 
-import java.util.Arrays;
 import java.util.Random;
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class HpackHuffmanTest {
 
     @Test
@@ -55,62 +58,108 @@ public class HpackHuffmanTest {
         roundTrip(buf);
     }
 
-    @Test(expected = Http2Exception.class)
+    @Test
     public void testDecodeEOS() throws Http2Exception {
-        byte[] buf = new byte[4];
+        final byte[] buf = new byte[4];
         for (int i = 0; i < 4; i++) {
             buf[i] = (byte) 0xFF;
         }
-        decode(buf);
+        assertThrows(Http2Exception.class, new Executable() {
+            @Override
+            public void execute() throws Throwable {
+                decode(buf);
+            }
+        });
     }
 
-    @Test(expected = Http2Exception.class)
+    @Test
     public void testDecodeIllegalPadding() throws Http2Exception {
-        byte[] buf = new byte[1];
+        final byte[] buf = new byte[1];
         buf[0] = 0x00; // '0', invalid padding
-        decode(buf);
+        assertThrows(Http2Exception.class, new Executable() {
+            @Override
+            public void execute() throws Throwable {
+                decode(buf);
+            }
+        });
     }
 
-    @Test(expected = Http2Exception.class)
+    @Test
     public void testDecodeExtraPadding() throws Http2Exception {
-        byte[] buf = makeBuf(0x0f, 0xFF); // '1', 'EOS'
+        final byte[] buf = makeBuf(0x0f, 0xFF); // '1', 'EOS'
-        decode(buf);
+        assertThrows(Http2Exception.class, new Executable() {
+            @Override
+            public void execute() throws Throwable {
+                decode(buf);
+            }
+        });
     }
 
-    @Test(expected = Http2Exception.class)
+    @Test
     public void testDecodeExtraPadding1byte() throws Http2Exception {
-        byte[] buf = makeBuf(0xFF);
+        final byte[] buf = makeBuf(0xFF);
-        decode(buf);
+        assertThrows(Http2Exception.class, new Executable() {
+            @Override
+            public void execute() throws Throwable {
+                decode(buf);
+            }
+        });
     }
 
-    @Test(expected = Http2Exception.class)
+    @Test
     public void testDecodeExtraPadding2byte() throws Http2Exception {
-        byte[] buf = makeBuf(0x1F, 0xFF); // 'a'
+        final byte[] buf = makeBuf(0x1F, 0xFF); // 'a'
-        decode(buf);
+        assertThrows(Http2Exception.class, new Executable() {
+            @Override
+            public void execute() throws Throwable {
+                decode(buf);
+            }
+        });
     }
 
-    @Test(expected = Http2Exception.class)
+    @Test
     public void testDecodeExtraPadding3byte() throws Http2Exception {
-        byte[] buf = makeBuf(0x1F, 0xFF, 0xFF); // 'a'
+        final byte[] buf = makeBuf(0x1F, 0xFF, 0xFF); // 'a'
-        decode(buf);
+        assertThrows(Http2Exception.class, new Executable() {
+            @Override
+            public void execute() throws Throwable {
+                decode(buf);
+            }
+        });
     }
 
-    @Test(expected = Http2Exception.class)
+    @Test
     public void testDecodeExtraPadding4byte() throws Http2Exception {
-        byte[] buf = makeBuf(0x1F, 0xFF, 0xFF, 0xFF); // 'a'
+        final byte[] buf = makeBuf(0x1F, 0xFF, 0xFF, 0xFF); // 'a'
-        decode(buf);
+        assertThrows(Http2Exception.class, new Executable() {
+            @Override
+            public void execute() throws Throwable {
+                decode(buf);
+            }
+        });
     }
 
-    @Test(expected = Http2Exception.class)
+    @Test
     public void testDecodeExtraPadding29bit() throws Http2Exception {
-        byte[] buf = makeBuf(0xFF, 0x9F, 0xFF, 0xFF, 0xFF);  // '|'
+        final byte[] buf = makeBuf(0xFF, 0x9F, 0xFF, 0xFF, 0xFF);  // '|'
-        decode(buf);
+        assertThrows(Http2Exception.class, new Executable() {
+            @Override
+            public void execute() throws Throwable {
+                decode(buf);
+            }
+        });
     }
 
-    @Test(expected = Http2Exception.class)
+    @Test
     public void testDecodePartialSymbol() throws Http2Exception {
-        byte[] buf = makeBuf(0x52, 0xBC, 0x30, 0xFF, 0xFF, 0xFF, 0xFF); // " pFA\x00", 31 bits of padding, a.k.a. EOS
+        final byte[] buf =
-        decode(buf);
+                makeBuf(0x52, 0xBC, 0x30, 0xFF, 0xFF, 0xFF, 0xFF); // " pFA\x00", 31 bits of padding, a.k.a. EOS
+        assertThrows(Http2Exception.class, new Executable() {
+            @Override
+            public void execute() throws Throwable {
+                decode(buf);
+            }
+        });
     }
 
     private static byte[] makeBuf(int ... bytes) {
@@ -144,7 +193,7 @@ public class HpackHuffmanTest {
 
             byte[] actualBytes = decode(bytes);
 
-            Assert.assertTrue(Arrays.equals(buf, actualBytes));
+            assertArrayEquals(buf, actualBytes);
         } finally {
             buffer.release();
         }
@@ -154,7 +203,7 @@ public class HpackHuffmanTest {
         ByteBuf buffer = Unpooled.wrappedBuffer(bytes);
         try {
             AsciiString decoded = new HpackHuffmanDecoder().decode(buffer, buffer.readableBytes());
-            Assert.assertFalse(buffer.isReadable());
+            assertFalse(buffer.isReadable());
             return decoded.toByteArray();
         } finally {
             buffer.release();

codec-http2/src/test/java/io/netty/handler/codec/http2/HttpToHttp2ConnectionHandlerTest.java

@@ -42,9 +42,10 @@ import io.netty.handler.codec.http.LastHttpContent;
 import io.netty.handler.codec.http2.Http2TestUtil.FrameCountDown;
 import io.netty.util.AsciiString;
 import io.netty.util.concurrent.Future;
-import org.junit.After;
+
-import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;
@@ -65,9 +66,9 @@ import static io.netty.util.CharsetUtil.UTF_8;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.Assert.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyBoolean;
 import static org.mockito.Mockito.anyInt;
@@ -99,12 +100,12 @@ public class HttpToHttp2ConnectionHandlerTest {
     private CountDownLatch trailersLatch;
     private FrameCountDown serverFrameCountDown;
 
-    @Before
+    @BeforeEach
     public void setup() throws Exception {
         MockitoAnnotations.initMocks(this);
     }
 
-    @After
+    @AfterEach
     public void teardown() throws Exception {
         if (clientChannel != null) {
             clientChannel.close().syncUninterruptibly();