Skip to content

Commit

Permalink
Replace uses of TestCase methods with uses of Truth.
Browse files Browse the repository at this point in the history
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=214862611
  • Loading branch information
nreid260 authored and brad4d committed Sep 28, 2018
1 parent 6e813ce commit 117215d
Show file tree
Hide file tree
Showing 9 changed files with 246 additions and 207 deletions.
106 changes: 54 additions & 52 deletions test/com/google/javascript/jscomp/ClosureCodingConventionTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package com.google.javascript.jscomp;

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

import com.google.javascript.jscomp.CodingConvention.SubclassRelationship;
import com.google.javascript.jscomp.CodingConvention.SubclassType;
import com.google.javascript.rhino.Node;
Expand All @@ -42,63 +44,63 @@ public void testVarAndOptionalParams() {
Node.newString(Token.NAME, "opt_a"),
Node.newString(Token.NAME, "opt_b"));

assertFalse(conv.isVarArgsParameter(args.getFirstChild()));
assertFalse(conv.isVarArgsParameter(args.getLastChild()));
assertFalse(conv.isVarArgsParameter(optArgs.getFirstChild()));
assertFalse(conv.isVarArgsParameter(optArgs.getLastChild()));
assertThat(conv.isVarArgsParameter(args.getFirstChild())).isFalse();
assertThat(conv.isVarArgsParameter(args.getLastChild())).isFalse();
assertThat(conv.isVarArgsParameter(optArgs.getFirstChild())).isFalse();
assertThat(conv.isVarArgsParameter(optArgs.getLastChild())).isFalse();

assertFalse(conv.isOptionalParameter(args.getFirstChild()));
assertFalse(conv.isOptionalParameter(args.getLastChild()));
assertFalse(conv.isOptionalParameter(optArgs.getFirstChild()));
assertFalse(conv.isOptionalParameter(optArgs.getLastChild()));
assertThat(conv.isOptionalParameter(args.getFirstChild())).isFalse();
assertThat(conv.isOptionalParameter(args.getLastChild())).isFalse();
assertThat(conv.isOptionalParameter(optArgs.getFirstChild())).isFalse();
assertThat(conv.isOptionalParameter(optArgs.getLastChild())).isFalse();
}

@Test
public void testInlineName() {
assertFalse(conv.isConstant("a"));
assertFalse(conv.isConstant("XYZ123_"));
assertFalse(conv.isConstant("ABC"));
assertFalse(conv.isConstant("ABCdef"));
assertFalse(conv.isConstant("aBC"));
assertFalse(conv.isConstant("A"));
assertFalse(conv.isConstant("_XYZ123"));
assertFalse(conv.isConstant("a$b$XYZ123_"));
assertFalse(conv.isConstant("a$b$ABC_DEF"));
assertFalse(conv.isConstant("a$b$A"));
assertFalse(conv.isConstant("a$b$a"));
assertFalse(conv.isConstant("a$b$ABCdef"));
assertFalse(conv.isConstant("a$b$aBC"));
assertFalse(conv.isConstant("a$b$"));
assertFalse(conv.isConstant("$"));
assertThat(conv.isConstant("a")).isFalse();
assertThat(conv.isConstant("XYZ123_")).isFalse();
assertThat(conv.isConstant("ABC")).isFalse();
assertThat(conv.isConstant("ABCdef")).isFalse();
assertThat(conv.isConstant("aBC")).isFalse();
assertThat(conv.isConstant("A")).isFalse();
assertThat(conv.isConstant("_XYZ123")).isFalse();
assertThat(conv.isConstant("a$b$XYZ123_")).isFalse();
assertThat(conv.isConstant("a$b$ABC_DEF")).isFalse();
assertThat(conv.isConstant("a$b$A")).isFalse();
assertThat(conv.isConstant("a$b$a")).isFalse();
assertThat(conv.isConstant("a$b$ABCdef")).isFalse();
assertThat(conv.isConstant("a$b$aBC")).isFalse();
assertThat(conv.isConstant("a$b$")).isFalse();
assertThat(conv.isConstant("$")).isFalse();
}

@Test
public void testExportedName() {
assertFalse(conv.isExported("_a"));
assertFalse(conv.isExported("_a_"));
assertFalse(conv.isExported("a"));
assertThat(conv.isExported("_a")).isFalse();
assertThat(conv.isExported("_a_")).isFalse();
assertThat(conv.isExported("a")).isFalse();

assertFalse(conv.isExported("$super", false));
assertTrue(conv.isExported("$super", true));
assertTrue(conv.isExported("$super"));
assertThat(conv.isExported("$super", false)).isFalse();
assertThat(conv.isExported("$super", true)).isTrue();
assertThat(conv.isExported("$super")).isTrue();
}

@Test
public void testPrivateName() {
assertFalse(conv.isPrivate("a_"));
assertFalse(conv.isPrivate("a"));
assertFalse(conv.isPrivate("_a_"));
assertThat(conv.isPrivate("a_")).isFalse();
assertThat(conv.isPrivate("a")).isFalse();
assertThat(conv.isPrivate("_a_")).isFalse();
}

@Test
public void testEnumKey() {
assertTrue(conv.isValidEnumKey("A"));
assertTrue(conv.isValidEnumKey("123"));
assertTrue(conv.isValidEnumKey("FOO_BAR"));
assertThat(conv.isValidEnumKey("A")).isTrue();
assertThat(conv.isValidEnumKey("123")).isTrue();
assertThat(conv.isValidEnumKey("FOO_BAR")).isTrue();

assertTrue(conv.isValidEnumKey("a"));
assertTrue(conv.isValidEnumKey("someKeyInCamelCase"));
assertTrue(conv.isValidEnumKey("_FOO_BAR"));
assertThat(conv.isValidEnumKey("a")).isTrue();
assertThat(conv.isValidEnumKey("someKeyInCamelCase")).isTrue();
assertThat(conv.isValidEnumKey("_FOO_BAR")).isTrue();
}

@Test
Expand Down Expand Up @@ -257,11 +259,11 @@ public void testApplySubclassRelationship() {
new NominalTypeBuilderOti(ctorB, ctorB.getInstanceType()),
SubclassType.INHERITS);

assertTrue(ctorB.getPrototype().hasOwnProperty("constructor"));
assertEquals(nodeB, ctorB.getPrototype().getPropertyNode("constructor"));
assertThat(ctorB.getPrototype().hasOwnProperty("constructor")).isTrue();
assertThat(ctorB.getPrototype().getPropertyNode("constructor")).isEqualTo(nodeB);

assertTrue(ctorB.hasOwnProperty("superClass_"));
assertEquals(nodeB, ctorB.getPropertyNode("superClass_"));
assertThat(ctorB.hasOwnProperty("superClass_")).isTrue();
assertThat(ctorB.getPropertyNode("superClass_")).isEqualTo(nodeB);
}

@Test
Expand All @@ -278,57 +280,57 @@ public void testDescribeCachingCall() {

private void assertFunctionBind(String code) {
Node n = parseTestCode(code);
assertNotNull(conv.describeFunctionBind(n.getFirstChild()));
assertThat(conv.describeFunctionBind(n.getFirstChild())).isNotNull();
}

private void assertNotFunctionBind(String code) {
Node n = parseTestCode(code);
assertNull(conv.describeFunctionBind(n.getFirstChild()));
assertThat(conv.describeFunctionBind(n.getFirstChild())).isNull();
}

private void assertRequire(String code) {
Node n = parseTestCode(code);
assertNotNull(conv.extractClassNameIfRequire(n.getFirstChild(), n));
assertThat(conv.extractClassNameIfRequire(n.getFirstChild(), n)).isNotNull();
}

private void assertNotRequire(String code) {
Node n = parseTestCode(code);
assertNull(conv.extractClassNameIfRequire(n.getFirstChild(), n));
assertThat(conv.extractClassNameIfRequire(n.getFirstChild(), n)).isNull();
}

private void assertNotObjectLiteralCast(String code) {
Node n = parseTestCode(code);
assertNull(conv.getObjectLiteralCast(n.getFirstChild()));
assertThat(conv.getObjectLiteralCast(n.getFirstChild())).isNull();
}

private void assertObjectLiteralCast(String code) {
Node n = parseTestCode(code);
assertNotNull(conv.getObjectLiteralCast(n.getFirstChild()));
assertThat(conv.getObjectLiteralCast(n.getFirstChild())).isNotNull();
}

private void assertNotClassDefining(String code) {
Node n = parseTestCode(code);
assertNull(conv.getClassesDefinedByCall(n.getFirstChild()));
assertThat(conv.getClassesDefinedByCall(n.getFirstChild())).isNull();
}

private void assertDefinesClasses(String code, String subclassName,
String superclassName) {
Node n = parseTestCode(code);
SubclassRelationship classes =
conv.getClassesDefinedByCall(n.getFirstChild());
assertNotNull(classes);
assertThat(classes).isNotNull();
assertEquals(subclassName, classes.subclassName);
assertEquals(superclassName, classes.superclassName);
}

private void assertCachingCall(String code) {
Node node = parseTestCode(code);
assertNotNull(conv.describeCachingCall(node.getFirstChild()));
assertThat(conv.describeCachingCall(node.getFirstChild())).isNotNull();
}

private void assertNotCachingCall(String code) {
Node node = parseTestCode(code);
assertNull(conv.describeCachingCall(node.getFirstChild()));
assertThat(conv.describeCachingCall(node.getFirstChild())).isNull();
}

private Node parseTestCode(String code) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,8 @@ private void testClosureFunction(String function, JSType type,
TypedScope scope = (TypedScope) SyntacticScopeCreator.makeTyped(compiler).createScope(n, null);
FlowScope flowScope = LinkedFlowScope.createEntryLattice(scope);

assertEquals(Token.CALL, call.getToken());
assertEquals(Token.NAME, name.getToken());
assertThat(call.getToken()).isEqualTo(Token.CALL);
assertThat(name.getToken()).isEqualTo(Token.NAME);

flowScope = flowScope.inferSlotType("a", type);
ClosureReverseAbstractInterpreter rai = new ClosureReverseAbstractInterpreter(registry);
Expand Down
19 changes: 13 additions & 6 deletions test/com/google/javascript/jscomp/CodePrinterTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.google.javascript.jscomp;

import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static com.google.javascript.jscomp.CompilerTestCase.lines;

import com.google.common.base.Joiner;
Expand Down Expand Up @@ -1794,7 +1795,7 @@ void setOptions(CompilerOptions options) {
public void testSubtraction() {
Compiler compiler = new Compiler();
Node n = compiler.parseTestCode("x - -4");
assertEquals(0, compiler.getErrorCount());
assertThat(compiler.getErrorCount()).isEqualTo(0);

assertEquals(
"x- -4",
Expand Down Expand Up @@ -1926,9 +1927,15 @@ private void testReparse(String code) {
Node parse1 = parse(code);
Node parse2 = parse(new CodePrinter.Builder(parse1).build());
String explanation = parse1.checkTreeEquals(parse2);
assertNull("\nExpected: " + compiler.toSource(parse1) +
"\nResult: " + compiler.toSource(parse2) +
"\n" + explanation, explanation);
assertWithMessage(
"\nExpected: "
+ compiler.toSource(parse1)
+ "\nResult: "
+ compiler.toSource(parse2)
+ "\n"
+ explanation)
.that(explanation)
.isNull();
}

@Test
Expand Down Expand Up @@ -2058,7 +2065,7 @@ public void testFreeCall2() {
Node n = parse("foo(a);");
assertPrintNode("foo(a)", n);
Node call = n.getFirstFirstChild();
assertTrue(call.isCall());
assertThat(call.isCall()).isTrue();
call.putBooleanProp(Node.FREE_CALL, true);
assertPrintNode("foo(a)", n);
}
Expand All @@ -2068,7 +2075,7 @@ public void testFreeCall3() {
Node n = parse("x.foo(a);");
assertPrintNode("x.foo(a)", n);
Node call = n.getFirstFirstChild();
assertTrue(call.isCall());
assertThat(call.isCall()).isTrue();
call.putBooleanProp(Node.FREE_CALL, true);
assertPrintNode("(0,x.foo)(a)", n);
}
Expand Down
4 changes: 3 additions & 1 deletion test/com/google/javascript/jscomp/CodePrinterTestBase.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/
package com.google.javascript.jscomp;

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

import com.google.common.collect.ImmutableList;
import com.google.javascript.jscomp.CompilerOptions.LanguageMode;
import com.google.javascript.rhino.Node;
Expand Down Expand Up @@ -93,7 +95,7 @@ private void checkUnexpectedErrorsOrWarnings(
msg += "Warning:" + err + "\n";
}
}
assertEquals("Unexpected warnings or errors.\n " + msg, expected, actual);
assertWithMessage("Unexpected warnings or errors.\n " + msg).that(actual).isEqualTo(expected);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/
package com.google.javascript.jscomp;

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

import com.google.javascript.rhino.Node;
import java.util.LinkedHashMap;
import java.util.Map;
Expand Down Expand Up @@ -215,7 +217,7 @@ private void testFunctionNamesAndIds(String jsSource, String[] expectedFunctionN
expectedMap.put(id, expectedFunctionNames[id]);
}

assertEquals("Function id/name mismatch", expectedMap, idNameMap);
assertWithMessage("Function id/name mismatch").that(idNameMap).isEqualTo(expectedMap);
}

private void testFunctionNamesAndIds(String jsSource, String expectedFunctionName) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ ConcatTraversal ignore(String s) {

@Override
public void visit(NodeTraversal t, Node n, Node parent) {
assertEquals(Token.STRING, n.getToken());
assertThat(n.getToken()).isEqualTo(Token.STRING);
visited.append(n.getString());
}

@Override
public boolean shouldTraverse(NodeTraversal t, Node n, Node parent) {
assertEquals(Token.STRING, n.getToken());
assertThat(n.getToken()).isEqualTo(Token.STRING);
shouldTraversed.append(n.getString());
return !ignoring.contains(n.getString());
}
Expand Down

0 comments on commit 117215d

Please sign in to comment.