Update tests to set CompilerOptions as needed explicitly, so that whe…

…n the default changes they will not break. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=174044824
google · Oct 31, 2017 · d7fd438 · d7fd438
1 parent cb4a8ad
commit d7fd438
Show file tree

Hide file tree

Showing 17 changed files with 104 additions and 32 deletions.
diff --git a/test/com/google/debugging/sourcemap/SourceMapTestCase.java b/test/com/google/debugging/sourcemap/SourceMapTestCase.java
@@ -22,6 +22,7 @@
 import com.google.debugging.sourcemap.proto.Mapping.OriginalMapping;
 import com.google.javascript.jscomp.Compiler;
 import com.google.javascript.jscomp.CompilerOptions;
+import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
 import com.google.javascript.jscomp.Result;
 import com.google.javascript.jscomp.SourceFile;
 import com.google.javascript.jscomp.SourceMap;
@@ -262,6 +263,7 @@ protected RunResult compile(String js, String fileName) {
 
   protected CompilerOptions getCompilerOptions() {
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setSourceMapOutputPath("testcode_source_map.out");
     options.setSourceMapFormat(getSourceMapFormat());
     options.setSourceMapDetailLevel(detailLevel);

diff --git a/test/com/google/javascript/jscomp/BaseReplaceScriptTestCase.java b/test/com/google/javascript/jscomp/BaseReplaceScriptTestCase.java
@@ -22,6 +22,7 @@
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
+import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
@@ -67,6 +68,7 @@ protected void setUp() throws Exception {
    */
   protected CompilerOptions getOptions(DiagnosticGroup... typesOfGuard) {
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.declaredGlobalExternsOnWindow = false;
     options.setClosurePass(true);
     // These are the options that are always on in JsDev which is the only

diff --git a/test/com/google/javascript/jscomp/ClosurePrimitivesIntegrationTest.java b/test/com/google/javascript/jscomp/ClosurePrimitivesIntegrationTest.java
@@ -15,6 +15,7 @@
  */
 package com.google.javascript.jscomp;
 
+import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
 
 /**
  * Tests that the property renaming primitive goog.reflect.objectProperty
@@ -145,6 +146,8 @@ public void testStaticPropRenameSimple() {
   @Override
   protected CompilerOptions createCompilerOptions() {
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT_2017);
+    options.setLanguageOut(LanguageMode.ECMASCRIPT3);
     if (useSimpleMode) {
       CompilationLevel.SIMPLE_OPTIMIZATIONS.setOptionsForCompilationLevel(options);
     } else {

diff --git a/test/com/google/javascript/jscomp/CommonJSIntegrationTest.java b/test/com/google/javascript/jscomp/CommonJSIntegrationTest.java
@@ -16,6 +16,7 @@
 
 package com.google.javascript.jscomp;
 
+import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
 import com.google.javascript.jscomp.deps.ModuleLoader;
 
 /**
@@ -314,6 +315,7 @@ public void testCrossModuleSubclass6() {
   @Override
   protected CompilerOptions createCompilerOptions() {
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setCodingConvention(new GoogleCodingConvention());
     WarningLevel.VERBOSE.setOptionsForWarningLevel(options);
     options.setProcessCommonJSModules(true);

diff --git a/test/com/google/javascript/jscomp/CompilerTest.java b/test/com/google/javascript/jscomp/CompilerTest.java
@@ -114,6 +114,7 @@ public void testPrintExterns() {
     List<SourceFile> externs =
         ImmutableList.of(SourceFile.fromCode("extern", "function alert(x) {}"));
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setPrintExterns(true);
     Compiler compiler = new Compiler();
     compiler.init(externs, ImmutableList.<SourceFile>of(), options);
@@ -131,8 +132,7 @@ public void testLocalUndefined() throws Exception {
     //
     // This test is just to make sure that the compiler doesn't crash.
     CompilerOptions options = new CompilerOptions();
-    CompilationLevel.SIMPLE_OPTIMIZATIONS.setOptionsForCompilationLevel(
+    CompilationLevel.SIMPLE_OPTIMIZATIONS.setOptionsForCompilationLevel(options);
-        options);
     Compiler compiler = new Compiler();
     SourceFile externs = SourceFile.fromCode("externs.js", "");
     SourceFile input = SourceFile.fromCode("input.js",
@@ -318,6 +318,7 @@ public void testApplyInputSourceMaps() throws Exception {
             originalSourcePosition));
 
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.sourceMapOutputPath = "fake/source_map_path.js.map";
     options.inputSourceMaps = inputSourceMaps;
     options.applyInputSourceMaps = true;
@@ -874,6 +875,9 @@ static Result test(String js, String expected, DiagnosticType error) {
 
   public void testConsecutiveSemicolons() {
     Compiler compiler = new Compiler();
+    CompilerOptions options = new CompilerOptions();
+    options.setEmitUseStrict(false);
+    compiler.initOptions(options);
     String js = "if(a);";
     Node n = compiler.parseTestCode(js);
     Compiler.CodeBuilder cb = new Compiler.CodeBuilder();
@@ -914,6 +918,7 @@ public void testWarningsFiltering() {
   public void testExportSymbolReservesNamesForRenameVars() {
     Compiler compiler = new Compiler();
     CompilerOptions options = new CompilerOptions();
+    options.setEmitUseStrict(false);
     options.setClosurePass(true);
     options.setVariableRenaming(VariableRenamingPolicy.ALL);
 
@@ -923,12 +928,13 @@ public void testExportSymbolReservesNamesForRenameVars() {
     Result result = compiler.compile(EMPTY_EXTERNS, inputs, options);
 
     assertTrue(result.success);
-    assertEquals("var b;var c;b.exportSymbol(\"a\",c);", compiler.toSource());
+    assertThat(compiler.toSource()).isEqualTo("var b;var c;b.exportSymbol(\"a\",c);");
   }
 
   public void testGenerateExportsReservesNames() {
     Compiler compiler = new Compiler();
     CompilerOptions options = new CompilerOptions();
+    options.setEmitUseStrict(false);
     options.setClosurePass(true);
     options.setVariableRenaming(VariableRenamingPolicy.ALL);
     options.setGenerateExports(true);
@@ -939,8 +945,7 @@ public void testGenerateExportsReservesNames() {
     Result result = compiler.compile(EMPTY_EXTERNS, inputs, options);
 
     assertTrue(result.success);
-    assertEquals("var b;var c={};b.exportSymbol(\"a\",c);",
+    assertThat(compiler.toSource()).isEqualTo("var b;var c={};b.exportSymbol(\"a\",c);");
-        compiler.toSource());
   }
 
   private static final DiagnosticType TEST_ERROR =
@@ -1432,9 +1437,12 @@ public Class<String> getType() {
   }
 
   private static CompilerOptions createNewFlagBasedOptions() {
-    CompilerOptions opt = new CompilerOptions();
+    CompilerOptions options = new CompilerOptions();
-    CompilationLevel.ADVANCED_OPTIMIZATIONS.setOptionsForCompilationLevel(opt);
+    CompilationLevel.ADVANCED_OPTIMIZATIONS.setOptionsForCompilationLevel(options);
-    return opt;
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
+    options.setLanguageOut(LanguageMode.ECMASCRIPT3);
+    options.setEmitUseStrict(false);
+    return options;
   }
 
   private static byte[] serialize(Object obj) throws IOException {

diff --git a/test/com/google/javascript/jscomp/GatherSideEffectSubexpressionsCallbackTest.java b/test/com/google/javascript/jscomp/GatherSideEffectSubexpressionsCallbackTest.java
@@ -160,6 +160,9 @@ private Node getSideEffectsHookNode() {
   private void checkKeepSimplifiedShortCircuitExpr(Node root,
                                                    List<String> expected) {
     Compiler compiler = new Compiler();
+    CompilerOptions options = new CompilerOptions();
+    options.setEmitUseStrict(false);
+    compiler.initOptions(options);
     List<Node> replacements = new ArrayList<>();
     GetReplacementSideEffectSubexpressions accumulator =
         new GetReplacementSideEffectSubexpressions(compiler, replacements);
@@ -177,6 +180,9 @@ private void checkKeepSimplifiedHookExpr(Node root,
                                            boolean elseHasSideEffects,
                                            List<String> expected) {
     Compiler compiler = new Compiler();
+    CompilerOptions options = new CompilerOptions();
+    options.setEmitUseStrict(false);
+    compiler.initOptions(options);
     List<Node> replacements = new ArrayList<>();
     GetReplacementSideEffectSubexpressions accumulator =
         new GetReplacementSideEffectSubexpressions(compiler, replacements);

diff --git a/test/com/google/javascript/jscomp/GoldenFileComparer.java b/test/com/google/javascript/jscomp/GoldenFileComparer.java
@@ -20,6 +20,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.Files;
+import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -107,6 +108,7 @@ private static void compileAndCompare(
    */
   public static CompilerOptions options() {
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     // Instrumentation done
     options.setPrettyPrint(true);
     return options;

diff --git a/test/com/google/javascript/jscomp/IntegrationTest.java b/test/com/google/javascript/jscomp/IntegrationTest.java
@@ -279,6 +279,7 @@ public void testBug1949424_v2() {
   @GwtIncompatible // b/63595345
   public void testUnresolvedDefine() {
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setClosurePass(true);
     options.setCheckTypes(true);
     DiagnosticType[] warnings = {
@@ -378,6 +379,7 @@ public void testBug31301233() {
 
   public void testAdvancedModeIncludesExtraSmartNameRemoval() {
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     CompilationLevel.ADVANCED_OPTIMIZATIONS.setOptionsForCompilationLevel(options);
     test(
         options,
@@ -957,6 +959,7 @@ public void testCheckTypes() {
 
   public void testRenamingOfTypedefPropertiesWithNTI() {
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setNewTypeInference(true);
     options.setPropertyRenaming(PropertyRenamingPolicy.ALL_UNQUOTED);
 
@@ -1028,6 +1031,7 @@ public void testBothTypeCheckersRunNoDupWarning() {
 
   public void testSilenceUnknownTypeWarningFromOTI() {
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setCheckTypes(true);
     options.setNewTypeInference(true);
 
@@ -1081,6 +1085,7 @@ public void testNTInoMaskTypeParseError() {
 
   public void testLegacyCompileOverridesStrict() {
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setCheckTypes(true);
     options.addWarningsGuard(new StrictWarningsGuard());
     options.setLegacyCodeCompile(true);
@@ -1091,6 +1096,7 @@ public void testLegacyCompileOverridesStrict() {
 
   public void testLegacyCompileOverridesExplicitPromotionToError() {
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setCheckTypes(true);
     options.addWarningsGuard(new DiagnosticGroupWarningsGuard(
         DiagnosticGroups.CHECK_TYPES, CheckLevel.ERROR));
@@ -1176,6 +1182,7 @@ public void testRemoveClosureAsserts() {
 
   public void testRemoveClosureAsserts2() {
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setClosurePass(true);
     options.setNewTypeInference(true);
     options.setRunOTIafterNTI(false);
@@ -1471,6 +1478,7 @@ public void testDisambiguatePropertiesWithNtiNoCrash() {
 
   public void testDisambiguatePropertiesWithNtiNoCrash2() {
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setClosurePass(true);
     options.setNewTypeInference(true);
     options.setRunOTIafterNTI(false);
@@ -1498,6 +1506,7 @@ public void testDisambiguatePropertiesWithNtiNoCrash2() {
   // disambiguation.
   public void testNtiTypeVariableErrorsDontBlockDisambiguation() {
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setClosurePass(true);
     options.setNewTypeInference(true);
     options.setRunOTIafterNTI(false);
@@ -1546,6 +1555,7 @@ public void testNtiTypeVariableErrorsDontBlockDisambiguation() {
 
   public void testNtiTypeVariableErrorsDontBlockDisambiguation2() {
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setClosurePass(true);
     options.setNewTypeInference(true);
     options.setRunOTIafterNTI(false);
@@ -1600,6 +1610,7 @@ public void testNtiTypeVariableErrorsDontBlockDisambiguation2() {
 
   public void testTurnOffConstChecksOfCheckAccessControlsWithNtiOn() {
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setClosurePass(true);
     options.setNewTypeInference(true);
     options.setRunOTIafterNTI(false);
@@ -2301,7 +2312,6 @@ public void testPreservesCastInformation() {
     // looks for that exact suffix, and IntegrationTestCase adds an input
     // id number between prefix and suffix.
     inputFileNameSuffix = "vmbootstrap/Arrays.impl.java.js";
-    CompilerOptions options = new CompilerOptions();
     String code = LINE_JOINER.join(
         "/** @constructor */",
         "var Arrays = function() {};",
@@ -2312,6 +2322,8 @@ public void testPreservesCastInformation() {
         "function Bar() { this.myprop = 2; }",
         "var x = /** @type {!Foo} */ (Arrays.$create()).myprop;");
 
+    CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setCheckTypes(true);
     options.setDisambiguateProperties(true);
 
@@ -2345,6 +2357,7 @@ public void testInliningLocalVarsPreservesCasts() {
         "})()");
 
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setCheckTypes(true);
     options.setSmartNameRemoval(true);
     options.setFoldConstants(true);
@@ -2394,6 +2407,7 @@ public void testInliningLocalVarsPreservesCastsNullable() {
         "})()");
 
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setCheckTypes(true);
     options.setSmartNameRemoval(true);
     options.setFoldConstants(true);
@@ -3138,8 +3152,8 @@ public void testIssue598() {
 
   public void testCheckStrictMode() {
     CompilerOptions options = createCompilerOptions();
-    CompilationLevel.ADVANCED_OPTIMIZATIONS
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
-        .setOptionsForCompilationLevel(options);
+    CompilationLevel.ADVANCED_OPTIMIZATIONS.setOptionsForCompilationLevel(options);
     WarningLevel.VERBOSE.setOptionsForWarningLevel(options);
 
     externs = ImmutableList.of(
@@ -3665,6 +3679,7 @@ public void testSuppressEs5StrictWarning() {
 
   public void testCheckProvidesWarning() {
     CompilerOptions options = createCompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setWarningLevel(DiagnosticGroups.MISSING_PROVIDE, CheckLevel.WARNING);
     options.setWarningLevel(DiagnosticGroups.ES5_STRICT, CheckLevel.OFF);
     test(options,
@@ -3915,6 +3930,7 @@ public void testGoogModuleDuplicateExport() {
 
   public void testGoogModuleOuterLegacyInner() {
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setClosurePass(true);
     options.setCodingConvention(new ClosureCodingConvention());
 
@@ -3960,6 +3976,7 @@ public void testGoogModuleOuterLegacyInner() {
 
   public void testLegacyGoogModuleExport() {
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setClosurePass(true);
     options.setCodingConvention(new ClosureCodingConvention());
     options.setGenerateExports(true);
@@ -4465,6 +4482,7 @@ public void testExports() {
 
   public void testGatherExternPropsWithNTI() {
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageIn(LanguageMode.ECMASCRIPT3);
     options.setNewTypeInference(true);
     options.setGenerateExports(true);
     options.setExportLocalPropertyDefinitions(true);
@@ -4782,6 +4800,7 @@ public void testInlineRestParam() {
   public void testInlineRestParamNonTranspiling() {
     CompilerOptions options = createCompilerOptions();
     options.setLanguageIn(LanguageMode.ECMASCRIPT_2017);
+    options.setLanguageOut(LanguageMode.ECMASCRIPT_2017);
     CompilationLevel.ADVANCED_OPTIMIZATIONS.setOptionsForCompilationLevel(options);
     test(
         options,
@@ -4814,6 +4833,7 @@ public void testDefaultParametersNonTranspiling() {
     CompilerOptions options = createCompilerOptions();
     CompilationLevel.ADVANCED_OPTIMIZATIONS.setOptionsForCompilationLevel(options);
     options.setLanguageIn(LanguageMode.ECMASCRIPT_2017);
+    options.setLanguageOut(LanguageMode.ECMASCRIPT_2017);
 
     test(
         options,
@@ -4851,6 +4871,7 @@ public void testRestObjectPatternParametersNonTranspiling() {
     CompilerOptions options = createCompilerOptions();
     CompilationLevel.ADVANCED_OPTIMIZATIONS.setOptionsForCompilationLevel(options);
     options.setLanguageIn(LanguageMode.ECMASCRIPT_2017);
+    options.setLanguageOut(LanguageMode.ECMASCRIPT_2017);
     externs = DEFAULT_EXTERNS;
 
     test(
@@ -4867,6 +4888,7 @@ public void testRestObjectPatternParametersNonTranspiling() {
   @Override
   protected CompilerOptions createCompilerOptions() {
     CompilerOptions options = new CompilerOptions();
+    options.setLanguageOut(LanguageMode.ECMASCRIPT3);
     options.setDevMode(DevMode.EVERY_PASS);
     options.setCodingConvention(new GoogleCodingConvention());
     options.setRenamePrefixNamespaceAssumeCrossModuleNames(true);

diff --git a/test/com/google/javascript/jscomp/NodeUtilTest.java b/test/com/google/javascript/jscomp/NodeUtilTest.java
@@ -1820,7 +1820,7 @@ public void testGetNumberValue() {
     assertNull(NodeUtil.getNumberValue(getNode("+1")));
   }
 
-  public void testIsNumbericResult() {
+  public void testIsNumericResult() {
     assertTrue(NodeUtil.isNumericResult(getNode("1")));
     assertFalse(NodeUtil.isNumericResult(getNode("true")));
     assertTrue(NodeUtil.isNumericResult(getNode("+true")));