diff --git a/test/com/google/javascript/jscomp/TypeICompilerTestCase.java b/test/com/google/javascript/jscomp/TypeICompilerTestCase.java index 3d51c38cc8f..a8b020b30be 100644 --- a/test/com/google/javascript/jscomp/TypeICompilerTestCase.java +++ b/test/com/google/javascript/jscomp/TypeICompilerTestCase.java @@ -92,10 +92,14 @@ protected void testInternal( protected void testExternChanges(String extern, String input, String expectedExtern, DiagnosticType... warnings) { if (this.mode.runsOTI()) { - testExternChangesOTI(extern, input, expectedExtern, warnings); + enableTypeCheck(); + super.testExternChanges(extern, input, expectedExtern, warnings); + disableTypeCheck(); } if (this.mode.runsNTI()) { - testExternChangesNTI(extern, input, expectedExtern, warnings); + enableNewTypeInference(); + super.testExternChanges(extern, input, expectedExtern, warnings); + disableNewTypeInference(); } if (this.mode.runsNeither()) { super.testExternChanges(extern, input, expectedExtern, warnings); @@ -148,26 +152,6 @@ private void testNTI( this.mode = saved; } - private void testExternChangesOTI(String extern, String input, String expectedExtern, - DiagnosticType... warnings) { - TypeInferenceMode saved = this.mode; - this.mode = TypeInferenceMode.OTI_ONLY; - enableTypeCheck(); - super.testExternChanges(extern, input, expectedExtern, warnings); - disableTypeCheck(); - this.mode = saved; - } - - private void testExternChangesNTI(String extern, String input, String expectedExtern, - DiagnosticType... warnings) { - TypeInferenceMode saved = this.mode; - this.mode = TypeInferenceMode.NTI_ONLY; - enableNewTypeInference(); - super.testExternChanges(extern, input, expectedExtern, warnings); - disableNewTypeInference(); - this.mode = saved; - } - void testWarningOtiNti( String js, DiagnosticType otiWarning, DiagnosticType ntiWarning) { TypeInferenceMode saved = this.mode;