Visitar URL original
[ggj][engx] fix: switch assertEquals (actual,expected) args order in AST tests by miraleung · Pull Request #504 · googleapis/sdk-platform-java · GitHub
Skip to content
This repository was archived by the owner on Oct 29, 2026. It is now read-only.

[ggj][engx] fix: switch assertEquals (actual,expected) args order in AST tests #504

Merged
miraleung merged 9 commits into from
Nov 18, 2020
Merged

[ggj][engx] fix: switch assertEquals (actual,expected) args order in AST tests #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a3c89f5
fix: Update LRO initial_retry_delayo o 5s (discussion in doc)
miraleung Nov 17, 2020
b4a1ba9
fix: correct some common typos
miraleung Nov 17, 2020
8c9d12d
fix: switch assertEquals (actual,expected) args order in JavaDocComme…
miraleung Nov 17, 2020
58d2718
fix: switch assertEquals (actual,expected) args order in AST tests
miraleung Nov 17, 2020
d60b04c
Merge branch 'master' of github.com:googleapis/gapic-generator-java i…
miraleung Nov 17, 2020
7fdee88
fix: merge master
miraleung Nov 17, 2020
81ad213
Merge branch 'gp/g1' of github.com:googleapis/gapic-generator-java in…
miraleung Nov 17, 2020
729f44f
Merge branch 'gp/g2' of github.com:googleapis/gapic-generator-java in…
miraleung Nov 17, 2020
edee1aa
Merge branch 'master' into gp/g3
miraleung Nov 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/test/java/com/google/api/generator/engine/ast/AnonymousClassExprTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public void validAnonymousClass_basic() {
AnonymousClassExpr anonymousClassExpr =
AnonymousClassExpr.builder().setType(type).setMethods(Arrays.asList(method)).build();
assertTrue(TypeNode.isReferenceType(anonymousClassExpr.type()));
assertEquals(anonymousClassExpr.type(), type);
assertEquals(type, anonymousClassExpr.type());
}

@Test
Expand Down Expand Up @@ -96,7 +96,7 @@ public void validAnonymousClass_genericAndVariableExpr() {
.setMethods(Arrays.asList(method))
.build();
assertTrue(TypeNode.isReferenceType(anonymousClassExpr.type()));
assertEquals(anonymousClassExpr.type(), type);
assertEquals(type, anonymousClassExpr.type());
}

@Test
Expand Down
16 changes: 8 additions & 8 deletions src/test/java/com/google/api/generator/engine/ast/ConcreteReferenceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,30 +29,30 @@ public class ConcreteReferenceTest {
@Test
public void basicConcreteReference() {
Reference reference = ConcreteReference.builder().setClazz(Integer.class).build();
assertEquals(reference.name(), Integer.class.getSimpleName());
assertEquals(Integer.class.getSimpleName(), reference.name());
assertFalse(reference.isStaticImport());
}

@Test
public void basicConcreteReference_setIsStaticImport() {
Reference reference =
ConcreteReference.builder().setClazz(Integer.class).setIsStaticImport(true).build();
assertEquals(reference.name(), Integer.class.getSimpleName());
assertEquals(Integer.class.getSimpleName(), reference.name());
assertFalse(reference.isStaticImport());
}

@Test
public void basicConcreteReference_nested() {
Reference reference = ConcreteReference.builder().setClazz(Map.Entry.class).build();
assertEquals(reference.name(), "Map.Entry");
assertEquals("Map.Entry", reference.name());
assertFalse(reference.isStaticImport());
}

@Test
public void basicConcreteReference_nestedAndStaticImport() {
Reference reference =
ConcreteReference.builder().setClazz(Map.Entry.class).setIsStaticImport(true).build();
assertEquals(reference.name(), Map.Entry.class.getSimpleName());
assertEquals(Map.Entry.class.getSimpleName(), reference.name());
assertTrue(reference.isStaticImport());
}

Expand All @@ -67,7 +67,7 @@ public void parameterizedConcreteReference() {
ConcreteReference.withClazz(Integer.class)))
.build();
assertEquals(reference.name(), "HashMap<String, Integer>");
assertEquals(reference.fullName(), "java.util.HashMap");
assertEquals("java.util.HashMap", reference.fullName());
}

@Test
Expand All @@ -91,8 +91,8 @@ public void nestedParameterizedConcreteReference() {
.setGenerics(Arrays.asList(outerMapReference))
.build();
assertEquals(
listReference.name(), "List<HashMap<HashMap<String, Integer>, HashMap<String, Integer>>>");
assertEquals(listReference.fullName(), "java.util.List");
"List<HashMap<HashMap<String, Integer>, HashMap<String, Integer>>>", listReference.name());
assertEquals("java.util.List", listReference.fullName());
}

@Test
Expand Down Expand Up @@ -143,7 +143,7 @@ public void isSupertype_nestedGenerics() {

@Test
public void wildcards() {
assertEquals("?", ConcreteReference.wildcard().name());
assertEquals(ConcreteReference.wildcard().name(), "?");
assertEquals(
"? extends String",
ConcreteReference.wildcardWithUpperBound(TypeNode.STRING.reference()).name());
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/google/api/generator/engine/ast/IdentifierNodeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,6 @@ private static void assertInvalidIdentifier(String idName) {
}

private static void assertValidIdentifier(String idName) {
assertEquals(IdentifierNode.builder().setName(idName).build().name(), idName);
assertEquals(idName, IdentifierNode.builder().setName(idName).build().name());
}
}
8 changes: 4 additions & 4 deletions src/test/java/com/google/api/generator/engine/ast/IfStatementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public void validIfStatement_simple() {
.setConditionExpr(createConditionExpr("condition"))
.setBody(createAssignmentExprList())
.build();
assertEquals(ifStatement.conditionExpr().type(), TypeNode.BOOLEAN);
assertEquals(TypeNode.BOOLEAN, ifStatement.conditionExpr().type());
}

@Test
Expand All @@ -43,7 +43,7 @@ public void validIfStatement_booleanObjectCondition() {
.setConditionExpr(condExpr)
.setBody(createAssignmentExprList())
.build();
assertEquals(ifStatement.conditionExpr().type(), TypeNode.BOOLEAN);
assertEquals(TypeNode.BOOLEAN, ifStatement.conditionExpr().type());
}

@Test
Expand All @@ -60,7 +60,7 @@ public void validIfStatement_elseIfsAndElse() {
.addElseIf(thirdCondExpr, createAssignmentExprList())
.setElseBody(createAssignmentExprList())
.build();
assertEquals(ifStatement.conditionExpr().type(), TypeNode.BOOLEAN);
assertEquals(TypeNode.BOOLEAN, ifStatement.conditionExpr().type());
}

@Test
Expand All @@ -78,7 +78,7 @@ public void validIfStatement_nested() {
.setConditionExpr(condExpr)
.setBody(Arrays.asList(nestedIfStatement))
.build();
assertEquals(ifStatement.conditionExpr().type(), TypeNode.BOOLEAN);
assertEquals(TypeNode.BOOLEAN, ifStatement.conditionExpr().type());
}

private static List<Statement> createAssignmentExprList() {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/google/api/generator/engine/ast/NullObjectValueTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public class NullObjectValueTest {
@Test
public void createNullObjectValue_valid() {
NullObjectValue nullValue = NullObjectValue.create();
assertEquals(nullValue.value(), NULL_VALUE);
assertEquals(NULL_VALUE, nullValue.value());
assertThat(nullValue.type()).isEqualTo(TypeNode.NULL);
}
}
2 changes: 1 addition & 1 deletion src/test/java/com/google/api/generator/engine/ast/PrimitiveValueTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void createPrimitiveValue_unsupported() {
private static void assertValidValue(TypeKind typeKind, String value) {
TypeNode type = TypeNode.builder().setTypeKind(typeKind).build();
PrimitiveValue primitiveValue = PrimitiveValue.builder().setType(type).setValue(value).build();
assertEquals(primitiveValue.value(), value);
assertEquals(value, primitiveValue.value());
assertThat(primitiveValue.type()).isEqualTo(type);
}

Expand Down
8 changes: 4 additions & 4 deletions src/test/java/com/google/api/generator/engine/ast/ReferenceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ public void nestedGenerics_concreteReferenceOuter() {
.setGenerics(Arrays.asList(outerMapReference))
.build();
assertEquals(
listReference.name(), "List<HashMap<HashMap<String, Integer>, HashMap<String, Integer>>>");
assertEquals(listReference.fullName(), "java.util.List");
"List<HashMap<HashMap<String, Integer>, HashMap<String, Integer>>>", listReference.name());
assertEquals("java.util.List", listReference.fullName());
}

@Test
Expand All @@ -72,8 +72,8 @@ public void nestedGenerics_vaporReferenceOuter() {
.setGenerics(Arrays.asList(outerMapReference))
.build();
assertEquals(
listReference.name(), "List<HashMap<HashMap<String, Integer>, HashMap<String, Integer>>>");
assertEquals(listReference.fullName(), "java.util.List");
"List<HashMap<HashMap<String, Integer>, HashMap<String, Integer>>>", listReference.name());
assertEquals("java.util.List", listReference.fullName());
}

@Test
Expand Down
40 changes: 20 additions & 20 deletions src/test/java/com/google/api/generator/engine/ast/TernaryExprTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ public void validTernaryExpr_primitiveType() {
.setThenExpr(thenExpr)
.setElseExpr(elseExpr)
.build();
assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
assertEquals(ternaryExpr.thenExpr().type(), ternaryExpr.elseExpr().type());
assertEquals(ternaryExpr.type(), TypeNode.INT);
assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
assertEquals(ternaryExpr.elseExpr().type(), ternaryExpr.thenExpr().type());
assertEquals(TypeNode.INT, ternaryExpr.type());
}

@Test
Expand All @@ -59,9 +59,9 @@ public void validTernaryExpr_objectType() {
.setThenExpr(thenExpr)
.setElseExpr(elseExpr)
.build();
assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
assertEquals(ternaryExpr.thenExpr().type(), ternaryExpr.elseExpr().type());
assertEquals(ternaryExpr.type(), TypeNode.STRING);
assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
assertEquals(ternaryExpr.elseExpr().type(), ternaryExpr.thenExpr().type());
assertEquals(TypeNode.STRING, ternaryExpr.type());
}

@Test
Expand All @@ -82,9 +82,9 @@ public void validTernaryExpr_primitiveAndBoxedType() {
.setThenExpr(thenExpr)
.setElseExpr(elseExpr)
.build();
assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
assertEquals(ternaryExpr.thenExpr().type(), ternaryExpr.elseExpr().type());
assertEquals(ternaryExpr.type(), TypeNode.INT_OBJECT);
assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
assertEquals(ternaryExpr.elseExpr().type(), ternaryExpr.thenExpr().type());
assertEquals(TypeNode.INT_OBJECT, ternaryExpr.type());
}

@Test
Expand All @@ -106,9 +106,9 @@ public void validTernaryExpr_boxedAndPrimitiveType() {
.setThenExpr(thenExpr)
.setElseExpr(elseExpr)
.build();
assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
assertEquals(ternaryExpr.thenExpr().type(), ternaryExpr.elseExpr().type());
assertEquals(ternaryExpr.type(), TypeNode.DOUBLE_OBJECT);
assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
assertEquals(ternaryExpr.elseExpr().type(), ternaryExpr.thenExpr().type());
assertEquals(TypeNode.DOUBLE_OBJECT, ternaryExpr.type());
}

@Test
Expand All @@ -121,8 +121,8 @@ public void validTernaryExpr_objectAndNull() {
.setThenExpr(ValueExpr.withValue(StringObjectValue.withValue("foobar")))
.setElseExpr(ValueExpr.withValue(NullObjectValue.create()))
.build();
assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
assertEquals(ternaryExpr.type(), TypeNode.STRING);
assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
assertEquals(TypeNode.STRING, ternaryExpr.type());
}

@Test
Expand All @@ -135,8 +135,8 @@ public void validTernaryExpr_nullAndObject() {
.setThenExpr(ValueExpr.withValue(NullObjectValue.create()))
.setElseExpr(ValueExpr.withValue(StringObjectValue.withValue("foobar")))
.build();
assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
assertEquals(ternaryExpr.type(), TypeNode.STRING);
assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
assertEquals(TypeNode.STRING, ternaryExpr.type());
}

@Test
Expand All @@ -151,8 +151,8 @@ public void validTernaryExpr_superAndSubtype() {
Variable.builder().setName("anObject").setType(TypeNode.OBJECT).build()))
.setElseExpr(ValueExpr.withValue(StringObjectValue.withValue("foobar")))
.build();
assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
assertEquals(ternaryExpr.type(), TypeNode.OBJECT);
assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
assertEquals(TypeNode.OBJECT, ternaryExpr.type());
}

@Test
Expand All @@ -167,8 +167,8 @@ public void validTernaryExpr_subAndSupertype() {
VariableExpr.withVariable(
Variable.builder().setName("anObject").setType(TypeNode.OBJECT).build()))
.build();
assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
assertEquals(ternaryExpr.type(), TypeNode.OBJECT);
assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
assertEquals(TypeNode.OBJECT, ternaryExpr.type());
}

@Test
Expand Down
18 changes: 9 additions & 9 deletions src/test/java/com/google/api/generator/engine/ast/VaporReferenceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ public void basic() {
String pkg = "com.google.example.examples.library.v1";
String name = "Babbage";
Reference ref = VaporReference.builder().setName(name).setPakkage(pkg).build();
assertEquals(ref.name(), name);
assertEquals(ref.fullName(), String.format("%s.%s", pkg, name));
assertEquals(name, ref.name());
assertEquals(String.format("%s.%s", pkg, name), ref.fullName());
assertFalse(ref.hasEnclosingClass());
assertTrue(ref.isFromPackage(pkg));
assertFalse(ref.isFromPackage("com.google.example.library"));
Expand All @@ -39,8 +39,8 @@ public void basic_isStaticImport() {
String name = "Babbage";
Reference ref =
VaporReference.builder().setName(name).setPakkage(pkg).setIsStaticImport(true).build();
assertEquals(ref.name(), name);
assertEquals(ref.fullName(), String.format("%s.%s", pkg, name));
assertEquals(name, ref.name());
assertEquals(String.format("%s.%s", pkg, name), ref.fullName());
assertFalse(ref.hasEnclosingClass());
assertTrue(ref.isFromPackage(pkg));
// isStaticImport is automatically false for non-nested classes.
Expand All @@ -60,9 +60,9 @@ public void basic_nested() {
.setPakkage(pkg)
.build();

assertEquals(ref.name(), "Babbage.Ada.Charles");
assertEquals("Babbage.Ada.Charles", ref.name());
assertTrue(ref.hasEnclosingClass());
assertEquals(ref.fullName(), String.format("%s.%s.%s.%s", pkg, "Babbage", "Ada", name));
assertEquals(String.format("%s.%s.%s.%s", pkg, "Babbage", "Ada", name), ref.fullName());
assertTrue(ref.hasEnclosingClass());
assertTrue(ref.isFromPackage(pkg));
assertFalse(ref.isFromPackage("com.google.example.library"));
Expand All @@ -81,8 +81,8 @@ public void basic_nestedAndStaticImport() {
.setPakkage(pkg)
.setIsStaticImport(true)
.build();
assertEquals(ref.name(), name);
assertEquals(ref.fullName(), String.format("%s.%s.%s", pkg, enclosingClassName, name));
assertEquals(name, ref.name());
assertEquals(String.format("%s.%s.%s", pkg, enclosingClassName, name), ref.fullName());
assertTrue(ref.hasEnclosingClass());
assertTrue(ref.isFromPackage(pkg));
assertFalse(ref.isFromPackage("com.google.example.library"));
Expand Down Expand Up @@ -114,6 +114,6 @@ public void enclosingClass() {
.setEnclosingClassNames(enclosingName)
.build();
assertTrue(ref.hasEnclosingClass());
assertEquals(ref.fullName(), String.format("%s.%s.%s", pkg, enclosingName, name));
assertEquals(String.format("%s.%s.%s", pkg, enclosingName, name), ref.fullName());
}
}
4 changes: 2 additions & 2 deletions src/test/java/com/google/api/generator/engine/ast/VariableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public void createVariable_setIdentifier() {
.setIdentifier(identifierNode)
.setName("y")
.build();
assertEquals(variable.name(), "y");
assertEquals("y", variable.name());
assertThat(variable.type()).isEqualTo(TypeNode.STRING);
}

Expand All @@ -54,7 +54,7 @@ public void createVariable_invalidType() {
private static void assertValidVariable(TypeKind typeKind, String name) {
TypeNode type = TypeNode.builder().setTypeKind(typeKind).build();
Variable variable = Variable.builder().setType(type).setName(name).build();
assertEquals(variable.name(), name);
assertEquals(name, variable.name());
assertThat(variable.type()).isEqualTo(type);
}

Expand Down
6 changes: 3 additions & 3 deletions src/test/java/com/google/api/generator/engine/ast/WhileStatementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public void validWhileStatement_simple() {
.setConditionExpr(createConditionExpr("condition"))
.setBody(createAssignmentExprList())
.build();
assertEquals(whileStatement.conditionExpr().type(), TypeNode.BOOLEAN);
assertEquals(TypeNode.BOOLEAN, whileStatement.conditionExpr().type());
}

@Test
Expand All @@ -43,7 +43,7 @@ public void validWhileStatement_booleanObjectCondition() {
.setConditionExpr(condExpr)
.setBody(createAssignmentExprList())
.build();
assertEquals(whileStatement.conditionExpr().type(), TypeNode.BOOLEAN);
assertEquals(TypeNode.BOOLEAN, whileStatement.conditionExpr().type());
}

@Test
Expand All @@ -58,7 +58,7 @@ public void validWhileStatement_nested() {
.setConditionExpr(createConditionExpr("condition"))
.setBody(Arrays.asList(nestedWhileStatement))
.build();
assertEquals(whileStatement.conditionExpr().type(), TypeNode.BOOLEAN);
assertEquals(TypeNode.BOOLEAN, whileStatement.conditionExpr().type());
}

@Test
Expand Down