8163229: several regression tests have a main method that is never executed

Reviewed-by: vromero

test/langtools/tools/javac/4980495/static/Test.java

@@ -11,7 +11,7 @@ import static p2.A2.f;
 
 public class Test {
 
-    public static void main(String argv[]) {
+    public static void meth() {
         f = 1;
     }
 }

test/langtools/tools/javac/4980495/std/Test.java

@@ -12,7 +12,7 @@ import p2.A2.f;
 
 public class Test {
 
-    public static void main(String argv[]) {
+    public static void meth() {
         new f();
     }
 }

test/langtools/tools/javac/6491592/T6491592.java

@@ -7,7 +7,7 @@
  */
 
 public class T6491592 {
-    public static void main(String... args) {
+    public static void meth() {
         Object o = null;
         o += null;
     }

test/langtools/tools/javac/6857948/T6857948.java

@@ -12,7 +12,7 @@ class Foo {
 };
 
 class Test {
-   public static void main() {
+   public static void meth() {
       Foo f = new Foo("Hello!",nosuchfunction()) {};
    }
 }

test/langtools/tools/javac/8062359/UnresolvableClassNPEInAttrTest.java

@@ -7,7 +7,7 @@
  */
 
 public class UnresolvableClassNPEInAttrTest {
-    public static void main(String[] args) {
+    public static void meth() {
         new Undefined() {
             void test() {
                 new Object() {};

test/langtools/tools/javac/8161985/T8161985a.java

@@ -6,7 +6,7 @@
  */
 
 class T8161985 {
-    public static void main(String [] arg) {
+    public static void meth() {
         T8161985 t = new T8161985();
         t.getClass();
 

test/langtools/tools/javac/8238735/T8238735.java

@@ -6,7 +6,7 @@
  */
 
 class T8238735 {
-     public static void main(String[] args) {
+     public static void meth() {
         boolean first = true;
         first = first ? false : (boolean)(() -> false) ;
     }

test/langtools/tools/javac/AnonymousClass/AnonymousInSuperCallNegTest.java

@@ -24,8 +24,4 @@ public class AnonymousInSuperCallNegTest {
                 }
             }); }
     }
-
-    public static void main(String[] args) {
-        new JavacBug();
-    }
 }

test/langtools/tools/javac/BreakAcrossClass.java

@@ -8,7 +8,7 @@
  */
 
 class BreakAcrossClass {
-     public static void main(String argv[]) {
+     public static void meth() {
         final int i = 6;
     M:  {
             class A {

test/langtools/tools/javac/CaptureInSubtype.java

@@ -37,14 +37,4 @@ public class CaptureInSubtype {
 
         Flaw<?> m(){return fn;}
     }
-
-    public static void main(String[] args) {
-        SuperOfShowFlaw sosf = new ShowFlaw();
-        SuperOfFlaw<List<?>> sof = sosf.m();
-        List<String> ls = new ArrayList<String>();
-        ls.add("Smalltalk rules!");
-        sof.put(ls);
-        Number n = ShowFlaw.fn.get().get(0);
-    }
-
 }

test/langtools/tools/javac/DefiniteAssignment/DASwitch.java

@@ -8,7 +8,7 @@
  */
 
 public class DASwitch {
-    public static void main(final String[] args) {
+    public static void meth() {
         int t = 1;
         {
             final int x;

test/langtools/tools/javac/DefiniteAssignment/DUParam1.java

@@ -8,7 +8,7 @@
  */
 
 public class DUParam1 {
-    public static void main(final String[] args) {
+    public static void meth(final String[] args) {
         // 8.4.1 makes it illegal to assign to a final parameter.
         if (false) args = null;
     }

test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry1.java

@@ -11,7 +11,7 @@ class E1 extends Exception {}
 class E2 extends Exception {}
 
 public class DefAssignAfterTry1 {
-    public static void main(String argv[]) {
+    public static void meth() {
         boolean t = true;
         E1 se1 = new E1();
         E2 se2 = new E2();

test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry2.java

@@ -11,7 +11,7 @@ class E1 extends Exception {}
 class E2 extends Exception {}
 
 public class DefAssignAfterTry2 {
-    public static void main(String argv[]) {
+    public static void meth() {
         boolean t = true;
         E1 se1 = new E1();
         E2 se2 = new E2();

test/langtools/tools/javac/DefiniteAssignment/DefAssignAfterTry3.java

@@ -11,7 +11,7 @@ class E1 extends Exception {}
 class E2 extends Exception {}
 
 public class DefAssignAfterTry3 {
-    public static void main(String argv[]) {
+    public static void meth() {
         boolean t = true;
         E1 se1 = new E1();
         E2 se2 = new E2();

test/langtools/tools/javac/DefiniteAssignment/T4717164.java

@@ -8,7 +8,7 @@
  */
 
 class T4717164 {
-    public static void main(String[] args) {
+    public static void meth() {
         try {
             try {
                 throw new ClassNotFoundException();

test/langtools/tools/javac/DefiniteAssignment/T4718142.java

@@ -12,7 +12,7 @@ class T4718142 {
     static void thr() throws E {
         throw new E();
     }
-    public static void main(String[] args) {
+    public static void meth() {
         int count = 0;
         final int i;
         while (true) {

test/langtools/tools/javac/DefiniteAssignment/T4718142a.java

@@ -8,7 +8,7 @@
  */
 
 class T4718142a {
-    public static void main(String[] args) {
+    public static void meth() {
         final int i;
         for (int n=0; n<10; n++) {
             b: {

test/langtools/tools/javac/DefiniteAssignment/UncaughtException.java

@@ -21,8 +21,4 @@ class B extends A implements I {
 }
 
 public class UncaughtException {
-    public static void main (String[] args) {
-        I b = new B();
-        b.throwCheckedException();
-    }
 }

test/langtools/tools/javac/OverrideChecks/T4721069.java

@@ -18,7 +18,7 @@ interface I {
                 x.getClass();
             }
         }
-        public static void main(String[] args) {
+        public static void meth() {
             f(null);
         }
     }

test/langtools/tools/javac/ParseConditional.java

@@ -9,7 +9,7 @@
  */
 
 public class ParseConditional {
-    public static void main(String[] args) {
+    public static void meth() {
         boolean condition = true;
         int a = 1;
         int b = 2;

test/langtools/tools/javac/SwitchScope.java

@@ -8,7 +8,7 @@
  */
 
 public class SwitchScope {
-    public static void main(String[] args) {
+    public static void meth(String[] args) {
         switch (args.length) {
         case 0:
             final int k;

test/langtools/tools/javac/SynthName2.java

@@ -10,7 +10,7 @@
 import java.io.PrintStream;
 
 class SynthName2 {
-    public static void main(String args[]) {
+    public static void meth(String args[]) {
         run(args, System.out);
     }
     public static void run(String args[],PrintStream out) {

test/langtools/tools/javac/T5003235/T5003235b.java

@@ -22,7 +22,7 @@ class Outer {
 }
 
 class Access {
-    public static void main(String[] args) {
+    public static void meth() {
         Outer outer = new Outer();
         outer.create();
         System.out.println("Value of k: " + outer.inner.k);

test/langtools/tools/javac/T6306967.java

@@ -7,7 +7,7 @@
  */
 
 public class T6306967 {
-    public static void main(String[] args) {
+    public static void meth() {
         final int x;
         while(true) {
             if (true) {

test/langtools/tools/javac/T6326754.java

@@ -42,7 +42,7 @@ class TestC<T>{
     }
 }
 public class T6326754{
-    public static void main(String... arg){
+    public static void meth() {
         TestC tC =new TestC();
         tC.setT();
         TestConstructor tc = new TestConstructor("saaa");

test/langtools/tools/javac/T6379327.java

@@ -8,7 +8,7 @@
 
 import java.security.*;
 public class T6379327 {
-    public static void main(String[] args) {
+    public static void meth(String[] args) {
         final String name = args[0];
         try {
             new PrivilegedExceptionAction() {

test/langtools/tools/javac/T6407257.java

@@ -9,7 +9,4 @@
 class T6407257a extends T6407257a {}
 
 public class T6407257 extends T6407257a {
-    public static void main(String... args) {
-        main(args);
-    }
 }

test/langtools/tools/javac/TryWithResources/BadTwr.java

@@ -7,7 +7,7 @@
  */
 
 public class BadTwr implements AutoCloseable {
-    public static void main(String... args) {
+    public static void meth(String... args) {
         // illegal repeated name
         try(BadTwr r1 = new BadTwr(); BadTwr r1 = new BadTwr()) {
             System.out.println(r1.toString());

test/langtools/tools/javac/TryWithResources/BadTwr.out

@@ -1,5 +1,5 @@
-BadTwr.java:12:46: compiler.err.already.defined: kindname.variable, r1, kindname.method, main(java.lang.String...)
-BadTwr.java:17:20: compiler.err.already.defined: kindname.variable, args, kindname.method, main(java.lang.String...)
+BadTwr.java:12:46: compiler.err.already.defined: kindname.variable, r1, kindname.method, meth(java.lang.String...)
+BadTwr.java:17:20: compiler.err.already.defined: kindname.variable, args, kindname.method, meth(java.lang.String...)
 BadTwr.java:20:13: compiler.err.cant.assign.val.to.final.var: thatsIt
-BadTwr.java:25:24: compiler.err.already.defined: kindname.variable, name, kindname.method, main(java.lang.String...)
+BadTwr.java:25:24: compiler.err.already.defined: kindname.variable, name, kindname.method, meth(java.lang.String...)
 4 errors

test/langtools/tools/javac/TryWithResources/BadTwrSyntax.java

@@ -8,7 +8,7 @@
 
 import java.io.IOException;
 public class BadTwrSyntax implements AutoCloseable {
-    public static void main(String... args) throws Exception {
+    public static void meth() {
         // illegal double semicolon ending resources
         try(BadTwr twrflow = new BadTwr();;) {
             System.out.println(twrflow.toString());

test/langtools/tools/javac/TryWithResources/DuplicateResourceDecl.java

@@ -8,7 +8,7 @@
 
 class DuplicateResourceDecl {
 
-    public static void main(String[] args) {
+    public static void meth() {
         try(MyResource c = new MyResource();MyResource c = new MyResource()) {
         //do something
         } catch (Exception e) { }

test/langtools/tools/javac/TryWithResources/DuplicateResourceDecl.out

@@ -1,2 +1,2 @@
-DuplicateResourceDecl.java:12:56: compiler.err.already.defined: kindname.variable, c, kindname.method, main(java.lang.String[])
+DuplicateResourceDecl.java:12:56: compiler.err.already.defined: kindname.variable, c, kindname.method, meth()
 1 error

test/langtools/tools/javac/TryWithResources/ImplicitFinal.java

@@ -9,7 +9,7 @@
 import java.io.IOException;
 
 class ImplicitFinal implements AutoCloseable {
-    public static void main(String... args) {
+    public static void meth() {
         try(ImplicitFinal r = new ImplicitFinal()) {
             r = null; //disallowed
         } catch (IOException ioe) { // Not reachable

test/langtools/tools/javac/TryWithResources/PlainTry.java

@@ -6,7 +6,7 @@
  * @compile/fail/ref=PlainTry.out  -XDrawDiagnostics                           PlainTry.java
  */
 public class PlainTry {
-    public static void main(String... args) {
+    public static void meth() {
         try {
             ;
         }

test/langtools/tools/javac/TryWithResources/T7022711.java

@@ -8,7 +8,7 @@
 import java.io.*;
 
 class T7022711 {
-    public static void main (String args[]) throws Exception {
+    public static void meth() {
         // declared resource
         try (DataInputStream is = new DataInputStream(new FileInputStream("x"))) {
             while (true) {

test/langtools/tools/javac/TryWithResources/TwrAndLambda.java

@@ -7,7 +7,7 @@
 
 public class TwrAndLambda {
 
-    public static void main(String... args) {
+    public static void meth() {
 
         // Lambda expression
         AutoCloseable v1 = () -> {};

test/langtools/tools/javac/TryWithResources/TwrFlow.java

@@ -8,7 +8,7 @@
 
 import java.io.IOException;
 public class TwrFlow implements AutoCloseable {
-    public static void main(String... args) {
+    public static void meth() {
         try(TwrFlow twrFlow = new TwrFlow()) {
             System.out.println(twrFlow.toString());
         } catch (IOException ioe) { // Not reachable

test/langtools/tools/javac/TryWithResources/TwrForVariable2.java

@@ -5,7 +5,7 @@
  * @compile/fail/ref=TwrForVariable2.out -XDrawDiagnostics -Xlint:-options TwrForVariable2.java
  */
 public class TwrForVariable2 implements AutoCloseable {
-    public static void main(String... args) {
+    public static void meth() {
         TwrForVariable2 v = new TwrForVariable2();
         TwrForVariable3[] v2 = new TwrForVariable3[1];
         TwrForVariable3[][] v3 = new TwrForVariable3[1][1];

test/langtools/tools/javac/TryWithResources/TwrForVariable3.java

@@ -4,7 +4,7 @@
  * @compile/fail/ref=TwrForVariable3.out -XDrawDiagnostics -Xlint:-options TwrForVariable3.java
  */
 public class TwrForVariable3 implements AutoCloseable {
-    public static void main(String... args) {
+    public static void meth() {
         TwrForVariable3 v1 = new TwrForVariable3();
         Object v2 = new Object();
         Object v3 = new Object() {

test/langtools/tools/javac/TryWithResources/TwrForVariable4.java

@@ -5,7 +5,7 @@
  * @compile/fail/ref=TwrForVariable4.out -XDrawDiagnostics -Xlint:-options TwrForVariable4.java
  */
 public class TwrForVariable4 implements AutoCloseable {
-    public static void main(String... args) {
+    public static void meth() {
         TwrForVariable4 uninitialized;
 
         try (uninitialized) {

test/langtools/tools/javac/TryWithResources/TwrOnNonResource.java

@@ -7,7 +7,7 @@
  */
 
 class TwrOnNonResource {
-    public static void main(String... args) {
+    public static void meth() {
         try(TwrOnNonResource aonr = new TwrOnNonResource()) {
             System.out.println(aonr.toString());
         }

test/langtools/tools/javac/TryWithResources/TwrVarKinds.java

@@ -12,7 +12,7 @@ public class TwrVarKinds implements AutoCloseable {
     static TwrVarKinds r3 = new TwrVarKinds();
     TwrVarKinds r4 = new TwrVarKinds();
 
-    public static void main(String... args) {
+    public static void meth() {
 
         TwrVarKinds r5 = new TwrVarKinds();
 

test/langtools/tools/javac/TryWithResources/TwrVarRedeclaration.java

@@ -7,7 +7,7 @@
 
 public class TwrVarRedeclaration implements AutoCloseable {
 
-    public static void main(String... args) {
+    public static void meth() {
         TwrVarRedeclaration r = new TwrVarRedeclaration();
 
         try (r) {

test/langtools/tools/javac/TryWithResources/TwrVarRedeclaration.out

@@ -1,4 +1,4 @@
-TwrVarRedeclaration.java:14:33: compiler.err.already.defined: kindname.variable, r, kindname.method, main(java.lang.String...)
-TwrVarRedeclaration.java:18:20: compiler.err.already.defined: kindname.variable, r, kindname.method, main(java.lang.String...)
-TwrVarRedeclaration.java:23:23: compiler.err.already.defined: kindname.variable, r, kindname.method, main(java.lang.String...)
+TwrVarRedeclaration.java:14:33: compiler.err.already.defined: kindname.variable, r, kindname.method, meth()
+TwrVarRedeclaration.java:18:20: compiler.err.already.defined: kindname.variable, r, kindname.method, meth()
+TwrVarRedeclaration.java:23:23: compiler.err.already.defined: kindname.variable, r, kindname.method, meth()
 3 errors

test/langtools/tools/javac/UseEnum.java

@@ -10,7 +10,7 @@ import static java.lang.System.out;
 
 class UseEnum {
     enum Animal {cat, dog, bird, fish};
-    public static void main(String args[]) {
+    public static void meth() {
         Animal pet;
 
         pet = Animal.cat;

test/langtools/tools/javac/annotations/neg/Cycle3.java

@@ -19,8 +19,4 @@ import static java.lang.annotation.RetentionPolicy.*;
 
 @A
 class Main {
-    public static void main(String[] args) {
-        A a = Main.class.getAnnotation(A.class);
-        System.out.println(a);
-    }
 }

test/langtools/tools/javac/annotations/typeAnnotations/failures/StaticFields.java

@@ -18,7 +18,7 @@ class C {
   // static method
   static int f() { return @A C.f; }
   // main
-  public static void main(String... args) {
+  public static void meth() {
     int a = @A C.f;
   }
 }

test/langtools/tools/javac/annotations/typeAnnotations/failures/target/DotClass.java

@@ -30,7 +30,7 @@ class T0x1E {
 }
 
 class ClassLiterals {
-    public static void main(String[] args) {
+    public static void meth() {
         if (String.class != @A String.class) throw new Error();
         if (@A int.class != int.class) throw new Error();
         if (@A int.class != Integer.TYPE) throw new Error();

test/langtools/tools/javac/capture/Martin.java

@@ -9,7 +9,7 @@
 import java.util.List;
 
 public class Martin {
-    public static void main(String[] args) throws Throwable {
+    public static void meth() {
         List<?> x1 = null;
         List<?> x2 = null;
         x1.addAll(x2);

test/langtools/tools/javac/defaultMethods/private/Private06.java

@@ -17,14 +17,14 @@ public class Private06 {
         void foo(NAFI nafi);
     }
 
-    public static void main(String [] args) {
+    public static void meth() {
         Private06.NAFI nafi = () -> {};
         Private06.FI fi = Private06.NAFI::foo; // OK.
     }
 }
 
 class Private06_01 {
-    public static void main(String [] args) {
+    public static void meth() {
         Private06.FI fi = Private06.NAFI::foo; // NOT OK.
     }
 }

test/langtools/tools/javac/defaultMethods/static/Static02.java

@@ -11,7 +11,7 @@ class Static02 {
         public static void test() { }
     }
 
-    public static void main(String[] args) {
+    public static void meth() {
         I.test(); //ok
         I i = new I() {};
         i.test(); //no!

test/langtools/tools/javac/depDocComment/DeprecatedDocComment.java

@@ -23,7 +23,7 @@
 
 public class DeprecatedDocComment {
 
-    public static void main(String argv[]) {
+    public static void meth() {
       DeprecatedDocComment2.deprecatedTest1();
       DeprecatedDocComment2.deprecatedTest2();
       DeprecatedDocComment2.deprecatedTest3();

test/langtools/tools/javac/generics/6245699/T6245699b.java

@@ -6,7 +6,7 @@
  */
 
 public class T6245699b {
-    public static void main(String[] args) {
+    public static void meth() {
         IBar b = new Bar();
         String x = b.doIt();
     }

test/langtools/tools/javac/generics/6413682/T6413682.java

@@ -6,7 +6,7 @@
  */
 
 public class T6413682 {
-    public static void main(String... args) {
+    public static void meth() {
         Object[] text = new
 <Wow,thanks.Mr<List>,and.thanks.Mr<Javac>.Vince>Object[5];
     }

test/langtools/tools/javac/generics/6495506/T6495506.java

@@ -7,7 +7,7 @@
  */
 
 public class T6495506 {
-    public static void main(String... args) {
+    public static void meth() {
         a.A myA = new a.A();
         myA.p = myA.vec.get(0);
     }

test/langtools/tools/javac/generics/6723444/T6723444.java

@@ -23,7 +23,7 @@ public class T6723444 {
     <X1 extends Throwable, X2 extends Throwable> T6723444(Foo<X1> foo, int i)
         throws X1, X2 {}
 
-    public static void main(String[] args) throws Exception {
+    public static void meth() throws Exception {
 
         // the following 8 statements should compile without error
 

test/langtools/tools/javac/generics/GetClass.java

@@ -8,7 +8,7 @@
  */
 
 public class GetClass {
-    public static void main(String[] args) {
+    public static void meth() {
         Class<? extends Class<GetClass>> x = GetClass.class.getClass();
     }
 }

test/langtools/tools/javac/generics/Nonlinear.java

@@ -21,7 +21,7 @@ public class Nonlinear {
     // when executed, even though there are no explicit casts in
     // the program.
 
-    public static void main (String [] args) {
+    public static void meth() {
         Integer x = Integer.valueOf(5);
         String y = castit (x);
         System.out.println (y);

test/langtools/tools/javac/generics/UnsoundInference.java

@@ -12,7 +12,7 @@ import java.util.Collection;
 
 public class UnsoundInference {
 
-    public static void main(String[] args) {
+    public static void meth() {
         Object[] objArray = {new Object()};
         ArrayList<String> strList = new ArrayList<String>();
         transferBug(objArray, strList);

test/langtools/tools/javac/generics/diamond/neg/Neg08.java

@@ -9,7 +9,7 @@
  */
 
 class Neg08 {
-   public static void main(String[] args) {
+   public static void meth() {
      String s = new String<>("foo");
    }
 }

test/langtools/tools/javac/generics/diamond/neg/Neg13.java

@@ -15,7 +15,7 @@ class Neg13 {
 
     static void foo(A<String> as) {}
 
-    public static void main(String[] args) {
+    public static void meth() {
 
         // Method invocation context - good <>(){}
         foo(new A<>() {

test/langtools/tools/javac/generics/diamond/neg/Neg14.java

@@ -15,7 +15,7 @@ class Neg14 {
 
     static void foo(A<String> as) {}
 
-    public static void main(String[] args) {
+    public static void meth() {
 
         // Method invocation context - good <>(){}
         foo(new A<>() {

test/langtools/tools/javac/generics/diamond/neg/Neg15.java

@@ -23,7 +23,7 @@ class Neg15 {
             throw new Error("Blew it");
     }
 
-    public static void main(String[] args) {
+    public static void meth() {
 
         someMethod(new Predicate<Integer>() {
             public boolean test(Integer n) {

test/langtools/tools/javac/generics/diamond/neg/Neg17.java

@@ -11,7 +11,7 @@ abstract class Neg17<T> {
 
    abstract void m();
 
-   public static void main(String[] args) {
+   void meth() {
        Collections.singletonList(new Neg17<>() { void m() {} }).get(0).m(); // good.
        Collections.singletonList(new Neg17<>() {
                  void m() {}

test/langtools/tools/javac/generics/diamond/neg/Neg18.java

@@ -10,7 +10,7 @@ import pkg.Neg18_01;
 
 class Neg18 {
 
-   public static void main(String[] args) {
+   public static void meth() {
         new Neg18_01<>() {};
    }
 }

test/langtools/tools/javac/generics/diamond/neg/Neg19.java

@@ -8,7 +8,7 @@
 
 
 class Neg19 {
-    public static void main(String[] args) {
+    public static void meth() {
         new Neg19_01<Neg19>().foo(new Neg19_01<>()); // OK.
         new Neg19_01<Neg19>().foo(new Neg19_01<>() {}); // ERROR.
     }

test/langtools/tools/javac/generics/inference/4972073/T4972073.java

@@ -22,9 +22,4 @@ public class T4972073 {
     }
 
     static class B<E extends MyClass & MyInterface<E> & MyInterface<E>> extends D {}
-
-
-    public static void main(String[] args) {
-        B b = new B<Sun1>();
-    }
 }

test/langtools/tools/javac/generics/inference/5081782/Neg.java

@@ -8,7 +8,7 @@
 
 public class Neg {
     static void m() {}
-    public static void main(String... args) {
+    public static void meth() {
         Neg.<Can,I,write,a,little,story,here>m();
     }
 }

test/langtools/tools/javac/generics/odersky/BadTest.java

@@ -15,7 +15,7 @@ class BadTest {
         static <A> Cell<A> makeCell(A x) { return new Cell<A>(x); }
         static <A> A id(A x) { return x; }
 
-        public static void main(String[] args) {
+        public static void meth() {
             List<Cell<String>> as = nil().prepend(makeCell(null));
             List<Cell<String>> bs = cons(makeCell(null), nil());
             List<String> xs = id(nil());

test/langtools/tools/javac/generics/odersky/BadTest3.java

@@ -27,7 +27,7 @@ class BadTest3 {
         static <A> Cell<A> makeCell(A x) { return new Cell<A>(x); }
         static <A> A id(A x) { return x; }
 
-        public static void main(String[] args) {
+        public static void meth() {
             List<String> xs = nil();
             f(null);
             f(nil());

test/langtools/tools/javac/generics/typeargs/Metharg1.java

@@ -32,10 +32,4 @@ class T<X> {
     <K> void f(K k) {
         this.<Integer>f("");
     }
-
-    public static void main(String[] args) {
-        T<Integer> x = new <Object>T<Integer>();
-        T<Integer>.U<Float> y = x.new <Object>U<Float>();
-        x.<Object>f("");
-    }
 }

test/langtools/tools/javac/generics/typeargs/Metharg2.java

@@ -33,7 +33,7 @@ class T<X> {
         this.<Object>f("");
     }
 
-    public static void main(String[] args) {
+    public static void meth() {
         T<Integer> x = new <Object>T<Integer>();
         T<Integer>.U<Float> y = x.new <Object>U<Float>();
         x.<Integer>f("");

test/langtools/tools/javac/generics/typeargs/Newarg1.java

@@ -14,7 +14,7 @@ class T<X> {
     <K> T(K x) {
     }
 
-    public static void main(String[] args) {
+    public static void meth() {
         new <Integer>T<Float>("");
     }
 }

test/langtools/tools/javac/generics/typeargs/Newarg2.java

@@ -15,7 +15,7 @@ class T {
         <B> U(B b) {}
     }
 
-    public static void main(String[] args) {
+    public static void meth() {
         new T().new <Integer>U<Integer>("");
     }
 }

test/langtools/tools/javac/generics/typeargs/Superarg1.java

@@ -32,10 +32,4 @@ class T<X> {
     <K> void f() {
         this.<Object>f();
     }
-
-    public static void main(String[] args) {
-        T<Integer> x = new <Object>T<Integer>("");
-        T<Integer>.U<Float> y = x.new <Object>U<Float>();
-        x.<Object>f();
-    }
 }

test/langtools/tools/javac/generics/typeargs/Superarg2.java

@@ -32,10 +32,4 @@ class T<X> {
     <K> void f() {
         this.<Object>f();
     }
-
-    public static void main(String[] args) {
-        T<Integer> x = new <Object>T<Integer>();
-        T<Integer>.U<Float> y = x.new <Object>U<Float>("");
-        x.<Object>f();
-    }
 }

test/langtools/tools/javac/generics/typeargs/ThisArg.java

@@ -32,10 +32,4 @@ class T<X> {
     <K> void f() {
         this.<Object>f();
     }
-
-    public static void main(String[] args) {
-        T<Integer> x = new <Object>T<Integer>();
-        T<Integer>.U<Float> y = x.new <Object>U<Float>("");
-        x.<Object>f();
-    }
 }

test/langtools/tools/javac/generics/wildcards/6437894/T6437894.java

@@ -10,7 +10,7 @@
  */
 
 public class T6437894 {
-    public static void main(String... args) {
+    public static void meth() {
         b.B m;
         a.A.X x = null;
         Long.parseLong(x.toString());

test/langtools/tools/javac/generics/wildcards/AssignmentDifferentTypes.java

@@ -7,7 +7,7 @@
 
 public class AssignmentDifferentTypes {
 
-    public static void main(String[] args) {
+    public static void meth() {
         Ref<Der> derexact = null;
         Ref<Base> baseexact = null;
         Ref<? extends Der> derext = null;

test/langtools/tools/javac/generics/wildcards/AssignmentSameType.java

@@ -7,7 +7,7 @@
 
 public class AssignmentSameType {
 
-    public static void main(String[] args) {
+    public static void meth() {
         Ref<B> exact = null;
         Ref<? extends B> ebound = null;
         Ref<? super B> sbound = null;

test/langtools/tools/javac/generics/wildcards/T6450290.java

@@ -14,7 +14,7 @@ public class T6450290 {
 
     static class A extends Box<A,A> {}
     static class B extends Box<B,B> {}
-    public static void main(String[] args) {
+    public static void meth() {
         Box<?,?> b = new Box<Box<A,A>,Box<A,A>>();
         b.value.same = new Box<B,B>(); //javac misses this bad assignment
     }

test/langtools/tools/javac/implicitThis/NewBeforeOuterConstructed2.java

@@ -24,9 +24,4 @@ public class NewBeforeOuterConstructed2 {
             System.out.println("ok");
         }
     }
-    public static void main(String[] args) {
-        NewBeforeOuterConstructed2 c = new NewBeforeOuterConstructed2(new Object());
-        Middle m = c.new Middle();
-        m.f();
-    }
 }

test/langtools/tools/javac/lambda/8071432/T8071432.java

@@ -41,7 +41,7 @@ class T8071432 {
         }
     }
 
-    public static void main(String[] args) {
+    public static void meth() {
         Collection<Point> c = Arrays.asList(new Point(1.0, 0.1));
         System.out.println("------- 1 ---------------");
         System.out.println(c.stream().reduce(0.0,

test/langtools/tools/javac/lambda/LambdaConv10.java

@@ -11,7 +11,7 @@ class LambdaConv10 {
 
     interface Method1<R, A1> { public R call( A1 a1 ); }
 
-    public static void main( final String... notUsed ) {
+    public static void meth() {
         Method1<Integer,Integer> m1 = (int i) -> 2 * i;
     }
 }

test/langtools/tools/javac/lambda/MethodReference20.java

@@ -17,7 +17,7 @@ class MethodReference20<X> {
 
     static void test(SAM<Integer> s) {   }
 
-    public static void main(String[] args) {
+    public static void meth() {
         SAM<Integer> s = MethodReference20<String>::new;
         test(MethodReference20<String>::new);
     }

test/langtools/tools/javac/lambda/MethodReference25.java

@@ -21,7 +21,7 @@ class MethodReference25 {
     static void call(int i, SAM1 s) { s.m(i);  }
     static void call(int i, SAM2 s) { s.m(i);  }
 
-    public static void main(String[] args) {
+    public static void meth() {
         call(1, MethodReference25::m); //ambiguous
     }
 }

test/langtools/tools/javac/lambda/MethodReference41.java

@@ -34,7 +34,7 @@ public class MethodReference41 {
     static void m4(SAM2 s) { }
     static void m4(SAM3 s) { }
 
-    public static void main(String[] args) {
+    public static void meth() {
         m1(Foo::new);
         m2(Foo::new);
         m3(Foo::new);

test/langtools/tools/javac/lambda/MethodReference42.java

@@ -34,7 +34,7 @@ public class MethodReference42 {
     static void m4(SAM2 s) { }
     static void m4(SAM3 s) { }
 
-    public static void main(String[] args) {
+    public static void meth() {
         m1(Foo::new);
         m2(Foo::new);
         m3(Foo::new);

test/langtools/tools/javac/lambda/MethodReference43.java

@@ -41,7 +41,7 @@ public class MethodReference43 {
     static void m5(SAM3 s) { }
     static void m5(SAM4 s) { }
 
-    public static void main(String[] args) {
+    public static void meth() {
         m1(Foo::new);
         m2(Foo::new);
         m3(Foo::new);

test/langtools/tools/javac/lambda/MethodReference44.java

@@ -36,7 +36,7 @@ public class MethodReference44 {
     static void g4(SAM2 s) { }
     static void g4(SAM3 s) { }
 
-    public static void main(String[] args) {
+    public static void meth() {
         g1(MethodReference44::m);
         g2(MethodReference44::m);
         g3(MethodReference44::m);

test/langtools/tools/javac/lambda/MethodReference46.java

@@ -36,7 +36,7 @@ public class MethodReference46 {
     static void g4(SAM2 s) { }
     static void g4(SAM3 s) { }
 
-    public static void main(String[] args) {
+    public static void meth() {
         g1(MethodReference46::m);
         g2(MethodReference46::m);
         g3(MethodReference46::m);

test/langtools/tools/javac/lambda/MethodReference47.java

@@ -25,7 +25,7 @@ public class MethodReference47 {
     static void g2(SAM1 s) { }
     static void g2(SAM2 s) { }
 
-    public static void main(String[] args) {
+    public static void meth() {
         g1(MethodReference47::m);
         g2(MethodReference47::m);
     }

test/langtools/tools/javac/lambda/MethodReference48.java

@@ -34,7 +34,7 @@ public class MethodReference48 {
     static void g4(SAM2 s) { } //ok
     static void g4(SAM3 s) { } //ok
 
-    public static void main(String[] args) {
+    public static void meth() {
         g1(Foo::m);
         g2(Foo::m);
         g3(Foo::m);

test/langtools/tools/javac/lambda/MethodReference60.java

@@ -22,7 +22,7 @@ public class MethodReference60 {
         X make(String s);
     }
 
-    public static void main(String[] args) {
+    public static void meth() {
         BadArrayFactory1<int[]> factory1 = int[]::new; //param mismatch
         BadArrayFactory2<int[]> factory2 = int[]::new; //param mismatch
         BadArrayFactory3<int[]> factory3 = int[]::new; //param mismatch

test/langtools/tools/javac/lambda/MostSpecific04.java

@@ -20,7 +20,7 @@ public class MostSpecific04 {
         void map(LongMapper<? super E> m) { }
     }
 
-    public static void main(String[] args) {
+    public static void meth() {
         MyList<String> ls = new MyList<String>();
         ls.map(e->e.length()); //ambiguous - implicit
         ls.map((String e)->e.length()); //ok

test/langtools/tools/javac/lambda/MostSpecific05.java

@@ -20,7 +20,7 @@ public class MostSpecific05 {
         void map(NumberConverter<? extends B> m) { }
     }
 
-    public static void main(String[] args) {
+    public static void meth() {
         MyMapper<Number, Double> mm = new MyMapper<Number, Double>();
         mm.map(e->1.0); //ambiguous - implicit
         mm.map((Object e)->1.0); //ok

test/langtools/tools/javac/lambda/funcInterfaces/LambdaTest2_neg1.java

@@ -9,7 +9,7 @@
 
 public class LambdaTest2_neg1 {
 
-    public static void main(String[] args) {
+    public static void meth() {
         LambdaTest2_neg1 test = new LambdaTest2_neg1();
         //not convertible - QooRoo is not a SAM
         test.methodQooRoo((Integer i) -> { });

test/langtools/tools/javac/lambda/methodReference/MethodRefIntColonColonNewTest.java

@@ -13,7 +13,7 @@ public class MethodRefIntColonColonNewTest {
 
     static <T> SAM<T> infmethod(SAM<T> t) { return t; }
 
-    public static void main(String argv[]) {
+    public static void meth() {
         SAM<Object> s = infmethod(int::new);
         s.m();
     }

test/langtools/tools/javac/lambda/methodReference/MethodRefToInnerWithoutOuter.java

@@ -17,7 +17,7 @@ class MethodRefToInnerBase {
     }
 }
 public class MethodRefToInnerWithoutOuter extends MethodRefToInnerBase {
-    public static void main(String[] args) {
+    public static void meth() {
         List<String> list = new ArrayList<>();
         list.stream().forEach(TestString::new);
     }