Convert ByteBufAdaptorTests to JUnit 5, and fix the MemSeg test skipping for Java 11

buffer-tests/src/test/java/io/netty/buffer/api/tests/adaptor/ByteBufAdaptorTest.java

@@ -19,78 +19,80 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.api.BufferAllocator;
 import io.netty.buffer.api.MemoryManagers;
 import io.netty.buffer.api.adaptor.ByteBufAllocatorAdaptor;
-import org.junit.AfterClass;
+import org.junit.jupiter.api.AfterAll;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
 
 import java.util.Optional;
 
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 public abstract class ByteBufAdaptorTest extends AbstractByteBufTest {
     static ByteBufAllocatorAdaptor alloc;
 
     static void setUpAllocator(String name) {
         Optional<MemoryManagers> managers = MemoryManagers.lookupImplementation(name);
-        assumeTrue(managers.isPresent());
+        assumeTrue(managers.isPresent(), () -> "Memory implementation '" + name + "' not found.");
         BufferAllocator onheap = MemoryManagers.using(managers.get(), BufferAllocator::pooledHeap);
         BufferAllocator offheap = MemoryManagers.using(managers.get(), BufferAllocator::pooledHeap);
         alloc = new ByteBufAllocatorAdaptor(onheap, offheap);
     }
 
-    @AfterClass
+    @AfterAll
     public static void tearDownAllocator() throws Exception {
+        if (alloc != null) {
             alloc.close();
         }
+    }
 
     @Override
     protected ByteBuf newBuffer(int capacity, int maxCapacity) {
         return alloc.buffer(capacity, capacity);
     }
 
-    @Ignore("This test codifies that asking to reading 0 bytes from an empty but unclosed stream should return -1, " +
+    @Disabled("This test codifies that asking to reading 0 bytes from an empty but unclosed stream should return -1, " +
             "which is just weird.")
     @Override
     public void testStreamTransfer1() throws Exception {
     }
 
-    @Ignore("Relies on capacity and max capacity being separate things.")
+    @Disabled("Relies on capacity and max capacity being separate things.")
     @Override
     public void testCapacityIncrease() {
     }
 
-    @Ignore("Decreasing capacity not supported in new API.")
+    @Disabled("Decreasing capacity not supported in new API.")
     @Override
     public void testCapacityDecrease() {
     }
 
-    @Ignore("Decreasing capacity not supported in new API.")
+    @Disabled("Decreasing capacity not supported in new API.")
     @Override
     public void testCapacityNegative() {
         throw new IllegalArgumentException(); // Can't ignore tests annotated with throws expectation?
     }
 
-    @Ignore("Decreasing capacity not supported in new API.")
+    @Disabled("Decreasing capacity not supported in new API.")
     @Override
     public void testCapacityEnforceMaxCapacity() {
         throw new IllegalArgumentException(); // Can't ignore tests annotated with throws expectation?
     }
 
-    @Ignore("Decreasing capacity not supported in new API.")
+    @Disabled("Decreasing capacity not supported in new API.")
     @Override
     public void testMaxFastWritableBytes() {
     }
 
-    @Ignore("Impossible to expose entire memory as a ByteBuffer using new API.")
+    @Disabled("Impossible to expose entire memory as a ByteBuffer using new API.")
     @Override
     public void testNioBufferExposeOnlyRegion() {
     }
 
-    @Ignore("Impossible to expose entire memory as a ByteBuffer using new API.")
+    @Disabled("Impossible to expose entire memory as a ByteBuffer using new API.")
     @Override
     public void testToByteBuffer2() {
     }
 
-    @Ignore("No longer allowed to allocate 0 sized buffers, except for composite buffers with no components.")
+    @Disabled("No longer allowed to allocate 0 sized buffers, except for composite buffers with no components.")
     @Override
     public void testLittleEndianWithExpand() {
     }

buffer-tests/src/test/java/io/netty/buffer/api/tests/adaptor/MemSegByteBufAdaptorTest.java

@@ -15,10 +15,10 @@
  */
 package io.netty.buffer.api.tests.adaptor;
 
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeAll;
 
 public class MemSegByteBufAdaptorTest extends ByteBufAdaptorTest {
-    @BeforeClass
+    @BeforeAll
     public static void setUpAllocator() {
         setUpAllocator("MemorySegment");
     }

buffer-tests/src/test/java/io/netty/buffer/api/tests/adaptor/NioByteBufAdaptorTest.java

@@ -15,10 +15,10 @@
  */
 package io.netty.buffer.api.tests.adaptor;
 
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeAll;
 
 public class NioByteBufAdaptorTest extends ByteBufAdaptorTest {
-    @BeforeClass
+    @BeforeAll
     public static void setUpAllocator() {
         setUpAllocator("ByteBuffer");
     }

buffer-tests/src/test/java/io/netty/buffer/api/tests/adaptor/UnsafeByteBufAdaptorTest.java

@@ -15,10 +15,10 @@
  */
 package io.netty.buffer.api.tests.adaptor;
 
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeAll;
 
 public class UnsafeByteBufAdaptorTest extends ByteBufAdaptorTest {
-    @BeforeClass
+    @BeforeAll
     public static void setUpAllocator() {
         setUpAllocator("Unsafe");
     }