Skip to content

Commit

Permalink
Separate out Es6ForOfConverterTest from Es6ToEs3ConverterTest
Browse files Browse the repository at this point in the history 
Es6ToEs3ConverterTest is really an integration test for a lot of transpilation passes, so it would be helpful to have a separate for-of unit test class for testing type info propagation.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=194804547
  • Loading branch information
@lauraharker
lauraharker committed Apr 30, 2018
1 parent 4dc239e commit a7f0655
Show file tree
Hide file tree
Showing 2 changed files with 203 additions and 103 deletions.
203 changes: 203 additions & 0 deletions test/com/google/javascript/jscomp/Es6ForOfConverterTest.java
View file
@@ -0,0 +1,203 @@
/*
* Copyright 2014 The Closure Compiler Authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.google.javascript.jscomp;

import static com.google.common.truth.Truth.assertThat;

import com.google.javascript.jscomp.CompilerOptions.LanguageMode;

/**
* Test cases for {@link Es6ForOfConverter}
*
* @author lharker@google.com (Laura Harker)
*/
public final class Es6ForOfConverterTest extends CompilerTestCase {

private static final String EXTERNS_BASE =
lines(
MINIMAL_EXTERNS,
"/** @constructor @template T */",
"function Arguments() {}",
"/**",
" * @param {string|!Array<T>|!Iterable<T>|!Iterator<T>|!Arguments<T>} iterable",
" * @return {!Iterator<T>}",
" * @template T",
" */",
"$jscomp.makeIterator = function(iterable) {};");

public Es6ForOfConverterTest() {
super(EXTERNS_BASE);
}

@Override
protected void setUp() throws Exception {
super.setUp();
setAcceptedLanguage(LanguageMode.ECMASCRIPT_2015);
setLanguageOut(LanguageMode.ECMASCRIPT3);
enableRunTypeCheckAfterProcessing();
}
@Override
protected CompilerPass getProcessor(final Compiler compiler) {
return new Es6ForOfConverter(compiler);
}

@Override
protected int getNumRepetitions() {
return 1;
}

public void testForOf() {

// With array literal and declaring new bound variable.
test(
"for (var i of [1,2,3]) { console.log(i); }",
lines(
"for (var $jscomp$iter$0 = $jscomp.makeIterator([1,2,3]),",
" $jscomp$key$i = $jscomp$iter$0.next();",
" !$jscomp$key$i.done; $jscomp$key$i = $jscomp$iter$0.next()) {",
" var i = $jscomp$key$i.value;",
" {",
" console.log(i);",
" }",
"}"));
assertThat(getLastCompiler().injected).containsExactly("es6/util/makeiterator");

// With simple assign instead of var declaration in bound variable.
test(
"for (i of [1,2,3]) { console.log(i); }",
lines(
"for (var $jscomp$iter$0 = $jscomp.makeIterator([1,2,3]),",
" $jscomp$key$i = $jscomp$iter$0.next();",
" !$jscomp$key$i.done; $jscomp$key$i = $jscomp$iter$0.next()) {",
" i = $jscomp$key$i.value;",
" {",
" console.log(i);",
" }",
"}"));

// With name instead of array literal.
test(
"for (var i of arr) { console.log(i); }",
lines(
"for (var $jscomp$iter$0 = $jscomp.makeIterator(arr),",
" $jscomp$key$i = $jscomp$iter$0.next();",
" !$jscomp$key$i.done; $jscomp$key$i = $jscomp$iter$0.next()) {",
" var i = $jscomp$key$i.value;",
" {",
" console.log(i);",
" }",
"}"));

// With empty loop body.
test(
"for (var i of [1,2,3]);",
lines(
"for (var $jscomp$iter$0 = $jscomp.makeIterator([1,2,3]),",
" $jscomp$key$i = $jscomp$iter$0.next();",
" !$jscomp$key$i.done; $jscomp$key$i = $jscomp$iter$0.next()) {",
" var i = $jscomp$key$i.value;",
" {}",
"}"));

// With no block in for loop body.
test(
"for (var i of [1,2,3]) console.log(i);",
lines(
"for (var $jscomp$iter$0 = $jscomp.makeIterator([1,2,3]),",
" $jscomp$key$i = $jscomp$iter$0.next();",
" !$jscomp$key$i.done; $jscomp$key$i = $jscomp$iter$0.next()) {",
" var i = $jscomp$key$i.value;",
" {",
" console.log(i);",
" }",
"}"));

// Iteration var shadows an outer var ()
test(
"var i = 'outer'; for (let i of [1, 2, 3]) { alert(i); } alert(i);",
lines(
"var i = 'outer';",
"for (var $jscomp$iter$0 = $jscomp.makeIterator([1,2,3]),",
" $jscomp$key$i = $jscomp$iter$0.next();",
" !$jscomp$key$i.done; $jscomp$key$i = $jscomp$iter$0.next()) {",
" let i = $jscomp$key$i.value;",
" {",
" alert(i);",
" }",
"}",
"alert(i);"));
}

public void testForOfRedeclaredVar() {
test(
lines("for (let x of []) {", " let x = 0;", "}"),
lines(
"for(var $jscomp$iter$0=$jscomp.makeIterator([]),",
" $jscomp$key$x=$jscomp$iter$0.next();",
" !$jscomp$key$x.done; $jscomp$key$x=$jscomp$iter$0.next()) {",
" let x = $jscomp$key$x.value;",
" {",
" let x = 0;",
" }",
"}"));
}

public void testForOfJSDoc() {
test(
"for (/** @type {string} */ let x of []) {}",
lines(
"for(var $jscomp$iter$0=$jscomp.makeIterator([]),",
" $jscomp$key$x=$jscomp$iter$0.next();",
" !$jscomp$key$x.done;$jscomp$key$x=$jscomp$iter$0.next()) {",
" /** @type {string} */",
" let x = $jscomp$key$x.value;",
" {}",
"}"));
test(
"for (/** @type {string} */ x of []) {}",
lines(
"for(var $jscomp$iter$0=$jscomp.makeIterator([]),",
" $jscomp$key$x=$jscomp$iter$0.next();",
" !$jscomp$key$x.done;$jscomp$key$x=$jscomp$iter$0.next()) {",
" /** @type {string} */",
" x = $jscomp$key$x.value;",
" {}",
"}"));
}

public void testForOfOnNonIterable() {
enableTypeCheck();
testWarning(
lines(
"var arrayLike = {",
" 0: 'x',",
" 1: 'y',",
" length: 2,",
"};",
"for (var x of arrayLike) {}"),
TypeValidator.TYPE_MISMATCH_WARNING);
}

@Override
protected Compiler createCompiler() {
return new NoninjectingCompiler();
}

@Override
protected NoninjectingCompiler getLastCompiler() {
return (NoninjectingCompiler) super.getLastCompiler();
}
}
103 changes: 0 additions & 103 deletions test/com/google/javascript/jscomp/Es6ToEs3ConverterTest.java
View file
Expand Up @@ -2311,71 +2311,6 @@ public void testDefaultAndRestParameters() {
} }


public void testForOf() { public void testForOf() {

// With array literal and declaring new bound variable.
test(
"for (var i of [1,2,3]) { console.log(i); }",
lines(
"for (var $jscomp$iter$0 = $jscomp.makeIterator([1,2,3]),",
" $jscomp$key$i = $jscomp$iter$0.next();",
" !$jscomp$key$i.done; $jscomp$key$i = $jscomp$iter$0.next()) {",
" var i = $jscomp$key$i.value;",
" {",
" console.log(i);",
" }",
"}"));
assertThat(getLastCompiler().injected).containsExactly("es6/util/makeiterator");

// With simple assign instead of var declaration in bound variable.
test(
"for (i of [1,2,3]) { console.log(i); }",
lines(
"for (var $jscomp$iter$0 = $jscomp.makeIterator([1,2,3]),",
" $jscomp$key$i = $jscomp$iter$0.next();",
" !$jscomp$key$i.done; $jscomp$key$i = $jscomp$iter$0.next()) {",
" i = $jscomp$key$i.value;",
" {",
" console.log(i);",
" }",
"}"));

// With name instead of array literal.
test(
"for (var i of arr) { console.log(i); }",
lines(
"for (var $jscomp$iter$0 = $jscomp.makeIterator(arr),",
" $jscomp$key$i = $jscomp$iter$0.next();",
" !$jscomp$key$i.done; $jscomp$key$i = $jscomp$iter$0.next()) {",
" var i = $jscomp$key$i.value;",
" {",
" console.log(i);",
" }",
"}"));

// With empty loop body.
test(
"for (var i of [1,2,3]);",
lines(
"for (var $jscomp$iter$0 = $jscomp.makeIterator([1,2,3]),",
" $jscomp$key$i = $jscomp$iter$0.next();",
" !$jscomp$key$i.done; $jscomp$key$i = $jscomp$iter$0.next()) {",
" var i = $jscomp$key$i.value;",
" {}",
"}"));

// With no block in for loop body.
test(
"for (var i of [1,2,3]) console.log(i);",
lines(
"for (var $jscomp$iter$0 = $jscomp.makeIterator([1,2,3]),",
" $jscomp$key$i = $jscomp$iter$0.next();",
" !$jscomp$key$i.done; $jscomp$key$i = $jscomp$iter$0.next()) {",
" var i = $jscomp$key$i.value;",
" {",
" console.log(i);",
" }",
"}"));

// Iteration var shadows an outer var () // Iteration var shadows an outer var ()
test( test(
"var i = 'outer'; for (let i of [1, 2, 3]) { alert(i); } alert(i);", "var i = 'outer'; for (let i of [1, 2, 3]) { alert(i); } alert(i);",
Expand Down Expand Up @@ -2409,29 +2344,6 @@ public void testForOfRedeclaredVar() {
"}")); "}"));
} }


public void testForOfJSDoc() {
test(
"for (/** @type {string} */ let x of []) {}",
lines(
"for(var $jscomp$iter$0=$jscomp.makeIterator([]),",
" $jscomp$key$x=$jscomp$iter$0.next();",
" !$jscomp$key$x.done;$jscomp$key$x=$jscomp$iter$0.next()) {",
" /** @type {string} */",
" var x = $jscomp$key$x.value;",
" {}",
"}"));
test(
"for (/** @type {string} */ x of []) {}",
lines(
"for(var $jscomp$iter$0=$jscomp.makeIterator([]),",
" $jscomp$key$x=$jscomp$iter$0.next();",
" !$jscomp$key$x.done;$jscomp$key$x=$jscomp$iter$0.next()) {",
" /** @type {string} */",
" x = $jscomp$key$x.value;",
" {}",
"}"));
}

public void testSpreadArray() { public void testSpreadArray() {
test( test(
"var arr = [1, 2, ...mid, 4, 5];", "var arr = [1, 2, ...mid, 4, 5];",
Expand Down Expand Up @@ -2480,21 +2392,6 @@ public void testArgumentsEscaped() {
"}")); "}"));
} }


public void testForOfOnNonIterable() {
enableTypeCheck();

test(
srcs(
lines(
"var arrayLike = {",
" 0: 'x',",
" 1: 'y',",
" length: 2,",
"};",
"for (var x of arrayLike) {}")),
warning(TypeValidator.TYPE_MISMATCH_WARNING));
}

public void testSpreadCall() { public void testSpreadCall() {
test("f(...arr);", "f.apply(null, $jscomp.arrayFromIterable(arr));"); test("f(...arr);", "f.apply(null, $jscomp.arrayFromIterable(arr));");
test("f(0, ...g());", "f.apply(null, [0].concat($jscomp.arrayFromIterable(g())));"); test("f(0, ...g());", "f.apply(null, [0].concat($jscomp.arrayFromIterable(g())));");
Expand Down

0 comments on commit a7f0655

Please sign in to comment.