Remove NTI support from TypeICompilerTestCase

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=194319639
google · Apr 26, 2018 · e6ad97f · e6ad97f
1 parent 5f359c3
commit e6ad97f
Show file tree

Hide file tree

Showing 37 changed files with 200 additions and 437 deletions.
diff --git a/test/com/google/javascript/jscomp/AmbiguatePropertiesTest.java b/test/com/google/javascript/jscomp/AmbiguatePropertiesTest.java
@@ -49,7 +49,6 @@ protected void setUp() throws Exception {
     enableNormalize();
     enableClosurePass();
     enableGatherExternProperties();
-    this.mode = TypeInferenceMode.BOTH;
     ignoreWarnings(
         NewTypeInference.GLOBAL_THIS,
         NewTypeInference.PROPERTY_ACCESS_ON_NONOBJECT);
@@ -1123,8 +1122,6 @@ public void testDontRenamePrototypeWithoutExterns() {
       "/** @return {!Foo} */",
       "Foo.prototype.a = function() {};");
 
-    // NTI reqires at least the MINIMAL_EXTERNS.
-    this.mode = TypeInferenceMode.OTI_ONLY;
     test(externs(""), srcs(js), expected(output));
   }
 }
diff --git a/test/com/google/javascript/jscomp/CheckAccessControlsTest.java b/test/com/google/javascript/jscomp/CheckAccessControlsTest.java
@@ -329,10 +329,6 @@ public void testWarningForSuperclassMethod2() {
   }
 
   public void testWarningForBind() {
-    // NTI reports NTI_REDCLARED_PROPERTY here, which is as intended. If this were a new
-    // property and not the existing `bind`, then we'd report the deprecation warning as expected
-    // (see testAutoboxedDeprecatedProperty and testAutoboxedPrivateProperty).
-    this.mode = TypeInferenceMode.OTI_ONLY;
     testDepProp(
         "/** @deprecated I'm bound to this method... */ Function.prototype.bind = function() {};"
             + "(function() {}).bind();",
@@ -467,19 +463,10 @@ public void testPrivateAccess_googModule() {
               "(new One()).m();"),
         };
 
-    this.mode = TypeInferenceMode.OTI_ONLY;
     testError(
         srcs(js),
         error(BAD_PRIVATE_PROPERTY_ACCESS)
             .withMessage("Access to private property m of One not allowed here."));
-
-    /*
-    this.mode = TypeInferenceMode.NTI_ONLY;
-    testError(
-        srcs(js),
-        error(BAD_PRIVATE_PROPERTY_ACCESS).withMessage(
-           "Access to private property m of module$exports$example$One not allowed here."));
-           */
   }
 
   public void testNoPrivateAccessForProperties1() {
@@ -1698,9 +1685,6 @@ public void testNamespaceConstantProperty1() {
   }
 
   public void testNamespaceConstantProperty2() {
-    // NTI requires an @const annotation on namespaces, as in testNamespaceConstantProperty1.
-    // This is the only difference between the two tests.
-    this.mode = TypeInferenceMode.OTI_ONLY;
     testError(
         "var o = {};\n"
         + "/** @const */ o.x = 1;\n"
@@ -1742,8 +1726,6 @@ public void testConstantProperty3b1() {
   }
 
   public void testConstantProperty3b2() {
-    // NTI reports NTI_REDECLARED_PROPERTY
-    this.mode = TypeInferenceMode.OTI_ONLY;
     // The old type checker should report this but it doesn't.
     testSame("/** @const */ var o = { XYZ: 1 };"
         + "o.XYZ = 2;");
@@ -1807,8 +1789,6 @@ public void testConstantProperty10a() {
   }
 
   public void testConstantProperty10b() {
-    // NTI reports NTI_REDECLARED_PROPERTY
-    this.mode = TypeInferenceMode.OTI_ONLY;
     testSame("/** @constructor */ function Foo() { this.PROP = 1;}"
         + "Foo.prototype.PROP;");
   }
@@ -1825,9 +1805,6 @@ public void testConstantProperty11() {
   }
 
   public void testConstantProperty12() {
-    // NTI deliberately disallows this pattern (separate declaration and initialization
-    // of const properties). (b/30205953)
-    this.mode = TypeInferenceMode.OTI_ONLY;
     testSame("/** @constructor */ function Foo() {}"
         + "/** @const */ Foo.prototype.bar;"
         + "/**\n"

diff --git a/test/com/google/javascript/jscomp/CheckConformanceTest.java b/test/com/google/javascript/jscomp/CheckConformanceTest.java
@@ -1400,7 +1400,6 @@ public void testCustomBanUnknownInterfaceProp1() {
             "  a.gak();",
             "}");
 
-    this.mode = TypeInferenceMode.OTI_ONLY;
     testWarning(
         js,
         CheckConformance.CONFORMANCE_VIOLATION,
@@ -1524,17 +1523,11 @@ public void testCustomBanUnresolvedType() {
         + "  error_message: 'BanUnresolvedType Message'\n"
         + "}";
 
-    // NOTE(aravindpg): In NTI we annotate the node `a` with its inferred type instead of Unknown,
-    // and so this test doesn't recognize `a` as unresolved. Fixing this is undesirable.
-    // However, we do intend to add warnings for unfulfilled forward declares, which essentially
-    // addresses this use case.
-    this.mode = TypeInferenceMode.OTI_ONLY;
     testWarning(
         "goog.forwardDeclare('Foo'); /** @param {Foo} a */ function f(a) {a.foo()};",
         CheckConformance.CONFORMANCE_VIOLATION,
         "Violation: BanUnresolvedType Message\nReference to type 'Foo' never resolved.");
 
-    this.mode = TypeInferenceMode.BOTH;
     testNoWarning(lines(
         "/** @suppress {newCheckTypes}",
         " *  @param {!Object<string, ?>} data",
@@ -1552,9 +1545,6 @@ public void testCustomStrictBanUnresolvedType() {
         + "  error_message: 'StrictBanUnresolvedType Message'\n"
         + "}";
 
-    // NTI doesn't model unresolved types separately from unknown, so this check always results
-    // in conformance.
-    this.mode = TypeInferenceMode.OTI_ONLY;
     testWarning(
         "goog.forwardDeclare('Foo'); /** @param {Foo} a */ var f = function(a) {}",
         CheckConformance.CONFORMANCE_VIOLATION,

diff --git a/test/com/google/javascript/jscomp/CheckTemplateParamsTest.java b/test/com/google/javascript/jscomp/CheckTemplateParamsTest.java
@@ -17,20 +17,13 @@
 package com.google.javascript.jscomp;
 
 import static com.google.javascript.jscomp.RhinoErrorReporter.TOO_MANY_TEMPLATE_PARAMS;
-import static com.google.javascript.jscomp.newtypes.JSTypeCreatorFromJSDoc.INVALID_GENERICS_INSTANTIATION;
 
 /**
  * Tests for the "Too many template parameters" warning. Ideally this would be part of
  * JSDocInfoParserTest but that test is set up to handle warnings reported from JSDocInfoParser,
  * (as strings) not ones from JSTypeRegistry (as DiagnosticTypes).
  */
 public final class CheckTemplateParamsTest extends TypeICompilerTestCase {
-  @Override
-  protected void setUp() throws Exception {
-    super.setUp();
-    this.mode = TypeInferenceMode.BOTH;
-  }
-
   @Override
   protected int getNumRepetitions() {
     return 1;
@@ -54,7 +47,7 @@ public void testArray() {
     testSame("/** @type {!Array<string>} */ var x;");
     test(
         srcs("/** @type {!Array<string, number>} */ var x;"),
-        warningOtiNti(TOO_MANY_TEMPLATE_PARAMS, INVALID_GENERICS_INSTANTIATION));
+        warning(TOO_MANY_TEMPLATE_PARAMS));
   }
 
   public void testObject() {
@@ -63,7 +56,7 @@ public void testObject() {
     testSame("/** @type {!Object<string, number>} */ var x;");
     test(
         srcs("/** @type {!Object<string, number, boolean>} */ var x;"),
-        warningOtiNti(TOO_MANY_TEMPLATE_PARAMS, INVALID_GENERICS_INSTANTIATION));
+        warning(TOO_MANY_TEMPLATE_PARAMS));
   }
 
   public void testClass() {
@@ -72,7 +65,7 @@ public void testClass() {
         srcs(lines(
             "/** @constructor */ function SomeClass() {};",
             "/** @type {!SomeClass<string>} */ var x;")),
-        warningOtiNti(TOO_MANY_TEMPLATE_PARAMS, INVALID_GENERICS_INSTANTIATION));
+        warning(TOO_MANY_TEMPLATE_PARAMS));
 
     testSame(lines(
         "/** @constructor @template T */ function SomeClass() {};",
@@ -82,7 +75,7 @@ public void testClass() {
         srcs(lines(
             "/** @constructor @template T */ function SomeClass() {};",
             "/** @type {!SomeClass<number, string>} */ var x;")),
-        warningOtiNti(TOO_MANY_TEMPLATE_PARAMS, INVALID_GENERICS_INSTANTIATION));
+        warning(TOO_MANY_TEMPLATE_PARAMS));
   }
 
 }
diff --git a/test/com/google/javascript/jscomp/CheckUnusedPrivatePropertiesTest.java b/test/com/google/javascript/jscomp/CheckUnusedPrivatePropertiesTest.java
@@ -82,7 +82,7 @@ public void testConstructorPropertyUsed1() {
   }
 
   public void testClassPropUnused1() {
-    this.mode = TypeInferenceMode.NEITHER;
+    this.mode = TypeInferenceMode.DISABLED;
 
     // A property defined on "this" can be removed
     unused("class C { constructor() { /** @private */ this.a = 2 } }");
@@ -94,15 +94,15 @@ public void testClassPropUnused2() {
   }
 
   public void testClassMethodUnused1() {
-    this.mode = TypeInferenceMode.NEITHER;
+    this.mode = TypeInferenceMode.DISABLED;
 
     unused("class C { constructor() {}  /** @private */ method() {} }");
     used("class C { constructor() {}  /** @private */ method() {} }\n new C().method();");
   }
 
   // The JSDoc seems to be missing here, reenable this test when it is fixed.
   public void disable_testClassMethodUnused2() {
-    this.mode = TypeInferenceMode.NEITHER;
+    this.mode = TypeInferenceMode.DISABLED;
 
     unused("class C { constructor() {}\n  /** @private */ ['method']() {} }");
     used("class C { constructor() {}\n  /** @private */ ['method']() {} }\n new C()['method']();");

diff --git a/test/com/google/javascript/jscomp/ClosureRewriteClassTest.java b/test/com/google/javascript/jscomp/ClosureRewriteClassTest.java
@@ -41,17 +41,12 @@ public final class ClosureRewriteClassTest extends TypeICompilerTestCase {
       "goog.defineClass = function(a,b) {};",
       "var use;");
 
-  private static final Diagnostic INSTANTIATE_ABSTRACT_CLASS = warningOtiNti(
+  private static final Diagnostic INSTANTIATE_ABSTRACT_CLASS =
-      TypeCheck.INSTANTIATE_ABSTRACT_CLASS,
+      warning(TypeCheck.INSTANTIATE_ABSTRACT_CLASS);
-      NewTypeInference.CANNOT_INSTANTIATE_ABSTRACT_CLASS);
 
-  private static final Diagnostic NOT_A_CONSTRUCTOR = warningOtiNti(
+  private static final Diagnostic NOT_A_CONSTRUCTOR = warning(TypeCheck.NOT_A_CONSTRUCTOR);
-      TypeCheck.NOT_A_CONSTRUCTOR,
-      NewTypeInference.NOT_A_CONSTRUCTOR);
 
-  private static final Diagnostic INEXISTENT_PROPERTY = warningOtiNti(
+  private static final Diagnostic INEXISTENT_PROPERTY = warning(TypeCheck.INEXISTENT_PROPERTY);
-      TypeCheck.INEXISTENT_PROPERTY,
-      NewTypeInference.INEXISTENT_PROPERTY);
 
   public ClosureRewriteClassTest() {
     super(EXTERNS);
@@ -65,7 +60,7 @@ protected CompilerPass getProcessor(Compiler compiler) {
   @Override
   protected void setUp() throws Exception {
     super.setUp();
-    this.mode = TypeInferenceMode.NEITHER;
+    this.mode = TypeInferenceMode.DISABLED;
     enableRunTypeCheckAfterProcessing();
   }
 
@@ -154,7 +149,7 @@ public void testConst() {
 
   public void testAnnotations1() {
     // verify goog.defineClass values are constructible, by default
-    this.mode = TypeInferenceMode.BOTH;
+    this.mode = TypeInferenceMode.CHECKED;
     testRewrite(
         "var x = goog.defineClass(Object, {\n"
         + "  constructor: function(){}\n"
@@ -168,7 +163,7 @@ public void testAnnotations1() {
 
   public void testAnnotations2a() {
     // @interface is preserved
-    this.mode = TypeInferenceMode.BOTH;
+    this.mode = TypeInferenceMode.CHECKED;
     testRewriteWarning(
         lines(
             "var x = goog.defineClass(null, {",
@@ -185,7 +180,7 @@ public void testAnnotations2a() {
 
   public void testAnnotations2b() {
     // @interface is preserved, at the class level too
-    this.mode = TypeInferenceMode.BOTH;
+    this.mode = TypeInferenceMode.CHECKED;
     testRewriteWarning(
         lines(
             "/** @interface */",
@@ -200,7 +195,7 @@ public void testAnnotations2b() {
 
   public void testAnnotations3a() {
     // verify goog.defineClass is a @struct by default
-    this.mode = TypeInferenceMode.BOTH;
+    this.mode = TypeInferenceMode.CHECKED;
     testRewriteWarning(
         lines(
             "var y = goog.defineClass(null, {",
@@ -222,8 +217,8 @@ public void testAnnotations3a() {
 
   public void testAnnotations3b() {
     // verify goog.defineClass is a @struct by default, but can be overridden (only in OTI)
-    this.mode = TypeInferenceMode.BOTH;
+    this.mode = TypeInferenceMode.CHECKED;
-    testRewriteWarning(
+    testRewrite(
         lines(
             "/** @unrestricted */",
             "var y = goog.defineClass(null, {",
@@ -239,8 +234,7 @@ public void testAnnotations3b() {
             "/** @constructor @struct @extends {y} */",
             "var x = function() {this.a = 1};",
             "goog.inherits(x,y);",
-            "use(new y().a);"),
+            "use(new y().a);"));
-        warningOtiNti(null, NewTypeInference.INEXISTENT_PROPERTY));
   }
 
   public void testRecordAnnotations() {
@@ -255,7 +249,7 @@ public void testRecordAnnotations() {
   }
 
   public void testRecordAnnotations2() {
-    this.mode = TypeInferenceMode.BOTH;
+    this.mode = TypeInferenceMode.CHECKED;
     testRewrite(
         "/** @record */\n"
         + "var Rec = goog.defineClass(null, {f : function() {}});\n"
@@ -269,7 +263,7 @@ public void testRecordAnnotations2() {
 
   public void testAbstract1() {
     // @abstract is preserved
-    this.mode = TypeInferenceMode.BOTH;
+    this.mode = TypeInferenceMode.CHECKED;
     testRewriteWarning(
         lines(
             "var x = goog.defineClass(null, {",
@@ -286,7 +280,7 @@ public void testAbstract1() {
 
   public void testAbstract2() {
     // @abstract is preserved, at the class level too
-    this.mode = TypeInferenceMode.BOTH;
+    this.mode = TypeInferenceMode.CHECKED;
     testRewriteWarning(
         lines(
             "/** @abstract */",

diff --git a/test/com/google/javascript/jscomp/CodePrinterTest.java b/test/com/google/javascript/jscomp/CodePrinterTest.java
@@ -1543,7 +1543,7 @@ void setOptions(CompilerOptions options) {
   private void assertTypeAnnotations(String js, String expected) {
     assertEquals(
         expected,
-        new CodePrinter.Builder(parse(js, TypeInferenceMode.OTI_ONLY))
+        new CodePrinter.Builder(parse(js, TypeInferenceMode.CHECKED))
             .setCompilerOptions(newCompilerOptions(new CompilerOptionBuilder() {
               @Override
               void setOptions(CompilerOptions options) {
@@ -1994,13 +1994,13 @@ void setOptions(CompilerOptions options) {
 
   public void testStrict() {
     String result =
-        defaultBuilder(parse("var x", TypeInferenceMode.OTI_ONLY)).setTagAsStrict(true).build();
+        defaultBuilder(parse("var x", TypeInferenceMode.CHECKED)).setTagAsStrict(true).build();
     assertEquals("'use strict';var x", result);
   }
 
   public void testStrictPretty() {
     String result =
-        defaultBuilder(parse("var x", TypeInferenceMode.OTI_ONLY))
+        defaultBuilder(parse("var x", TypeInferenceMode.CHECKED))
             .setTagAsStrict(true)
             .setPrettyPrint(true)
             .build();
@@ -2009,13 +2009,13 @@ public void testStrictPretty() {
 
   public void testExterns() {
     String result =
-        defaultBuilder(parse("var x", TypeInferenceMode.OTI_ONLY)).setTagAsExterns(true).build();
+        defaultBuilder(parse("var x", TypeInferenceMode.CHECKED)).setTagAsExterns(true).build();
     assertEquals("/** @externs */\nvar x", result);
   }
 
   public void testIjs() {
     String result =
-        defaultBuilder(parse("var x", TypeInferenceMode.OTI_ONLY))
+        defaultBuilder(parse("var x", TypeInferenceMode.CHECKED))
             .setTagAsTypeSummary(true)
             .build();
     assertEquals("/** @fileoverview @typeSummary */\nvar x", result);

diff --git a/test/com/google/javascript/jscomp/CodePrinterTestBase.java b/test/com/google/javascript/jscomp/CodePrinterTestBase.java
@@ -15,8 +15,6 @@
  */
 package com.google.javascript.jscomp;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
 import com.google.common.collect.ImmutableList;
 import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
 import com.google.javascript.jscomp.TypeICompilerTestCase.TypeInferenceMode;
@@ -44,11 +42,10 @@ protected void setUp() throws Exception {
   }
 
   Node parse(String js) {
-    return parse(js, TypeInferenceMode.NEITHER);
+    return parse(js, TypeInferenceMode.DISABLED);
   }
 
   Node parse(String js, TypeInferenceMode mode) {
-    checkArgument(mode != TypeInferenceMode.BOTH);
     Compiler compiler = new Compiler();
     lastCompiler = compiler;
     CompilerOptions options = new CompilerOptions();
@@ -67,7 +64,7 @@ Node parse(String js, TypeInferenceMode mode) {
     Node root = externsAndJs.getLastChild();
     Node externs = externsAndJs.getFirstChild();
 
-    if (mode.runsOTI()) {
+    if (mode.runsTypeCheck()) {
       DefaultPassConfig passConfig = new DefaultPassConfig(null);
       CompilerPass typeResolver = passConfig.resolveTypes.create(compiler);
       typeResolver.process(externs, root);