test/langtools/tools/javac/platform/createsymbols/CreateSymbolsTestImpl.java

@@ -29,11 +29,11 @@
   *          jdk.compiler/com.sun.tools.javac.api
   *          jdk.compiler/com.sun.tools.javac.jvm
   *          jdk.compiler/com.sun.tools.javac.main
   *          jdk.compiler/com.sun.tools.javac.util
   * @clean *
-  * @run main/othervm CreateSymbolsTest
+  * @run junit/othervm CreateSymbolsTest
   */
  
  import java.io.File;
  import java.io.InputStream;
  import java.io.Writer;

@@ -65,10 +65,12 @@
  import java.util.Set;
  import java.util.jar.JarEntry;
  import java.util.jar.JarFile;
  import java.util.stream.Collectors;
  import java.util.stream.Stream;
+ 
+ import org.junit.jupiter.api.Test;
  import toolbox.JavacTask;
  import toolbox.Task;
  import toolbox.Task.Expect;
  import toolbox.ToolBox;
  import build.tools.symbolgenerator.CreateSymbols;

@@ -84,27 +86,10 @@
  
  public class CreateSymbolsTestImpl {
  
      static final String CREATE_SYMBOLS_NAME = "symbolgenerator.CreateSymbols";
  
-     public static void main(String... args) throws Exception {
-         new CreateSymbolsTestImpl().doTest();
-     }
- 
-     void doTest() throws Exception {
-         boolean testRun = false;
-         for (Method m : CreateSymbolsTestImpl.class.getDeclaredMethods()) {
-             if (m.isAnnotationPresent(Test.class)) {
-                 m.invoke(this);
-                 testRun = true;
-             }
-         }
-         if (!testRun) {
-             throw new IllegalStateException("No tests found.");
-         }
-     }
- 
      @Test
      void testMethodRemoved() throws Exception {
          doTest("package t; public class T { public void m() { } }",
                 "package t; public class T { }",
                 "package t; public class Test { { T t = null; t.m(); } }",

@@ -857,32 +842,32 @@
                     class name api/Ann
                     header extends java/lang/Object implements java/lang/annotation/Annotation flags 2601
  
                     class name api/Api
                     header extends nonapi/Impl$Nested$Exp flags 21
-                    innerclass innerClass nonapi/Impl$Nested outerClass nonapi/Impl innerClassName Nested flags 9
-                    innerclass innerClass nonapi/Impl$Nested$Exp outerClass nonapi/Impl$Nested innerClassName Exp flags 9
+                    innerclass innerClass nonapi/Impl$Nested outerClass nonapi/Impl innerClassName Nested flags 29
+                    innerclass innerClass nonapi/Impl$Nested$Exp outerClass nonapi/Impl$Nested innerClassName Exp flags 29
                     method name <init> descriptor ()V flags 1
  
                     class name nonapi/Impl
                     header extends java/lang/Object nestMembers nonapi/Impl$Nested,nonapi/Impl$Nested$Exp flags 21
-                    innerclass innerClass nonapi/Impl$Nested outerClass nonapi/Impl innerClassName Nested flags 9
-                    innerclass innerClass nonapi/Impl$Nested$Exp outerClass nonapi/Impl$Nested innerClassName Exp flags 9
+                    innerclass innerClass nonapi/Impl$Nested outerClass nonapi/Impl innerClassName Nested flags 29
+                    innerclass innerClass nonapi/Impl$Nested$Exp outerClass nonapi/Impl$Nested innerClassName Exp flags 29
                     field name C descriptor Ljava/lang/String; constantValue  flags 19
                     method name <init> descriptor ()V flags 1
                     method name test descriptor ()V flags 1
  
                     class name nonapi/Impl$Nested
                     header extends java/lang/Object nestHost nonapi/Impl flags 21 classAnnotations @Lapi/Ann;
-                    innerclass innerClass nonapi/Impl$Nested outerClass nonapi/Impl innerClassName Nested flags 9
-                    innerclass innerClass nonapi/Impl$Nested$Exp outerClass nonapi/Impl$Nested innerClassName Exp flags 9
+                    innerclass innerClass nonapi/Impl$Nested outerClass nonapi/Impl innerClassName Nested flags 29
+                    innerclass innerClass nonapi/Impl$Nested$Exp outerClass nonapi/Impl$Nested innerClassName Exp flags 29
                     method name <init> descriptor ()V flags 1
  
                     class name nonapi/Impl$Nested$Exp
                     header extends nonapi/Impl$Nested implements java/lang/Runnable nestHost nonapi/Impl flags 21
-                    innerclass innerClass nonapi/Impl$Nested outerClass nonapi/Impl innerClassName Nested flags 9
-                    innerclass innerClass nonapi/Impl$Nested$Exp outerClass nonapi/Impl$Nested innerClassName Exp flags 9
+                    innerclass innerClass nonapi/Impl$Nested outerClass nonapi/Impl innerClassName Nested flags 29
+                    innerclass innerClass nonapi/Impl$Nested$Exp outerClass nonapi/Impl$Nested innerClassName Exp flags 29
                     method name <init> descriptor ()V flags 1
                     method name run descriptor ()V flags 1
                     method name get descriptor ()Lnonapi/Impl$OtherNested; flags 1
  
                     """,

@@ -1350,10 +1335,6 @@
                  Files.delete(dir);
                  return FileVisitResult.CONTINUE;
              }
          });
      }
- 
-     @Retention(RetentionPolicy.RUNTIME)
-     @interface Test {
-     }
  }