Convert Classfile API test to use JUnit Jupiter (openjdk#44)

Co-authored-by: Christian Stein <sormuras@gmail.com>

Author: asotona

test/jdk/jdk/classfile/AccessFlagsTest.java

@@ -26,28 +26,26 @@
 /*
  * @test
  * @summary Testing Classfile AccessFlags.
- * @run testng AccessFlagsTest
+ * @run junit AccessFlagsTest
  */
 import java.util.EnumSet;
 import java.util.Random;
 import java.util.Set;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.IntFunction;
 import java.lang.reflect.AccessFlag;
 import jdk.classfile.AccessFlags;
-import org.testng.annotations.Test;
-import static org.testng.Assert.assertEquals;
-import org.testng.annotations.DataProvider;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.junit.jupiter.params.ParameterizedTest;
 
-public class AccessFlagsTest {
+class AccessFlagsTest {
 
-    @DataProvider(name = "accessFlagsContexts")
-    public static AccessFlag.Location[] accessFlagsContexts() {
-        return new AccessFlag.Location[] {AccessFlag.Location.CLASS, AccessFlag.Location.METHOD, AccessFlag.Location.FIELD};
-    }
-
-    @Test(dataProvider = "accessFlagsContexts")
-    public void testRandomAccessFlagsConverions(AccessFlag.Location ctx) {
+    @ParameterizedTest
+    @EnumSource(names = { "CLASS", "METHOD", "FIELD" })
+    void testRandomAccessFlagsConverions(AccessFlag.Location ctx) {
         IntFunction<AccessFlags> intFactory = switch (ctx) {
             case CLASS -> AccessFlags::ofClass;
             case METHOD -> AccessFlags::ofMethod;
@@ -74,12 +72,16 @@ public void testRandomAccessFlagsConverions(AccessFlag.Location ctx) {
         }
     }
 
-    @Test(dataProvider = "accessFlagsContexts", expectedExceptions = IllegalArgumentException.class)
-    public void testInvalidFlagsUse(AccessFlag.Location ctx) {
-        switch (ctx) {
-            case CLASS -> AccessFlags.ofClass(AccessFlag.values());
-            case FIELD -> AccessFlags.ofField(AccessFlag.values());
-            case METHOD -> AccessFlags.ofMethod(AccessFlag.values());
-        }
+    @Test
+    void testInvalidFlagsUse() {
+        assertAll(
+            () -> assertThrowsForInvalidFlagsUse(AccessFlags::ofClass),
+            () -> assertThrowsForInvalidFlagsUse(AccessFlags::ofField),
+            () -> assertThrowsForInvalidFlagsUse(AccessFlags::ofMethod)
+        );
+    }
+
+    void assertThrowsForInvalidFlagsUse(Consumer<AccessFlag[]> factory) {
+        assertThrows(IllegalArgumentException.class, () -> factory.accept(AccessFlag.values()));
     }
 }

test/jdk/jdk/classfile/AdaptCodeTest.java

@@ -26,7 +26,7 @@
 /*
  * @test
  * @summary Testing Classfile Code Adaptation.
- * @run testng AdaptCodeTest
+ * @run junit AdaptCodeTest
  */
 
 import java.lang.constant.ConstantDesc;
@@ -44,20 +44,20 @@
 import helpers.TestUtil;
 import helpers.Transforms;
 import jdk.classfile.instruction.ConstantInstruction;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
-import static org.testng.Assert.assertEquals;
-
-@Test()
-public class AdaptCodeTest {
+class AdaptCodeTest {
 
     static final String testClassName = "AdaptCodeTest$TestClass";
     static final Path testClassPath = Paths.get(URI.create(AdaptCodeTest.class.getResource(testClassName + ".class").toString()));
     private static final String THIRTEEN = "BlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlah";
     private static final String SEVEN = "BlahBlahBlahBlahBlahBlahBlah";
 
-    public void testNullAdaptIterator() throws Exception {
+    @Test
+    void testNullAdaptIterator() throws Exception {
         ClassModel cm = Classfile.parse(testClassPath);
         for (ClassTransform t : Transforms.noops) {
             byte[] newBytes = cm.transform(t);
@@ -69,16 +69,22 @@ public void testNullAdaptIterator() throws Exception {
         }
     }
 
-    @Test(dataProvider = "noExceptionClassfiles")
-    public void testNullAdaptIterator2(String path) throws Exception {
+    @ParameterizedTest
+    @ValueSource(strings = {
+        "modules/java.base/java/util/AbstractCollection.class",
+        "modules/java.base/java/util/PriorityQueue.class",
+        "modules/java.base/java/util/ArraysParallelSortHelpers.class"
+    })
+    void testNullAdaptIterator2(String path) throws Exception {
         FileSystem fs = FileSystems.getFileSystem(URI.create("jrt:/"));
         ClassModel cm = Classfile.parse(fs.getPath(path));
         for (ClassTransform t : Transforms.noops) {
             byte[] newBytes = cm.transform(t);
         }
     }
 
-    public void testSevenOfThirteenIterator() throws Exception {
+    @Test
+    void testSevenOfThirteenIterator() throws Exception {
         ClassModel cm = Classfile.parse(testClassPath);
 
         var transform = ClassTransform.transformingMethodBodies((codeB, codeE) -> {
@@ -103,17 +109,8 @@ public void testSevenOfThirteenIterator() throws Exception {
         assertEquals(result, SEVEN);
     }
 
-    @DataProvider(name = "noExceptionClassfiles")
-    public Object[][] provide()  {
-        return new Object[][] { { "modules/java.base/java/util/AbstractCollection.class" },
-                                { "modules/java.base/java/util/PriorityQueue.class" },
-                                { "modules/java.base/java/util/ArraysParallelSortHelpers.class" }
-        };
-    }
-
-
-
-    public void testCopy() throws Exception {
+    @Test
+    void testCopy() throws Exception {
         ClassModel cm = Classfile.parse(testClassPath);
         byte[] newBytes = Classfile.build(cm.thisClass().asSymbol(), cb -> cm.forEachElement(cb));
 //        TestUtil.writeClass(newBytes, "TestClass.class");

test/jdk/jdk/classfile/AdvancedTransformationsTest.java

@@ -26,7 +26,7 @@
 /*
  * @test
  * @summary Testing Classfile advanced transformations.
- * @run testng AdvancedTransformationsTest
+ * @run junit AdvancedTransformationsTest
  */
 import helpers.ByteArrayClassLoader;
 import java.util.Map;
@@ -41,8 +41,8 @@
 import jdk.classfile.impl.StackMapGenerator;
 import jdk.classfile.components.ClassRemapper;
 import jdk.classfile.components.CodeLocalsShifter;
-import org.testng.annotations.Test;
-import static org.testng.Assert.*;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.*;
 import static helpers.TestUtil.assertEmpty;
 import java.lang.constant.ClassDesc;
 import java.lang.constant.ConstantDescs;
@@ -72,10 +72,10 @@
 import java.lang.annotation.Target;
 import jdk.classfile.impl.AbstractPseudoInstruction;
 
-public class AdvancedTransformationsTest {
+class AdvancedTransformationsTest {
 
     @Test
-    public void testShiftLocals() throws Exception {
+    void testShiftLocals() throws Exception {
         try (var in = StackMapGenerator.class.getResourceAsStream("StackMapGenerator.class")) {
             var clm = Classfile.parse(in.readAllBytes());
             var remapped = Classfile.parse(clm.transform((clb, cle) -> {
@@ -107,7 +107,7 @@ public void accept(CodeBuilder builder, CodeElement element) {
     }
 
     @Test
-    public void testRemapClass() throws Exception {
+    void testRemapClass() throws Exception {
         var map = Map.of(
                 ConstantDescs.CD_List, ClassDesc.of("remapped.List"),
                 ClassDesc.ofDescriptor(AbstractPseudoInstruction.ExceptionCatchImpl.class.descriptorString()), ClassDesc.of("remapped.ExceptionCatchImpl"),
@@ -166,7 +166,7 @@ public Rec(Foo foo) {
     }
 
     @Test
-    public void testRemapModule() throws Exception {
+    void testRemapModule() throws Exception {
         var foo = ClassDesc.ofDescriptor(Foo.class.descriptorString());
         var bar = ClassDesc.ofDescriptor(Bar.class.descriptorString());
 
@@ -183,7 +183,7 @@ public void testRemapModule() throws Exception {
     }
 
     @Test
-    public void testRemapDetails() throws Exception {
+    void testRemapDetails() throws Exception {
         var foo = ClassDesc.ofDescriptor(Foo.class.descriptorString());
         var bar = ClassDesc.ofDescriptor(Bar.class.descriptorString());
         var fooAnno = ClassDesc.ofDescriptor(FooAnno.class.descriptorString());
@@ -233,7 +233,7 @@ private static void verifySignature(ClassDesc desc, Signature sig) {
     }
 
     @Test
-    public void testInstrumentClass() throws Exception {
+    void testInstrumentClass() throws Exception {
         var instrumentor = Classfile.parse(AdvancedTransformationsTest.class.getResourceAsStream("AdvancedTransformationsTest$InstrumentorClass.class").readAllBytes());
         var target = Classfile.parse(AdvancedTransformationsTest.class.getResourceAsStream("AdvancedTransformationsTest$TargetClass.class").readAllBytes());
         var instrumentedBytes = instrument(target, instrumentor, mm -> mm.methodName().stringValue().equals("instrumentedMethod"));

test/jdk/jdk/classfile/AnnotationModelTest.java

@@ -26,21 +26,21 @@
 /*
  * @test
  * @summary Testing Classfile annotation model.
- * @run testng AnnotationModelTest
+ * @run junit AnnotationModelTest
  */
 import jdk.classfile.Classfile;
 import jdk.classfile.Attributes;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.net.URI;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
 
-import static org.testng.Assert.*;
+import static org.junit.jupiter.api.Assertions.*;
 
-public class AnnotationModelTest {
+class AnnotationModelTest {
     private static final FileSystem JRT = FileSystems.getFileSystem(URI.create("jrt:/"));
     private static final String testClass = "modules/java.base/java/lang/annotation/Target.class";
     static byte[] fileBytes;
@@ -54,7 +54,7 @@ public class AnnotationModelTest {
     }
 
     @Test
-    public void readAnnos() {
+    void readAnnos() {
         var model = Classfile.parse(fileBytes);
         var annotations = model.findAttribute(Attributes.RUNTIME_VISIBLE_ANNOTATIONS).get().annotations();
 

test/jdk/jdk/classfile/AnnotationTest.java

@@ -26,7 +26,7 @@
 /*
  * @test
  * @summary Testing Classfile annotations.
- * @run testng AnnotationTest
+ * @run junit AnnotationTest
  */
 import java.lang.constant.ClassDesc;
 import static java.lang.constant.ConstantDescs.*;
@@ -41,21 +41,18 @@
 import jdk.classfile.attribute.RuntimeVisibleAnnotationsAttribute;
 import jdk.classfile.*;
 import jdk.classfile.constantpool.ConstantPoolBuilder;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toSet;
 import jdk.classfile.impl.DirectClassBuilder;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.AssertJUnit.fail;
+import static org.junit.jupiter.api.Assertions.*;
 
 /**
  * AnnotationTest
  */
-@Test
-public class AnnotationTest {
+class AnnotationTest {
     enum E {C};
 
     private static Map<String, Object> constants
@@ -128,7 +125,8 @@ private static RuntimeVisibleAnnotationsAttribute buildAnnotationsWithCPB(Consta
         return RuntimeVisibleAnnotationsAttribute.of(Annotation.of(constantPoolBuilder.utf8Entry("LAnno;"), elements()));
     }
 
-    public void testAnnos() {
+    @Test
+    void testAnnos() {
         byte[] bytes = Classfile.build(ClassDesc.of("Foo"), cb -> {
             ((DirectClassBuilder) cb).writeAttribute(buildAnnotationsWithCPB(cb.constantPool()));
             cb.withMethod("foo", MethodTypeDesc.of(CD_void), 0, mb -> mb.with(buildAnnotationsWithCPB(mb.constantPool())));
@@ -172,7 +170,8 @@ private static RuntimeVisibleAnnotationsAttribute buildAnnotations() {
                                                                    elements()));
     }
 
-    public void testAnnosNoCPB() {
+    @Test
+    void testAnnosNoCPB() {
         byte[] bytes = Classfile.build(ClassDesc.of("Foo"), cb -> {
             ((DirectClassBuilder) cb).writeAttribute(buildAnnotations());
             cb.withMethod("foo", MethodTypeDesc.of(CD_void), 0, mb -> mb.with(buildAnnotations()));

test/jdk/jdk/classfile/ArrayTest.java

@@ -26,7 +26,7 @@
 /*
  * @test
  * @summary Testing Classfile arrays.
- * @run testng ArrayTest
+ * @run junit ArrayTest
  */
 import jdk.classfile.Classfile;
 import jdk.classfile.ClassModel;
@@ -37,22 +37,22 @@
 import jdk.classfile.instruction.NewMultiArrayInstruction;
 import jdk.classfile.instruction.NewPrimitiveArrayInstruction;
 import jdk.classfile.instruction.NewReferenceArrayInstruction;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.net.URI;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Iterator;
 
-public class ArrayTest {
+class ArrayTest {
     static final String testClassName = "ArrayTest$TestClass";
     static final Path testClassPath = Paths.get(URI.create(ArrayTest.class.getResource(testClassName + ".class").toString()));
 
 
     @Test
-    public void testArrayNew() throws Exception {
+    void testArrayNew() throws Exception {
         ClassModel cm = Classfile.parse(testClassPath);
 
         for (MethodModel mm : cm.methods()) {

test/jdk/jdk/classfile/BSMTest.java

@@ -26,7 +26,7 @@
 /*
  * @test
  * @summary Testing Classfile bootstrap methods.
- * @run testng BSMTest
+ * @run junit BSMTest
  */
 import java.lang.constant.ClassDesc;
 import java.lang.constant.MethodTypeDesc;
@@ -45,10 +45,10 @@
 import jdk.classfile.constantpool.LoadableConstantEntry;
 import jdk.classfile.constantpool.MemberRefEntry;
 import jdk.classfile.constantpool.MethodHandleEntry;
-import org.testng.annotations.Test;
+import org.junit.jupiter.api.Test;
 
 import static java.lang.constant.ConstantDescs.CD_String;
-import static org.testng.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.*;
 
 public class BSMTest {
     static final String testClassName = "BSMTest$SomeClass";
@@ -58,8 +58,8 @@ public class BSMTest {
     private static final String TWENTY = "BlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlahBlah";
     private static final String TYPE = "(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/String;";
 
-    @Test()
-    public void testSevenOfThirteenIterator() throws Exception {
+    @Test
+    void testSevenOfThirteenIterator() throws Exception {
         ClassModel cm = Classfile.parse(testClassPath);
         byte[] newBytes = cm.transform((cb, ce) -> {
             if (ce instanceof MethodModel mm) {