Delete methods accepting DiagnosticTypes in IntegrationTestCase

lauraharker · copybara-github · commit 0c34ece8ef52 · 2020-07-13T15:59:17.000-07:00
PiperOrigin-RevId: 321051603
diff --git a/src/com/google/javascript/jscomp/DiagnosticGroups.java b/src/com/google/javascript/jscomp/DiagnosticGroups.java
@@ -148,6 +148,7 @@ public static DiagnosticGroup forName(String name) {
           + "missingReturn, "
           + "missingSourcesWarnings, "
           + "moduleLoad, "
+          + "moduleImports, "
           + "msgDescriptions, "
           + "nonStandardJsDocs, "
           + "partialAlias, "
@@ -182,12 +183,19 @@ public static DiagnosticGroup forName(String name) {
           "featuresNotSupportedByPass", PhaseOptimizer.FEATURES_NOT_SUPPORTED_BY_PASS);
 
   public static final DiagnosticGroup MODULE_LOAD =
-      DiagnosticGroups.registerGroup("moduleLoad",
+      DiagnosticGroups.registerGroup(
+          "moduleLoad",
           ModuleLoader.LOAD_WARNING,
           ModuleMapCreator.MISSING_NAMESPACE_IMPORT,
           ProcessCommonJSModules.SUSPICIOUS_EXPORTS_ASSIGNMENT,
           ProcessCommonJSModules.UNKNOWN_REQUIRE_ENSURE);
 
+  public static final DiagnosticGroup MODULE_IMPORT =
+      DiagnosticGroups.registerGroup( // undocumented
+          "moduleImport",
+          ModuleMapCreator.DOES_NOT_HAVE_EXPORT,
+          ModuleMapCreator.DOES_NOT_HAVE_EXPORT_WITH_DETAILS);
+
   public static final DiagnosticGroup GLOBAL_THIS =
       DiagnosticGroups.registerGroup("globalThis",
           CheckGlobalThis.GLOBAL_THIS);
@@ -714,6 +722,10 @@ public static DiagnosticGroup forName(String name) {
   public static final DiagnosticGroup INVALID_CONST_PARAM =
       DiagnosticGroups.registerUnsuppressibleGroup(ConstParamCheck.CONST_NOT_STRING_LITERAL_ERROR);
 
+  public static final DiagnosticGroup CANNOT_TRANSPILE_FEATURE =
+      DiagnosticGroups.registerUnsuppressibleGroup(
+          Es6ToEs3Util.CANNOT_CONVERT, Es6ToEs3Util.CANNOT_CONVERT_YET);
+
   public static final DiagnosticGroup MISSING_POLYFILL =
       DiagnosticGroups.registerGroup(
           "missingPolyfill", RewritePolyfills.INSUFFICIENT_OUTPUT_VERSION_ERROR);
diff --git a/test/com/google/javascript/jscomp/integration/AdvancedOptimizationsIntegrationTest.java b/test/com/google/javascript/jscomp/integration/AdvancedOptimizationsIntegrationTest.java
@@ -36,11 +36,9 @@
 import com.google.javascript.jscomp.DiagnosticGroup;
 import com.google.javascript.jscomp.DiagnosticGroupWarningsGuard;
 import com.google.javascript.jscomp.DiagnosticGroups;
-import com.google.javascript.jscomp.Es6ToEs3Util;
 import com.google.javascript.jscomp.GoogleCodingConvention;
 import com.google.javascript.jscomp.PropertyRenamingPolicy;
 import com.google.javascript.jscomp.SourceFile;
-import com.google.javascript.jscomp.TypeCheck;
 import com.google.javascript.jscomp.VariableRenamingPolicy;
 import com.google.javascript.jscomp.WarningLevel;
 import com.google.javascript.jscomp.testing.NoninjectingCompiler;
@@ -417,7 +415,7 @@ public void testBug139862607() {
         options,
         new String[] {lines("var x = 1;"), lines("import * as y from './i0.js';", "const z = y.x")},
         // Property x never defined on module$i0
-        TypeCheck.INEXISTENT_PROPERTY);
+        DiagnosticGroups.MISSING_PROPERTIES);
   }
 
   @Test
@@ -1851,7 +1849,7 @@ public void testImportMeta() {
     CompilationLevel.ADVANCED_OPTIMIZATIONS.setOptionsForCompilationLevel(options);
     options.setLanguage(LanguageMode.ECMASCRIPT_NEXT);
 
-    test(options, "import.meta", Es6ToEs3Util.CANNOT_CONVERT);
+    test(options, "import.meta", DiagnosticGroups.CANNOT_TRANSPILE_FEATURE);
   }
 
   @Test
diff --git a/test/com/google/javascript/jscomp/integration/CommonJSIntegrationTest.java b/test/com/google/javascript/jscomp/integration/CommonJSIntegrationTest.java
@@ -23,7 +23,6 @@
 import com.google.javascript.jscomp.GoogleCodingConvention;
 import com.google.javascript.jscomp.WarningLevel;
 import com.google.javascript.jscomp.deps.ModuleLoader;
-import com.google.javascript.jscomp.modules.ModuleMapCreator;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -391,7 +390,7 @@ public void testEsModuleImportNonDefaultFromCJS() {
           "module.exports = {foo: 1, bar: function() { return 'bar'; }};",
           "import {foo} from './i0';"
         },
-        ModuleMapCreator.DOES_NOT_HAVE_EXPORT);
+        DiagnosticGroups.MODULE_IMPORT);
   }
 
   @Test
diff --git a/test/com/google/javascript/jscomp/integration/IntegrationTest.java b/test/com/google/javascript/jscomp/integration/IntegrationTest.java
@@ -39,14 +39,11 @@
 import com.google.javascript.jscomp.CompilerPass;
 import com.google.javascript.jscomp.CrossChunkMethodMotion;
 import com.google.javascript.jscomp.CustomPassExecutionTime;
+import com.google.javascript.jscomp.DiagnosticGroup;
 import com.google.javascript.jscomp.DiagnosticGroupWarningsGuard;
 import com.google.javascript.jscomp.DiagnosticGroups;
-import com.google.javascript.jscomp.DiagnosticType;
 import com.google.javascript.jscomp.EmptyMessageBundle;
-import com.google.javascript.jscomp.Es6ToEs3Util;
 import com.google.javascript.jscomp.GoogleCodingConvention;
-import com.google.javascript.jscomp.MarkUntranspilableFeaturesAsRemoved;
-import com.google.javascript.jscomp.PropertyRenamingDiagnostics;
 import com.google.javascript.jscomp.PropertyRenamingPolicy;
 import com.google.javascript.jscomp.RenamingMap;
 import com.google.javascript.jscomp.SourceFile;
@@ -1355,7 +1352,7 @@ public void testDisambiguatePropertiesWithPropertyInvalidationError() {
             "Foo.prototype.a = function(x) {};",
             "function Bar(){}",
             "Bar.prototype.a=function(x){};"),
-        PropertyRenamingDiagnostics.INVALIDATION);
+        DiagnosticGroups.TYPE_INVALIDATION);
   }
 
   @Test
@@ -3777,9 +3774,18 @@ public void testGithubIssue2874() {
   public void testDestructuringCannotConvert() {
     CompilerOptions options = createCompilerOptions();
 
-    test(options, "for (var   [x] = [], {y} = {}, z = 2;;) {}", Es6ToEs3Util.CANNOT_CONVERT_YET);
-    test(options, "for (let   [x] = [], {y} = {}, z = 2;;) {}", Es6ToEs3Util.CANNOT_CONVERT_YET);
-    test(options, "for (const [x] = [], {y} = {}, z = 2;;) {}", Es6ToEs3Util.CANNOT_CONVERT_YET);
+    test(
+        options,
+        "for (var   [x] = [], {y} = {}, z = 2;;) {}",
+        DiagnosticGroups.CANNOT_TRANSPILE_FEATURE);
+    test(
+        options,
+        "for (let   [x] = [], {y} = {}, z = 2;;) {}",
+        DiagnosticGroups.CANNOT_TRANSPILE_FEATURE);
+    test(
+        options,
+        "for (const [x] = [], {y} = {}, z = 2;;) {}",
+        DiagnosticGroups.CANNOT_TRANSPILE_FEATURE);
   }
 
   @Test
@@ -4224,8 +4230,7 @@ public void testBrowserFeaturesetYear2020() {
             + "const {foo,...bar}={foo:10,bar:20,...{baz:30}};console.log(foo);console.log(bar)");
 
     // But we won't emit ES 2018 regexp features.
-    DiagnosticType untranspilable =
-        MarkUntranspilableFeaturesAsRemoved.UNTRANSPILABLE_FEATURE_PRESENT;
+    DiagnosticGroup untranspilable = DiagnosticGroups.UNSTRANSPILABLE_FEATURES;
     test(options, lines(googDefine, "/foo/s"), untranspilable);
     test(options, lines(googDefine, "/(?<foo>.)/"), untranspilable);
     test(options, lines(googDefine, "/(?<=foo)/"), untranspilable);
diff --git a/test/com/google/javascript/jscomp/integration/IntegrationTestCase.java b/test/com/google/javascript/jscomp/integration/IntegrationTestCase.java
@@ -18,7 +18,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
-import static com.google.javascript.jscomp.testing.JSErrorSubject.assertError;
 import static com.google.javascript.rhino.testing.NodeSubject.assertNode;
 
 import com.google.common.base.Joiner;
@@ -205,15 +204,11 @@ protected void test(CompilerOptions options,
     }
   }
 
-  // TODO(lharker): delete all the methods checking for a DiagnosticType after migrating existing
-  // usages.
   /** Asserts that when compiling with the given compiler options, there is an error or warning. */
   protected void test(CompilerOptions options, String original, DiagnosticGroup warning) {
     test(options, new String[] {original}, null, warning);
   }
 
-  // TODO(lharker): delete all the methods checking for a DiagnosticType after migrating existing
-  // usages.
   /** Asserts that when compiling with the given compiler options, there is an error or warning. */
   protected void test(
       CompilerOptions options, String original, String compiled, DiagnosticGroup warning) {
@@ -225,55 +220,6 @@ protected void test(CompilerOptions options, String[] original, DiagnosticGroup
     test(options, original, null, warning);
   }
 
-  /**
-   * Asserts that when compiling with the given compiler options, there is an error or warning.
-   *
-   * @deprecated prefer to check for the corresponding DiagnosticGroup
-   */
-  @Deprecated
-  protected void test(CompilerOptions options, String original, DiagnosticType warning) {
-    test(options, new String[] {original}, warning);
-  }
-
-  /** @deprecated prefer to check for the corresponding DiagnosticGroup */
-  @Deprecated
-  protected void test(
-      CompilerOptions options, String original, String compiled, DiagnosticType warning) {
-    test(options, new String[] {original}, new String[] {compiled}, warning);
-  }
-
-  /** @deprecated prefer to check for the corresponding DiagnosticGroup */
-  @Deprecated
-  protected void test(CompilerOptions options, String[] original, DiagnosticType warning) {
-    test(options, original, null, warning);
-  }
-
-  /**
-   * Asserts that when compiling with the given compiler options, there is an error or warning.
-   *
-   * @deprecated prefer to check for the corresponding DiagnosticGroup
-   */
-  @Deprecated
-  protected void test(
-      CompilerOptions options, String[] original, String[] compiled, DiagnosticType warning) {
-    Compiler compiler = compile(options, original);
-    checkUnexpectedErrorsOrWarnings(compiler, 1);
-    assertWithMessage("Expected exactly one warning or error")
-        .that(compiler.getErrors().size() + compiler.getWarnings().size())
-        .isEqualTo(1);
-    if (!compiler.getErrors().isEmpty()) {
-      assertError(compiler.getErrors().get(0)).hasType(warning);
-    } else {
-      assertError(compiler.getWarnings().get(0)).hasType(warning);
-    }
-
-    if (compiled != null) {
-      Node root = compiler.getRoot().getLastChild();
-      Node expectedRoot = parseExpectedCode(compiled, options);
-      assertNode(root).usingSerializer(compiler::toSource).isEqualTo(expectedRoot);
-    }
-  }
-
   /** Asserts that when compiling with the given compiler options, there is an error or warning. */
   protected void test(
       CompilerOptions options, String[] original, String[] compiled, DiagnosticGroup[] warnings) {
