Clean up CompilerTestCase.

1. Make all fields private. 2. Remove dead parameters from setters. 3. Ensure subclasses all call super.setUp(). 4. Move a bunch of initialization from constructor into setUp(). 5. Make it an error to initialize subclasses before setUp(). ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=158091476
google · Jun 6, 2017 · 05b267d · 05b267d
1 parent 8b406d6
commit 05b267d
Show file tree

Hide file tree

Showing 129 changed files with 786 additions and 696 deletions.
diff --git a/test/com/google/javascript/jscomp/AggressiveInlineAliasesTest.java b/test/com/google/javascript/jscomp/AggressiveInlineAliasesTest.java
@@ -41,7 +41,8 @@ protected CompilerPass getProcessor(Compiler compiler) {
   }
 
   @Override
-  public void setUp() {
+  protected void setUp() throws Exception {
+    super.setUp();
     enableNormalize();
   }
 
@@ -450,8 +451,6 @@ public void testGlobalWriteToNonAncestor() {
   }
 
   public void testInlineCtorInObjLit() {
-    compareJsDoc = true;
-
     test(
         LINE_JOINER.join("function Foo() {}", "var Bar = Foo;", "var objlit = { 'prop' : Bar };"),
         LINE_JOINER.join("function Foo() {}", "var Bar = null;", "var objlit = { 'prop': Foo };"));

diff --git a/test/com/google/javascript/jscomp/AmbiguatePropertiesTest.java b/test/com/google/javascript/jscomp/AmbiguatePropertiesTest.java
@@ -39,6 +39,11 @@ public final class AmbiguatePropertiesTest extends CompilerTestCase {
 
   public AmbiguatePropertiesTest() {
     super(EXTERNS);
+  }
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
     enableNormalize();
     enableTypeCheck();
     enableClosurePass();

diff --git a/test/com/google/javascript/jscomp/AngularPassTest.java b/test/com/google/javascript/jscomp/AngularPassTest.java
@@ -24,7 +24,8 @@
 public final class AngularPassTest extends CompilerTestCase {
 
   @Override
-  public void setUp() {
+  protected void setUp() throws Exception {
+    super.setUp();
     setAcceptedLanguage(LanguageMode.ECMASCRIPT_2017);
   }
 

diff --git a/test/com/google/javascript/jscomp/AstValidatorTest.java b/test/com/google/javascript/jscomp/AstValidatorTest.java
@@ -53,10 +53,10 @@ protected int getNumRepetitions() {
 
   @Override
   protected void setUp() throws Exception {
-    super.enableAstValidation(false);
-    super.disableNormalize();
-    super.enableLineNumberCheck(false);
     super.setUp();
+    disableAstValidation();
+    disableNormalize();
+    disableLineNumberCheck();
   }
 
   public void testForIn() {

diff --git a/test/com/google/javascript/jscomp/CheckAccessControlsPolymerTest.java b/test/com/google/javascript/jscomp/CheckAccessControlsPolymerTest.java
@@ -31,9 +31,14 @@ public final class CheckAccessControlsPolymerTest extends TypeICompilerTestCase
 
   public CheckAccessControlsPolymerTest() {
     super(EXTERNS);
-    parseTypeInfo = true;
+  }
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    enableParseTypeInfo();
     enablePolymerPass();
-    allowExternsChanges(true);
+    allowExternsChanges();
   }
 
   @Override

diff --git a/test/com/google/javascript/jscomp/CheckAccessControlsTest.java b/test/com/google/javascript/jscomp/CheckAccessControlsTest.java
@@ -55,7 +55,12 @@ public final class CheckAccessControlsTest extends TypeICompilerTestCase {
 
   public CheckAccessControlsTest() {
     super(CompilerTypeTestCase.DEFAULT_EXTERNS);
-    parseTypeInfo = true;
+  }
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    enableParseTypeInfo();
     enableClosurePass();
     enableRewriteClosureCode();
   }

diff --git a/test/com/google/javascript/jscomp/CheckConformanceTest.java b/test/com/google/javascript/jscomp/CheckConformanceTest.java
@@ -70,18 +70,18 @@ public final class CheckConformanceTest extends TypeICompilerTestCase {
           "}");
 
   public CheckConformanceTest() {
-    super(EXTERNS, true);
-    enableTranspile();
-    enableClosurePass();
-    enableClosurePassForExpected();
-    enableRewriteClosureCode();
-    setLanguage(LanguageMode.ECMASCRIPT_2015, LanguageMode.ECMASCRIPT5_STRICT);
+    super(EXTERNS);
   }
 
   @Override
   protected void setUp() throws Exception {
     super.setUp();
-    super.enableClosurePass();
+    enableTranspile();
+    enableClosurePass();
+    enableClosurePassForExpected();
+    enableRewriteClosureCode();
+    setLanguage(LanguageMode.ECMASCRIPT_2015, LanguageMode.ECMASCRIPT5_STRICT);
+    enableClosurePass();
     configuration = DEFAULT_CONFORMANCE;
     ignoreWarnings(DiagnosticGroups.MISSING_PROPERTIES);
   }

diff --git a/test/com/google/javascript/jscomp/CheckGlobalNamesTest.java b/test/com/google/javascript/jscomp/CheckGlobalNamesTest.java
@@ -66,7 +66,8 @@ public void process(Node externs, Node js) {
   }
 
   @Override
-  public void setUp() {
+  protected void setUp() throws Exception {
+    super.setUp();
     injectNamespace = false;
     setAcceptedLanguage(LanguageMode.ECMASCRIPT_2015);
   }

diff --git a/test/com/google/javascript/jscomp/CheckGlobalThisTest.java b/test/com/google/javascript/jscomp/CheckGlobalThisTest.java
@@ -22,8 +22,11 @@
  * Tests {@link CheckGlobalThis}.
  */
 public final class CheckGlobalThisTest extends CompilerTestCase {
-  public CheckGlobalThisTest() {
-    this.parseTypeInfo = true;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    enableParseTypeInfo();
   }
 
   @Override

diff --git a/test/com/google/javascript/jscomp/CheckJsDocTest.java b/test/com/google/javascript/jscomp/CheckJsDocTest.java
@@ -41,7 +41,8 @@ protected CompilerPass getProcessor(final Compiler compiler) {
   }
 
   @Override
-  public void setUp() {
+  protected void setUp() throws Exception {
+    super.setUp();
     setAcceptedLanguage(LanguageMode.ECMASCRIPT_2017);
   }
 

diff --git a/test/com/google/javascript/jscomp/CheckMissingGetCssNameTest.java b/test/com/google/javascript/jscomp/CheckMissingGetCssNameTest.java
@@ -30,7 +30,8 @@ protected CompilerPass getProcessor(final Compiler compiler) {
   }
 
   @Override
-  public void setUp() {
+  protected void setUp() throws Exception {
+    super.setUp();
     setAcceptedLanguage(LanguageMode.ECMASCRIPT_2017);
   }
 

diff --git a/test/com/google/javascript/jscomp/CheckMissingReturnTest.java b/test/com/google/javascript/jscomp/CheckMissingReturnTest.java
@@ -24,7 +24,9 @@
  */
 public final class CheckMissingReturnTest extends CompilerTestCase {
 
-  public CheckMissingReturnTest() {
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
     enableTypeCheck();
   }
 

diff --git a/test/com/google/javascript/jscomp/CheckMissingSuperTest.java b/test/com/google/javascript/jscomp/CheckMissingSuperTest.java
@@ -27,7 +27,8 @@ protected CompilerPass getProcessor(Compiler compiler) {
   }
 
   @Override
-  public void setUp() {
+  protected void setUp() throws Exception {
+    super.setUp();
     setAcceptedLanguage(LanguageMode.ECMASCRIPT_2017);
   }
 

diff --git a/test/com/google/javascript/jscomp/CheckProvidesTest.java b/test/com/google/javascript/jscomp/CheckProvidesTest.java
@@ -25,7 +25,8 @@
  */
 public final class CheckProvidesTest extends CompilerTestCase {
   @Override
-  public void setUp() {
+  protected void setUp() throws Exception {
+    super.setUp();
     setAcceptedLanguage(LanguageMode.ECMASCRIPT_2017);
   }
 

diff --git a/test/com/google/javascript/jscomp/CheckRegExpTest.java b/test/com/google/javascript/jscomp/CheckRegExpTest.java
@@ -25,7 +25,7 @@ public final class CheckRegExpTest extends CompilerTestCase {
   CheckRegExp last = null;
 
   public CheckRegExpTest() {
-    super("var RegExp;", true);
+    super("var RegExp;");
   }
 
   @Override

diff --git a/test/com/google/javascript/jscomp/CheckSideEffectsTest.java b/test/com/google/javascript/jscomp/CheckSideEffectsTest.java
@@ -19,15 +19,13 @@
 import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
 
 public final class CheckSideEffectsTest extends CompilerTestCase {
-  public CheckSideEffectsTest() {
-    this.parseTypeInfo = true;
-    allowExternsChanges(true);
-  }
 
   @Override
-  public void setUp() throws Exception {
+  protected void setUp() throws Exception {
     super.setUp();
     setAcceptedLanguage(LanguageMode.ECMASCRIPT_2017);
+    enableParseTypeInfo();
+    allowExternsChanges();
   }
 
   @Override

diff --git a/test/com/google/javascript/jscomp/CheckSuspiciousCodeTest.java b/test/com/google/javascript/jscomp/CheckSuspiciousCodeTest.java
@@ -22,9 +22,6 @@
  * Tests for CheckSuspiciousCode
  */
 public final class CheckSuspiciousCodeTest extends CompilerTestCase {
-  public CheckSuspiciousCodeTest() {
-    this.parseTypeInfo = true;
-  }
 
   @Override
   protected CompilerPass getProcessor(Compiler compiler) {
@@ -33,8 +30,10 @@ protected CompilerPass getProcessor(Compiler compiler) {
   }
 
   @Override
-  public void setUp() {
+  protected void setUp() throws Exception {
+    super.setUp();
     setAcceptedLanguage(LanguageMode.ECMASCRIPT_2017);
+    enableParseTypeInfo();
   }
 
   @Override

diff --git a/test/com/google/javascript/jscomp/CheckTemplateParamsTest.java b/test/com/google/javascript/jscomp/CheckTemplateParamsTest.java
@@ -17,7 +17,6 @@
 package com.google.javascript.jscomp;
 
 import com.google.javascript.rhino.Node;
-import java.io.IOException;
 
 /**
  * Tests for the "Too many template parameters" warning. Ideally this would be part of
@@ -26,7 +25,8 @@
  */
 public final class CheckTemplateParamsTest extends CompilerTestCase {
   @Override
-  public void setUp() throws IOException {
+  protected void setUp() throws Exception {
+    super.setUp();
     enableTypeCheck();
   }
 

diff --git a/test/com/google/javascript/jscomp/CheckUnreachableCodeTest.java b/test/com/google/javascript/jscomp/CheckUnreachableCodeTest.java
@@ -30,7 +30,8 @@ protected CompilerPass getProcessor(Compiler compiler) {
   }
 
   @Override
-  public void setUp() {
+  public void setUp() throws Exception {
+    super.setUp();
     setAcceptedLanguage(LanguageMode.ECMASCRIPT_2017);
   }
 

diff --git a/test/com/google/javascript/jscomp/CheckUnusedPrivatePropertiesInPolymerElementTest.java b/test/com/google/javascript/jscomp/CheckUnusedPrivatePropertiesInPolymerElementTest.java
@@ -34,13 +34,13 @@ public final class CheckUnusedPrivatePropertiesInPolymerElementTest
 
   public CheckUnusedPrivatePropertiesInPolymerElementTest() {
     super(EXTERNS);
-    enableGatherExternProperties();
-    setAcceptedLanguage(LanguageMode.ECMASCRIPT_NEXT);
   }
 
   @Override
   protected void setUp() throws Exception {
     super.setUp();
+    enableGatherExternProperties();
+    setAcceptedLanguage(LanguageMode.ECMASCRIPT_NEXT);
   }
 
   @Override
@@ -71,7 +71,7 @@ protected int getNumRepetitions() {
   }
 
   public void testPolymerPropertyUsedAsObserver1() {
-    allowExternsChanges(true);
+    allowExternsChanges();
     testNoWarning(
         LINE_JOINER.join(
             "Polymer({",
@@ -89,7 +89,7 @@ public void testPolymerPropertyUsedAsObserver1() {
   }
 
   public void testPolymerPropertyUsedAsObserver2() {
-    allowExternsChanges(true);
+    allowExternsChanges();
     testNoWarning(
         LINE_JOINER.join(
             "Polymer({",
@@ -107,7 +107,7 @@ public void testPolymerPropertyUsedAsObserver2() {
   }
 
   public void testBehaviorPropertyUsedAsObserver() {
-    allowExternsChanges(true);
+    allowExternsChanges();
     test(
         new String[] {
             LINE_JOINER.join(

diff --git a/test/com/google/javascript/jscomp/CheckUnusedPrivatePropertiesTest.java b/test/com/google/javascript/jscomp/CheckUnusedPrivatePropertiesTest.java
@@ -40,6 +40,11 @@ public final class CheckUnusedPrivatePropertiesTest extends TypeICompilerTestCas
 
   public CheckUnusedPrivatePropertiesTest() {
     super(EXTERNS);
+  }
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
     enableGatherExternProperties();
     setAcceptedLanguage(LanguageMode.ECMASCRIPT_2015);
   }

diff --git a/test/com/google/javascript/jscomp/ClosureCheckModuleTest.java b/test/com/google/javascript/jscomp/ClosureCheckModuleTest.java
@@ -42,7 +42,8 @@ protected CompilerPass getProcessor(Compiler compiler) {
   }
 
   @Override
-  public void setUp() {
+  protected void setUp() throws Exception {
+    super.setUp();
     setLanguage(LanguageMode.ECMASCRIPT_NEXT, LanguageMode.ECMASCRIPT_NEXT);
   }
 

diff --git a/test/com/google/javascript/jscomp/ClosureRewriteClassTest.java b/test/com/google/javascript/jscomp/ClosureRewriteClassTest.java
@@ -54,8 +54,7 @@ protected CompilerPass getProcessor(Compiler compiler) {
   protected void setUp() throws Exception {
     super.setUp();
     disableTypeCheck();
-    runTypeCheckAfterProcessing = true;
-    compareJsDoc = true;
+    enableRunTypeCheckAfterProcessing();
   }
 
   @Override

diff --git a/test/com/google/javascript/jscomp/ClosureRewriteModuleTest.java b/test/com/google/javascript/jscomp/ClosureRewriteModuleTest.java
@@ -51,7 +51,8 @@ protected int getNumRepetitions() {
   }
 
   @Override
-  public void setUp() {
+  protected void setUp() throws Exception {
+    super.setUp();
     setAcceptedLanguage(LanguageMode.ECMASCRIPT_2017);
   }
 
@@ -104,7 +105,7 @@ public void testBasic3() {
   }
 
   public void testIjsModule() {
-    allowExternsChanges(true);
+    allowExternsChanges();
     test(
         // .i.js file
         "goog.module('external'); /** @constructor */ exports = function() {};",
@@ -2129,7 +2130,7 @@ public void testMultiplyExportedSymbolDoesntCrash() {
   }
 
   public void testIjsFileInExterns() {
-    allowExternsChanges(true);
+    allowExternsChanges();
     test(
         LINE_JOINER.join(
             "/** @externs */",

diff --git a/test/com/google/javascript/jscomp/CoalesceVariableNamesTest.java b/test/com/google/javascript/jscomp/CoalesceVariableNamesTest.java
@@ -34,7 +34,8 @@ protected int getNumRepetitions() {
   }
 
   @Override
-  public void setUp() {
+  protected void setUp() throws Exception {
+    super.setUp();
     usePseudoName = false;
   }
 

diff --git a/test/com/google/javascript/jscomp/CodePrinterEs6TypedTest.java b/test/com/google/javascript/jscomp/CodePrinterEs6TypedTest.java
@@ -28,7 +28,7 @@
 public final class CodePrinterEs6TypedTest extends CodePrinterTestBase {
 
   @Override
-  public void setUp() {
+  protected void setUp() throws Exception {
     super.setUp();
     languageMode = LanguageMode.ECMASCRIPT6_TYPED;
   }

diff --git a/test/com/google/javascript/jscomp/CodePrinterTestBase.java b/test/com/google/javascript/jscomp/CodePrinterTestBase.java
@@ -32,7 +32,9 @@ public abstract class CodePrinterTestBase extends TestCase {
   protected LanguageMode languageMode = LanguageMode.ECMASCRIPT5;
   protected Compiler lastCompiler = null;
 
-  @Override public void setUp() {
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
     allowWarnings = false;
     preserveTypeAnnotations = false;
     trustedStrings = true;