Disinherit "tests/com/google/javascript/jscomp/....java" from `TestCa…

…se`.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=218870829

test/com/google/javascript/jscomp/AstFactoryTest.java

@@ -31,22 +31,19 @@
 import com.google.javascript.rhino.jstype.JSTypeNative;
 import com.google.javascript.rhino.jstype.JSTypeRegistry;
 import com.google.javascript.rhino.jstype.ObjectType;
-import junit.framework.TestCase;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
-public class AstFactoryTest extends TestCase {
+public class AstFactoryTest {
   private static final Joiner LINE_JOINER = Joiner.on('\n');
 
   private Compiler compiler;
 
-  @Override
   @Before
   public void setUp() throws Exception {
-    super.setUp();
     compiler = new Compiler();
   }
 

test/com/google/javascript/jscomp/BaseReplaceScriptTestCase.java

@@ -26,10 +26,9 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
-import junit.framework.TestCase;
 import org.junit.Before;
 
-public abstract class BaseReplaceScriptTestCase extends TestCase {
+public abstract class BaseReplaceScriptTestCase {
   protected static final Joiner LINE_JOINER = Joiner.on('\n');
 
   protected static final String CLOSURE_BASE =
@@ -57,10 +56,8 @@ public abstract class BaseReplaceScriptTestCase extends TestCase {
    */
   protected ImmutableList<SourceFile> testExterns = EXTVAR_EXTERNS;
 
-  @Override
   @Before
   public void setUp() throws Exception {
-    super.setUp();
     testExterns = EXTVAR_EXTERNS;
   }
 

test/com/google/javascript/jscomp/ChangeVerifierTest.java

@@ -22,13 +22,12 @@
 
 import com.google.javascript.rhino.IR;
 import com.google.javascript.rhino.Node;
-import junit.framework.TestCase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
-public final class ChangeVerifierTest extends TestCase {
+public final class ChangeVerifierTest {
 
   @Test
   public void testCorrectValidationOfScriptWithChangeAfterFunction() {
@@ -131,7 +130,8 @@ public void testNotDeletedFunction() {
     }
   }
 
-  public static void testChangeVerification() {
+  @Test
+  public void testChangeVerification() {
     Compiler compiler = new Compiler();
 
     Node mainScript = IR.script();

test/com/google/javascript/jscomp/CheckPathsBetweenNodesTest.java

@@ -23,7 +23,6 @@
 import com.google.javascript.jscomp.graph.DiGraph;
 import com.google.javascript.jscomp.graph.DiGraph.DiGraphEdge;
 import com.google.javascript.jscomp.graph.LinkedDirectedGraph;
-import junit.framework.TestCase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -33,7 +32,7 @@
  *
  */
 @RunWith(JUnit4.class)
-public final class CheckPathsBetweenNodesTest extends TestCase {
+public final class CheckPathsBetweenNodesTest {
 
   /**
    * Predicate satisfied by strings with a given prefix.

test/com/google/javascript/jscomp/CleanupPassesTest.java

@@ -19,14 +19,13 @@
 import static com.google.common.truth.Truth.assertWithMessage;
 
 import java.util.List;
-import junit.framework.TestCase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 /** @author tylerg@google.com (Tyler Goodwin) */
 @RunWith(JUnit4.class)
-public final class CleanupPassesTest extends TestCase {
+public final class CleanupPassesTest {
 
   private final AbstractCompiler compiler = new Compiler();
   private final CompilerOptions options = new CompilerOptions();

test/com/google/javascript/jscomp/ClosureCodingConventionTest.java

@@ -25,14 +25,13 @@
 import com.google.javascript.rhino.jstype.FunctionType;
 import com.google.javascript.rhino.jstype.JSTypeRegistry;
 import com.google.javascript.rhino.jstype.NominalTypeBuilderOti;
-import junit.framework.TestCase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 /** Test class for {@link GoogleCodingConvention}. */
 @RunWith(JUnit4.class)
-public final class ClosureCodingConventionTest extends TestCase {
+public final class ClosureCodingConventionTest {
   private final ClosureCodingConvention conv = new ClosureCodingConvention();
 
   @Test

test/com/google/javascript/jscomp/CodePrinterEs6TypedTest.java

@@ -19,6 +19,7 @@
 
 import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -72,7 +73,9 @@ public void testFunctionParamDeclaration_defaultValue() {
     assertPrettyPrintSame("function foo(x: string = 'hello') {\n}");
   }
 
-  public void disabled_testFunctionParamDeclaration_arrow() {
+  @Test
+  @Ignore
+  public void testFunctionParamDeclaration_arrow() {
     assertPrettyPrintSame("(x: string) => 'hello' + x;");
   }
 
@@ -81,7 +84,9 @@ public void testFunctionReturn() {
     assertPrettyPrintSame("function foo(): string {\n  return 'hello';\n}");
   }
 
-  public void disabled_testFunctionReturn_arrow() {
+  @Test
+  @Ignore
+  public void testFunctionReturn_arrow() {
     assertPrettyPrintSame("(): string => 'hello';");
   }
 

test/com/google/javascript/jscomp/CodePrinterTest.java

@@ -1793,20 +1793,24 @@ void setOptions(CompilerOptions options) {
   }
 
   private void assertTypeAnnotations(String js, String expected) {
-    assertEquals(
-        expected,
+    String actual =
         new CodePrinter.Builder(parse(js, /* typeChecked= */ true))
-            .setCompilerOptions(newCompilerOptions(new CompilerOptionBuilder() {
-              @Override
-              void setOptions(CompilerOptions options) {
-                options.setPrettyPrint(true);
-                options.setLineBreak(false);
-                options.setLineLengthThreshold(CompilerOptions.DEFAULT_LINE_LENGTH_THRESHOLD);
-              }
-            }))
+            .setCompilerOptions(
+                newCompilerOptions(
+                    new CompilerOptionBuilder() {
+                      @Override
+                      void setOptions(CompilerOptions options) {
+                        options.setPrettyPrint(true);
+                        options.setLineBreak(false);
+                        options.setLineLengthThreshold(
+                            CompilerOptions.DEFAULT_LINE_LENGTH_THRESHOLD);
+                      }
+                    }))
             .setOutputTypes(true)
             .setTypeRegistry(lastCompiler.getTypeRegistry())
-            .build());
+            .build();
+
+    assertThat(actual).isEqualTo(expected);
   }
 
   @Test

test/com/google/javascript/jscomp/CodePrinterTestBase.java

@@ -21,11 +21,10 @@
 import com.google.common.collect.ImmutableList;
 import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
 import com.google.javascript.rhino.Node;
-import junit.framework.TestCase;
 import org.junit.Before;
 
 /** Base class for tests that exercise {@link CodePrinter}. */
-public abstract class CodePrinterTestBase extends TestCase {
+public abstract class CodePrinterTestBase {
   // If this is set, ignore parse warnings and only fail the test
   // for parse errors.
   protected boolean allowWarnings = false;
@@ -34,10 +33,8 @@ public abstract class CodePrinterTestBase extends TestCase {
   protected LanguageMode languageMode = LanguageMode.ECMASCRIPT5;
   protected Compiler lastCompiler = null;
 
-  @Override
   @Before
   public void setUp() throws Exception {
-    super.setUp();
     allowWarnings = false;
     preserveTypeAnnotations = false;
     trustedStrings = true;