Fix tests so that they will pass when block-scoped functions stop par…

…sing outside of ES6 mode. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=122777335
google · May 19, 2016 · 78f7d43 · 78f7d43
1 parent 7c0b3cd
commit 78f7d43
Show file tree

Hide file tree

Showing 24 changed files with 105 additions and 71 deletions.
diff --git a/test/com/google/javascript/jscomp/ClosureRewriteModuleTest.java b/test/com/google/javascript/jscomp/ClosureRewriteModuleTest.java
@@ -416,7 +416,7 @@ public void testTopLevelNames2() {
 
   public void testTopLevelNames3() {
     // Functions in blocks are not module top level because they are block scoped.
-    test(
+    testEs6(
         LINE_JOINER.join(
             "goog.module('a.c');",
             "if (true) {",

diff --git a/test/com/google/javascript/jscomp/CodePrinterTest.java b/test/com/google/javascript/jscomp/CodePrinterTest.java
@@ -45,9 +45,6 @@ public void testPrint() {
     // Safari: needs ';' at the end of a throw statement
     assertPrint("function foo(){throw 'error';}",
         "function foo(){throw\"error\";}");
-    // Safari 3 needs a "{" around a single function
-    assertPrint("if (true) function foo(){return}",
-        "if(true){function foo(){return}}");
 
     assertPrint("var x = 10; { var y = 20; }", "var x=10;var y=20");
 
@@ -238,6 +235,13 @@ public void testPrint() {
     assertPrint("if(x)if(y);", "if(x)if(y);");
     assertPrint("if(x){if(y);}", "if(x)if(y);");
     assertPrint("if(x){if(y){};;;}", "if(x)if(y);");
+  }
+
+  public void testPrintBlockScopedFunctions() {
+    languageMode = LanguageMode.ECMASCRIPT6;
+    // Safari 3 needs a "{" around a single function
+    assertPrint("if (true) function foo(){return}",
+        "if(true){function foo(){return}}");
     assertPrint("if(x){;;function y(){};;}", "if(x){function y(){}}");
   }
 
@@ -1418,6 +1422,7 @@ public void testDoLoopIECompatibility() {
 
   public void testFunctionSafariCompatibility() {
     // Functions within IFs cause syntax errors on Safari.
+    languageMode = LanguageMode.ECMASCRIPT6;
     assertPrint("function f(){if(e1){function goo(){return true}}else foo()}",
         "function f(){if(e1){function goo(){return true}}else foo()}");
 

diff --git a/test/com/google/javascript/jscomp/ControlFlowAnalysisTest.java b/test/com/google/javascript/jscomp/ControlFlowAnalysisTest.java
@@ -917,45 +917,47 @@ public void testSimpleCatch() {
 
   public void testFunctionWithinTry() {
     // Make sure we don't search for the handler outside of the function.
-    String src = "try { function f() {throw 1;} } catch (e) { }";
+    String src = "try { var f = function() {throw 1;} } catch (e) { }";
     String expected = "digraph AST {\n"
         + "  node [color=lightblue2, style=filled];\n"
         + "  node0 [label=\"SCRIPT\"];\n"
         + "  node1 [label=\"TRY\"];\n"
         + "  node0 -> node1 [weight=1];\n"
         + "  node2 [label=\"BLOCK\"];\n"
         + "  node1 -> node2 [weight=1];\n"
-        + "  node3 [label=\"FUNCTION\"];\n"
+        + "  node3 [label=\"VAR\"];\n"
         + "  node2 -> node3 [weight=1];\n"
         + "  node4 [label=\"NAME\"];\n"
         + "  node3 -> node4 [weight=1];\n"
-        + "  node5 [label=\"PARAM_LIST\"];\n"
-        + "  node3 -> node5 [weight=1];\n"
-        + "  node6 [label=\"BLOCK\"];\n"
-        + "  node3 -> node6 [weight=1];\n"
-        + "  node7 [label=\"THROW\"];\n"
-        + "  node6 -> node7 [weight=1];\n"
-        + "  node8 [label=\"NUMBER\"];\n"
-        + "  node7 -> node8 [weight=1];\n"
-        + "  node6 -> node7 [label=\"UNCOND\", " +
-                "fontcolor=\"red\", weight=0.01, color=\"red\"];\n"
-        + "  node3 -> node6 [label=\"UNCOND\", " +
+        + "  node5 [label=\"FUNCTION\"];\n"
+        + "  node4 -> node5 [weight=1];\n"
+        + "  node6 [label=\"NAME\"];\n"
+        + "  node5 -> node6 [weight=1];\n"
+        + "  node7 [label=\"PARAM_LIST\"];\n"
+        + "  node5 -> node7 [weight=1];\n"
+        + "  node8 [label=\"BLOCK\"];\n"
+        + "  node5 -> node8 [weight=1];\n"
+        + "  node9 [label=\"THROW\"];\n"
+        + "  node8 -> node9 [weight=1];\n"
+        + "  node10 [label=\"NUMBER\"];\n"
+        + "  node9 -> node10 [weight=1];\n"
+        + "  node3 -> RETURN [label=\"UNCOND\", " +
                 "fontcolor=\"red\", weight=0.01, color=\"red\"];\n"
-        + "  node2 -> RETURN [label=\"UNCOND\", " +
+        + "  node2 -> node3 [label=\"UNCOND\", " +
                 "fontcolor=\"red\", weight=0.01, color=\"red\"];\n"
-        + "  node9 [label=\"BLOCK\"];\n"
-        + "  node1 -> node9 [weight=1];\n"
-        + "  node10 [label=\"CATCH\"];\n"
-        + "  node9 -> node10 [weight=1];\n"
-        + "  node11 [label=\"NAME\"];\n"
-        + "  node10 -> node11 [weight=1];\n"
-        + "  node12 [label=\"BLOCK\"];\n"
-        + "  node10 -> node12 [weight=1];\n"
-        + "  node12 -> RETURN [label=\"UNCOND\", " +
+        + "  node11 [label=\"BLOCK\"];\n"
+        + "  node1 -> node11 [weight=1];\n"
+        + "  node12 [label=\"CATCH\"];\n"
+        + "  node11 -> node12 [weight=1];\n"
+        + "  node13 [label=\"NAME\"];\n"
+        + "  node12 -> node13 [weight=1];\n"
+        + "  node14 [label=\"BLOCK\"];\n"
+        + "  node12 -> node14 [weight=1];\n"
+        + "  node14 -> RETURN [label=\"UNCOND\", " +
                 "fontcolor=\"red\", weight=0.01, color=\"red\"];\n"
-        + "  node10 -> node12 [label=\"UNCOND\", " +
+        + "  node12 -> node14 [label=\"UNCOND\", " +
                 "fontcolor=\"red\", weight=0.01, color=\"red\"];\n"
-        + "  node9 -> node10 [label=\"UNCOND\", " +
+        + "  node11 -> node12 [label=\"UNCOND\", " +
                 "fontcolor=\"red\", weight=0.01, color=\"red\"];\n"
         + "  node1 -> node2 [label=\"UNCOND\", " +
                 "fontcolor=\"red\", weight=0.01, color=\"red\"];\n"

diff --git a/test/com/google/javascript/jscomp/CrossModuleCodeMotionTest.java b/test/com/google/javascript/jscomp/CrossModuleCodeMotionTest.java
@@ -269,6 +269,7 @@ public void testFunctionNonMovement1() {
     // 2) if it's in an if statement, we can't move it
     // 3) if it's in an while statement, we can't move it [with some extra
     // block elements]
+    setAcceptedLanguage(CompilerOptions.LanguageMode.ECMASCRIPT6);
     testSame(createModuleStar(
       // m1
       "function f(){};f.prototype.bar=new f;" +

diff --git a/test/com/google/javascript/jscomp/DefinitionsRemoverTest.java b/test/com/google/javascript/jscomp/DefinitionsRemoverTest.java
@@ -31,6 +31,7 @@
  */
 public final class DefinitionsRemoverTest extends CompilerTestCase {
   public void testRemoveFunction() {
+    setAcceptedLanguage(CompilerOptions.LanguageMode.ECMASCRIPT6);
     testSame("{(function (){bar()})}");
     test("{function a(){bar()}}", "{}");
     test("foo(); function a(){} bar()", "foo(); bar();");

diff --git a/test/com/google/javascript/jscomp/DevirtualizePrototypeMethodsTest.java b/test/com/google/javascript/jscomp/DevirtualizePrototypeMethodsTest.java
@@ -217,6 +217,7 @@ public void testRewriteInGlobalScope() throws Exception {
   }
 
   public void testNoRewriteIfNotInGlobalScope1() throws Exception {
+    setAcceptedLanguage(CompilerOptions.LanguageMode.ECMASCRIPT6);
     testSame("if(true){" + NoRewriteIfNotInGlobalScopeTestInput.INPUT + "}");
   }
 

diff --git a/test/com/google/javascript/jscomp/InlineFunctionsTest.java b/test/com/google/javascript/jscomp/InlineFunctionsTest.java
@@ -113,6 +113,7 @@ public void testInlineEmptyFunction5() {
   }
 
   public void testInlineEmptyFunction6() {
+    setAcceptedLanguage(CompilerOptions.LanguageMode.ECMASCRIPT6);
     test("if (window) { f(); function f() {} }",
         "if (window) { void 0; }");
   }

diff --git a/test/com/google/javascript/jscomp/InlineVariablesTest.java b/test/com/google/javascript/jscomp/InlineVariablesTest.java
@@ -427,6 +427,7 @@ public void testNoInlineIntoNamedFunction() {
   }
 
   public void testInlineIntoNestedNonHoistedNamedFunctions() {
+    setAcceptedLanguage(CompilerOptions.LanguageMode.ECMASCRIPT6);
     test("f(); var x = false; if (false) function f() { alert(x); };",
          "f(); if (false) function f() { alert(false); };");
   }

diff --git a/test/com/google/javascript/jscomp/MinimizeExitPointsTest.java b/test/com/google/javascript/jscomp/MinimizeExitPointsTest.java
@@ -261,6 +261,7 @@ public void testForContinueOptimization() throws Exception {
   }
 
   public void testCodeMotionDoesntBreakFunctionHoisting() throws Exception {
+    setAcceptedLanguage(CompilerOptions.LanguageMode.ECMASCRIPT6);
     fold("function f() { if (x) return; foo(); function foo() {} }",
          "function f() { if (x); else { function foo() {} foo(); } }");
   }

diff --git a/test/com/google/javascript/jscomp/MoveFunctionDeclarationsTest.java b/test/com/google/javascript/jscomp/MoveFunctionDeclarationsTest.java
@@ -41,6 +41,7 @@ public void testFunctionsExpression() {
   }
 
   public void testNoMoveDeepFunctionDeclarations() {
+    setAcceptedLanguage(CompilerOptions.LanguageMode.ECMASCRIPT6);
     testSame("a; if (a) function f(){};");
     testSame("a; if (a) { function f(){} }");
   }

diff --git a/test/com/google/javascript/jscomp/NewTypeInferenceES5OrLowerTest.java b/test/com/google/javascript/jscomp/NewTypeInferenceES5OrLowerTest.java
@@ -8778,26 +8778,6 @@ public void testSpecializeLooseNullDoesntCrash() {
         "}"));
   }
 
-  public void testOuterVarDefinitionJoinDoesntCrash() {
-    typeCheck(LINE_JOINER.join(
-        "/** @constructor */ function Foo(){}",
-        "function f() {",
-        "  if (true) {",
-        "    function g() { new Foo; }",
-        "    g();",
-        "  }",
-        "}"));
-
-    // typeCheck(LINE_JOINER.join(
-    //     "function f() {",
-    //     "  if (true) {",
-    //     "    function g() { new Foo; }",
-    //     "    g();",
-    //     "  }",
-    //     "}"),
-    //     VarCheck.UNDEFINED_VAR_ERROR);
-  }
-
   public void testUnparameterizedArrayDefinitionDoesntCrash() {
     typeCheckCustomExterns(
         DEFAULT_EXTERNS + LINE_JOINER.join(

diff --git a/test/com/google/javascript/jscomp/NewTypeInferenceES6Test.java b/test/com/google/javascript/jscomp/NewTypeInferenceES6Test.java
@@ -201,4 +201,24 @@ public void testMethodOverridesWithoutJsdoc() {
         "(new Bar).method('str');"),
         NewTypeInference.WRONG_ARGUMENT_COUNT);
   }
+
+  public void testOuterVarDefinitionJoinDoesntCrash() {
+    typeCheck(LINE_JOINER.join(
+        "/** @constructor */ function Foo(){}",
+        "function f() {",
+        "  if (true) {",
+        "    function g() { new Foo; }",
+        "    g();",
+        "  }",
+        "}"));
+
+    // typeCheck(LINE_JOINER.join(
+    //     "function f() {",
+    //     "  if (true) {",
+    //     "    function g() { new Foo; }",
+    //     "    g();",
+    //     "  }",
+    //     "}"),
+    //     VarCheck.UNDEFINED_VAR_ERROR);
+  }
 }
diff --git a/test/com/google/javascript/jscomp/NormalizeTest.java b/test/com/google/javascript/jscomp/NormalizeTest.java
@@ -197,6 +197,7 @@ public void testMoveFunctions2() throws Exception {
     testSame("function f() { function foo() {} }");
     test("function f() { f(); a:function bar() {} }",
          "function f() { f(); a:{ var bar = function () {} }}");
+    setAcceptedLanguage(CompilerOptions.LanguageMode.ECMASCRIPT6);
     test("function f() { f(); {function bar() {}}}",
          "function f() { f(); {var bar = function () {}}}");
     test("function f() { f(); if (true) {function bar() {}}}",
@@ -216,6 +217,7 @@ private void testInFunction(String code, String expected) {
   }
 
   public void testNormalizeFunctionDeclarations() throws Exception {
+    setAcceptedLanguage(CompilerOptions.LanguageMode.ECMASCRIPT6);
     testSame("function f() {}");
     testSame("var f = function () {}");
     test("var f = function f() {}",
@@ -315,6 +317,7 @@ public void testRemoveDuplicateVarDeclarations2() {
   }
 
   public void testRemoveDuplicateVarDeclarations3() {
+    setAcceptedLanguage(CompilerOptions.LanguageMode.ECMASCRIPT6);
     test("var f = 1; function f(){}",
          "f = 1; function f(){}");
     test("var f; function f(){}",

diff --git a/test/com/google/javascript/jscomp/PeepholeRemoveDeadCodeTest.java b/test/com/google/javascript/jscomp/PeepholeRemoveDeadCodeTest.java
@@ -95,7 +95,7 @@ public void testFoldBlocksWithManyChildren() {
     fold("function f() { if (false) {} }", "function f(){}");
     fold("function f() { { if (false) {} if (true) {} {} } }",
          "function f(){}");
-    fold("{var x; var y; var z; function f() { { var a; { var b; } } } }",
+    testEs6("{var x; var y; var z; function f() { { var a; { var b; } } } }",
          "var x;var y;var z;function f(){var a;var b}");
   }
 

diff --git a/test/com/google/javascript/jscomp/RemoveUnusedVarsTest.java b/test/com/google/javascript/jscomp/RemoveUnusedVarsTest.java
@@ -48,6 +48,7 @@ protected CompilerPass getProcessor(final Compiler compiler) {
   }
 
   public void testRemoveUnusedVars() {
+    setAcceptedLanguage(CompilerOptions.LanguageMode.ECMASCRIPT6);
     // Test lots of stuff
     test("var a;var b=3;var c=function(){};var x=A();var y; var z;" +
          "function A(){B()} function B(){C(b)} function C(){} " +

diff --git a/test/com/google/javascript/jscomp/RenameLabelsTest.java b/test/com/google/javascript/jscomp/RenameLabelsTest.java
@@ -33,6 +33,7 @@ public void testRenameInFunction() {
          "function x(){ a(); }");
     test("function x(){ Foo:{ a(); break Foo; } }",
          "function x(){ a:{ a(); break a; } }");
+    setAcceptedLanguage(CompilerOptions.LanguageMode.ECMASCRIPT6);
     test("function x() { " +
             "Foo:{ " +
               "function goo() {" +

diff --git a/test/com/google/javascript/jscomp/RescopeGlobalSymbolsTest.java b/test/com/google/javascript/jscomp/RescopeGlobalSymbolsTest.java
@@ -144,6 +144,7 @@ public void testFunctionStatements() {
     test(
         "function test(){}",
         "_.test=function (){}");
+    setAcceptedLanguage(CompilerOptions.LanguageMode.ECMASCRIPT6);
     test(
         "if(1)function test(){}",
         "if(1)_.test=function (){}");

diff --git a/test/com/google/javascript/jscomp/ScopedAliasesTest.java b/test/com/google/javascript/jscomp/ScopedAliasesTest.java
@@ -866,6 +866,7 @@ public void testNonAliasLocal() {
   }
 
   public void testInvalidVariableInScope() {
+    setAcceptedLanguage(LanguageMode.ECMASCRIPT6);
     testScopedError("if (true) { function f() {}}", ScopedAliases.GOOG_SCOPE_INVALID_VARIABLE);
     testScopedError("for (;;) { function f() {}}", ScopedAliases.GOOG_SCOPE_INVALID_VARIABLE);
   }

diff --git a/test/com/google/javascript/jscomp/StrictModeCheckTest.java b/test/com/google/javascript/jscomp/StrictModeCheckTest.java
@@ -230,17 +230,17 @@ public void testFunctionDecl() {
     testSame(inFn("(function() {})();"));
     testSame(inFn("(function() {});"));
 
-    testError("{function g() {}}", StrictModeCheck.BAD_FUNCTION_DECLARATION);
     testSame("{var g = function () {}}");
     testSame("{(function g() {})()}");
+    testErrorEs6("{function g() {}}", StrictModeCheck.BAD_FUNCTION_DECLARATION);
 
-    testError("var x;if (x) { function g(){} }", StrictModeCheck.BAD_FUNCTION_DECLARATION);
     testSame("var x;if (x) {var g = function () {}}");
     testSame("var x;if (x) {(function g() {})()}");
+    testErrorEs6("var x;if (x) { function g(){} }", StrictModeCheck.BAD_FUNCTION_DECLARATION);
   }
 
   public void testFunctionDecl2() {
-    testError("{function g() {}}", StrictModeCheck.BAD_FUNCTION_DECLARATION);
+    testErrorEs6("{function g() {}}", StrictModeCheck.BAD_FUNCTION_DECLARATION);
   }
 
   public void testClass() {

diff --git a/test/com/google/javascript/jscomp/SyntacticScopeCreatorTest.java b/test/com/google/javascript/jscomp/SyntacticScopeCreatorTest.java
@@ -52,6 +52,7 @@ private Node getRoot(String js) {
   }
 
   public void testFunctionScope() {
+    compiler.getOptions().setLanguageIn(CompilerOptions.LanguageMode.ECMASCRIPT6);
     Scope scope = getScope("function foo() {}\n" +
         "var x = function bar(a1) {};" +
         "[function bar2() { var y; }];" +

diff --git a/test/com/google/javascript/jscomp/TypeCheckTest.java b/test/com/google/javascript/jscomp/TypeCheckTest.java
@@ -8392,6 +8392,7 @@ public void testCast15() {
     // Some code assumes that an object literal must have a object type,
     // while because of the cast, it could have any type (including
     // a union).
+    compiler.getOptions().setLanguageIn(CompilerOptions.LanguageMode.ECMASCRIPT6);
     testTypes(
         "for (var i = 0; i < 10; i++) {" +
           "var x = /** @type {Object|number} */ ({foo: 3});" +
@@ -8713,6 +8714,7 @@ public void testConstDecl1() {
   }
 
   public void testConstDecl2() {
+    compiler.getOptions().setLanguageIn(CompilerOptions.LanguageMode.ECMASCRIPT6);
     testTypes(
         "/** @param {?number} x */" +
         "function f(x) { " +

diff --git a/test/com/google/javascript/jscomp/VarCheckTest.java b/test/com/google/javascript/jscomp/VarCheckTest.java
@@ -267,8 +267,8 @@ public void testVarInWithBlock() {
   }
 
   public void testFunctionDeclaredInBlock() {
-    testError("if (true) {function foo() {}} foo();", VarCheck.UNDEFINED_VAR_ERROR);
-    testError("foo(); if (true) {function foo() {}}", VarCheck.UNDEFINED_VAR_ERROR);
+    testErrorEs6("if (true) {function foo() {}} foo();", VarCheck.UNDEFINED_VAR_ERROR);
+    testErrorEs6("foo(); if (true) {function foo() {}}", VarCheck.UNDEFINED_VAR_ERROR);
 
     testSameEs6("if (true) {var foo = ()=>{}} foo();");
     testErrorEs6("if (true) {let foo = ()=>{}} foo();", VarCheck.UNDEFINED_VAR_ERROR);