Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit bd029cc

Browse files
miraleungmiraleung
authored
[ggj][engx] fix: switch assertEquals (actual,expected) args order in AST tests (#504)
* fix: Update LRO initial_retry_delayo o 5s (discussion in doc) * fix: correct some common typos * fix: switch assertEquals (actual,expected) args order in JavaDocCommentTest * fix: switch assertEquals (actual,expected) args order in AST tests * fix: merge master
1 parent 3b96764 commit bd029cc

11 files changed

+55
-55
lines changed

‎src/test/java/com/google/api/generator/engine/ast/AnonymousClassExprTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void validAnonymousClass_basic() {
4141
AnonymousClassExpr anonymousClassExpr =
4242
AnonymousClassExpr.builder().setType(type).setMethods(Arrays.asList(method)).build();
4343
assertTrue(TypeNode.isReferenceType(anonymousClassExpr.type()));
44-
assertEquals(anonymousClassExpr.type(), type);
44+
assertEquals(type, anonymousClassExpr.type());
4545
}
4646

4747
@Test
@@ -96,7 +96,7 @@ public void validAnonymousClass_genericAndVariableExpr() {
9696
.setMethods(Arrays.asList(method))
9797
.build();
9898
assertTrue(TypeNode.isReferenceType(anonymousClassExpr.type()));
99-
assertEquals(anonymousClassExpr.type(), type);
99+
assertEquals(type, anonymousClassExpr.type());
100100
}
101101

102102
@Test

‎src/test/java/com/google/api/generator/engine/ast/ConcreteReferenceTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,30 +29,30 @@ public class ConcreteReferenceTest {
2929
@Test
3030
public void basicConcreteReference() {
3131
Reference reference = ConcreteReference.builder().setClazz(Integer.class).build();
32-
assertEquals(reference.name(), Integer.class.getSimpleName());
32+
assertEquals(Integer.class.getSimpleName(), reference.name());
3333
assertFalse(reference.isStaticImport());
3434
}
3535

3636
@Test
3737
public void basicConcreteReference_setIsStaticImport() {
3838
Reference reference =
3939
ConcreteReference.builder().setClazz(Integer.class).setIsStaticImport(true).build();
40-
assertEquals(reference.name(), Integer.class.getSimpleName());
40+
assertEquals(Integer.class.getSimpleName(), reference.name());
4141
assertFalse(reference.isStaticImport());
4242
}
4343

4444
@Test
4545
public void basicConcreteReference_nested() {
4646
Reference reference = ConcreteReference.builder().setClazz(Map.Entry.class).build();
47-
assertEquals(reference.name(), "Map.Entry");
47+
assertEquals("Map.Entry", reference.name());
4848
assertFalse(reference.isStaticImport());
4949
}
5050

5151
@Test
5252
public void basicConcreteReference_nestedAndStaticImport() {
5353
Reference reference =
5454
ConcreteReference.builder().setClazz(Map.Entry.class).setIsStaticImport(true).build();
55-
assertEquals(reference.name(), Map.Entry.class.getSimpleName());
55+
assertEquals(Map.Entry.class.getSimpleName(), reference.name());
5656
assertTrue(reference.isStaticImport());
5757
}
5858

@@ -67,7 +67,7 @@ public void parameterizedConcreteReference() {
6767
ConcreteReference.withClazz(Integer.class)))
6868
.build();
6969
assertEquals(reference.name(), "HashMap<String, Integer>");
70-
assertEquals(reference.fullName(), "java.util.HashMap");
70+
assertEquals("java.util.HashMap", reference.fullName());
7171
}
7272

7373
@Test
@@ -91,8 +91,8 @@ public void nestedParameterizedConcreteReference() {
9191
.setGenerics(Arrays.asList(outerMapReference))
9292
.build();
9393
assertEquals(
94-
listReference.name(), "List<HashMap<HashMap<String, Integer>, HashMap<String, Integer>>>");
95-
assertEquals(listReference.fullName(), "java.util.List");
94+
"List<HashMap<HashMap<String, Integer>, HashMap<String, Integer>>>", listReference.name());
95+
assertEquals("java.util.List", listReference.fullName());
9696
}
9797

9898
@Test
@@ -143,7 +143,7 @@ public void isSupertype_nestedGenerics() {
143143

144144
@Test
145145
public void wildcards() {
146-
assertEquals("?", ConcreteReference.wildcard().name());
146+
assertEquals(ConcreteReference.wildcard().name(), "?");
147147
assertEquals(
148148
"? extends String",
149149
ConcreteReference.wildcardWithUpperBound(TypeNode.STRING.reference()).name());

‎src/test/java/com/google/api/generator/engine/ast/IdentifierNodeTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,6 @@ private static void assertInvalidIdentifier(String idName) {
113113
}
114114

115115
private static void assertValidIdentifier(String idName) {
116-
assertEquals(IdentifierNode.builder().setName(idName).build().name(), idName);
116+
assertEquals(idName, IdentifierNode.builder().setName(idName).build().name());
117117
}
118118
}

‎src/test/java/com/google/api/generator/engine/ast/IfStatementTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void validIfStatement_simple() {
2828
.setConditionExpr(createConditionExpr("condition"))
2929
.setBody(createAssignmentExprList())
3030
.build();
31-
assertEquals(ifStatement.conditionExpr().type(), TypeNode.BOOLEAN);
31+
assertEquals(TypeNode.BOOLEAN, ifStatement.conditionExpr().type());
3232
}
3333

3434
@Test
@@ -43,7 +43,7 @@ public void validIfStatement_booleanObjectCondition() {
4343
.setConditionExpr(condExpr)
4444
.setBody(createAssignmentExprList())
4545
.build();
46-
assertEquals(ifStatement.conditionExpr().type(), TypeNode.BOOLEAN);
46+
assertEquals(TypeNode.BOOLEAN, ifStatement.conditionExpr().type());
4747
}
4848

4949
@Test
@@ -60,7 +60,7 @@ public void validIfStatement_elseIfsAndElse() {
6060
.addElseIf(thirdCondExpr, createAssignmentExprList())
6161
.setElseBody(createAssignmentExprList())
6262
.build();
63-
assertEquals(ifStatement.conditionExpr().type(), TypeNode.BOOLEAN);
63+
assertEquals(TypeNode.BOOLEAN, ifStatement.conditionExpr().type());
6464
}
6565

6666
@Test
@@ -78,7 +78,7 @@ public void validIfStatement_nested() {
7878
.setConditionExpr(condExpr)
7979
.setBody(Arrays.asList(nestedIfStatement))
8080
.build();
81-
assertEquals(ifStatement.conditionExpr().type(), TypeNode.BOOLEAN);
81+
assertEquals(TypeNode.BOOLEAN, ifStatement.conditionExpr().type());
8282
}
8383

8484
private static List<Statement> createAssignmentExprList() {

‎src/test/java/com/google/api/generator/engine/ast/NullObjectValueTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class NullObjectValueTest {
2525
@Test
2626
public void createNullObjectValue_valid() {
2727
NullObjectValue nullValue = NullObjectValue.create();
28-
assertEquals(nullValue.value(), NULL_VALUE);
28+
assertEquals(NULL_VALUE, nullValue.value());
2929
assertThat(nullValue.type()).isEqualTo(TypeNode.NULL);
3030
}
3131
}

‎src/test/java/com/google/api/generator/engine/ast/PrimitiveValueTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void createPrimitiveValue_unsupported() {
4949
private static void assertValidValue(TypeKind typeKind, String value) {
5050
TypeNode type = TypeNode.builder().setTypeKind(typeKind).build();
5151
PrimitiveValue primitiveValue = PrimitiveValue.builder().setType(type).setValue(value).build();
52-
assertEquals(primitiveValue.value(), value);
52+
assertEquals(value, primitiveValue.value());
5353
assertThat(primitiveValue.type()).isEqualTo(type);
5454
}
5555

‎src/test/java/com/google/api/generator/engine/ast/ReferenceTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ public void nestedGenerics_concreteReferenceOuter() {
4545
.setGenerics(Arrays.asList(outerMapReference))
4646
.build();
4747
assertEquals(
48-
listReference.name(), "List<HashMap<HashMap<String, Integer>, HashMap<String, Integer>>>");
49-
assertEquals(listReference.fullName(), "java.util.List");
48+
"List<HashMap<HashMap<String, Integer>, HashMap<String, Integer>>>", listReference.name());
49+
assertEquals("java.util.List", listReference.fullName());
5050
}
5151

5252
@Test
@@ -72,8 +72,8 @@ public void nestedGenerics_vaporReferenceOuter() {
7272
.setGenerics(Arrays.asList(outerMapReference))
7373
.build();
7474
assertEquals(
75-
listReference.name(), "List<HashMap<HashMap<String, Integer>, HashMap<String, Integer>>>");
76-
assertEquals(listReference.fullName(), "java.util.List");
75+
"List<HashMap<HashMap<String, Integer>, HashMap<String, Integer>>>", listReference.name());
76+
assertEquals("java.util.List", listReference.fullName());
7777
}
7878

7979
@Test

‎src/test/java/com/google/api/generator/engine/ast/TernaryExprTest.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ public void validTernaryExpr_primitiveType() {
3737
.setThenExpr(thenExpr)
3838
.setElseExpr(elseExpr)
3939
.build();
40-
assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
41-
assertEquals(ternaryExpr.thenExpr().type(), ternaryExpr.elseExpr().type());
42-
assertEquals(ternaryExpr.type(), TypeNode.INT);
40+
assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
41+
assertEquals(ternaryExpr.elseExpr().type(), ternaryExpr.thenExpr().type());
42+
assertEquals(TypeNode.INT, ternaryExpr.type());
4343
}
4444

4545
@Test
@@ -59,9 +59,9 @@ public void validTernaryExpr_objectType() {
5959
.setThenExpr(thenExpr)
6060
.setElseExpr(elseExpr)
6161
.build();
62-
assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
63-
assertEquals(ternaryExpr.thenExpr().type(), ternaryExpr.elseExpr().type());
64-
assertEquals(ternaryExpr.type(), TypeNode.STRING);
62+
assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
63+
assertEquals(ternaryExpr.elseExpr().type(), ternaryExpr.thenExpr().type());
64+
assertEquals(TypeNode.STRING, ternaryExpr.type());
6565
}
6666

6767
@Test
@@ -82,9 +82,9 @@ public void validTernaryExpr_primitiveAndBoxedType() {
8282
.setThenExpr(thenExpr)
8383
.setElseExpr(elseExpr)
8484
.build();
85-
assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
86-
assertEquals(ternaryExpr.thenExpr().type(), ternaryExpr.elseExpr().type());
87-
assertEquals(ternaryExpr.type(), TypeNode.INT_OBJECT);
85+
assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
86+
assertEquals(ternaryExpr.elseExpr().type(), ternaryExpr.thenExpr().type());
87+
assertEquals(TypeNode.INT_OBJECT, ternaryExpr.type());
8888
}
8989

9090
@Test
@@ -106,9 +106,9 @@ public void validTernaryExpr_boxedAndPrimitiveType() {
106106
.setThenExpr(thenExpr)
107107
.setElseExpr(elseExpr)
108108
.build();
109-
assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
110-
assertEquals(ternaryExpr.thenExpr().type(), ternaryExpr.elseExpr().type());
111-
assertEquals(ternaryExpr.type(), TypeNode.DOUBLE_OBJECT);
109+
assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
110+
assertEquals(ternaryExpr.elseExpr().type(), ternaryExpr.thenExpr().type());
111+
assertEquals(TypeNode.DOUBLE_OBJECT, ternaryExpr.type());
112112
}
113113

114114
@Test
@@ -121,8 +121,8 @@ public void validTernaryExpr_objectAndNull() {
121121
.setThenExpr(ValueExpr.withValue(StringObjectValue.withValue("foobar")))
122122
.setElseExpr(ValueExpr.withValue(NullObjectValue.create()))
123123
.build();
124-
assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
125-
assertEquals(ternaryExpr.type(), TypeNode.STRING);
124+
assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
125+
assertEquals(TypeNode.STRING, ternaryExpr.type());
126126
}
127127

128128
@Test
@@ -135,8 +135,8 @@ public void validTernaryExpr_nullAndObject() {
135135
.setThenExpr(ValueExpr.withValue(NullObjectValue.create()))
136136
.setElseExpr(ValueExpr.withValue(StringObjectValue.withValue("foobar")))
137137
.build();
138-
assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
139-
assertEquals(ternaryExpr.type(), TypeNode.STRING);
138+
assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
139+
assertEquals(TypeNode.STRING, ternaryExpr.type());
140140
}
141141

142142
@Test
@@ -151,8 +151,8 @@ public void validTernaryExpr_superAndSubtype() {
151151
Variable.builder().setName("anObject").setType(TypeNode.OBJECT).build()))
152152
.setElseExpr(ValueExpr.withValue(StringObjectValue.withValue("foobar")))
153153
.build();
154-
assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
155-
assertEquals(ternaryExpr.type(), TypeNode.OBJECT);
154+
assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
155+
assertEquals(TypeNode.OBJECT, ternaryExpr.type());
156156
}
157157

158158
@Test
@@ -167,8 +167,8 @@ public void validTernaryExpr_subAndSupertype() {
167167
VariableExpr.withVariable(
168168
Variable.builder().setName("anObject").setType(TypeNode.OBJECT).build()))
169169
.build();
170-
assertEquals(ternaryExpr.conditionExpr().type(), TypeNode.BOOLEAN);
171-
assertEquals(ternaryExpr.type(), TypeNode.OBJECT);
170+
assertEquals(TypeNode.BOOLEAN, ternaryExpr.conditionExpr().type());
171+
assertEquals(TypeNode.OBJECT, ternaryExpr.type());
172172
}
173173

174174
@Test

‎src/test/java/com/google/api/generator/engine/ast/VaporReferenceTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ public void basic() {
2626
String pkg = "com.google.example.examples.library.v1";
2727
String name = "Babbage";
2828
Reference ref = VaporReference.builder().setName(name).setPakkage(pkg).build();
29-
assertEquals(ref.name(), name);
30-
assertEquals(ref.fullName(), String.format("%s.%s", pkg, name));
29+
assertEquals(name, ref.name());
30+
assertEquals(String.format("%s.%s", pkg, name), ref.fullName());
3131
assertFalse(ref.hasEnclosingClass());
3232
assertTrue(ref.isFromPackage(pkg));
3333
assertFalse(ref.isFromPackage("com.google.example.library"));
@@ -39,8 +39,8 @@ public void basic_isStaticImport() {
3939
String name = "Babbage";
4040
Reference ref =
4141
VaporReference.builder().setName(name).setPakkage(pkg).setIsStaticImport(true).build();
42-
assertEquals(ref.name(), name);
43-
assertEquals(ref.fullName(), String.format("%s.%s", pkg, name));
42+
assertEquals(name, ref.name());
43+
assertEquals(String.format("%s.%s", pkg, name), ref.fullName());
4444
assertFalse(ref.hasEnclosingClass());
4545
assertTrue(ref.isFromPackage(pkg));
4646
// isStaticImport is automatically false for non-nested classes.
@@ -60,9 +60,9 @@ public void basic_nested() {
6060
.setPakkage(pkg)
6161
.build();
6262

63-
assertEquals(ref.name(), "Babbage.Ada.Charles");
63+
assertEquals("Babbage.Ada.Charles", ref.name());
6464
assertTrue(ref.hasEnclosingClass());
65-
assertEquals(ref.fullName(), String.format("%s.%s.%s.%s", pkg, "Babbage", "Ada", name));
65+
assertEquals(String.format("%s.%s.%s.%s", pkg, "Babbage", "Ada", name), ref.fullName());
6666
assertTrue(ref.hasEnclosingClass());
6767
assertTrue(ref.isFromPackage(pkg));
6868
assertFalse(ref.isFromPackage("com.google.example.library"));
@@ -81,8 +81,8 @@ public void basic_nestedAndStaticImport() {
8181
.setPakkage(pkg)
8282
.setIsStaticImport(true)
8383
.build();
84-
assertEquals(ref.name(), name);
85-
assertEquals(ref.fullName(), String.format("%s.%s.%s", pkg, enclosingClassName, name));
84+
assertEquals(name, ref.name());
85+
assertEquals(String.format("%s.%s.%s", pkg, enclosingClassName, name), ref.fullName());
8686
assertTrue(ref.hasEnclosingClass());
8787
assertTrue(ref.isFromPackage(pkg));
8888
assertFalse(ref.isFromPackage("com.google.example.library"));
@@ -114,6 +114,6 @@ public void enclosingClass() {
114114
.setEnclosingClassNames(enclosingName)
115115
.build();
116116
assertTrue(ref.hasEnclosingClass());
117-
assertEquals(ref.fullName(), String.format("%s.%s.%s", pkg, enclosingName, name));
117+
assertEquals(String.format("%s.%s.%s", pkg, enclosingName, name), ref.fullName());
118118
}
119119
}

‎src/test/java/com/google/api/generator/engine/ast/VariableTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void createVariable_setIdentifier() {
4141
.setIdentifier(identifierNode)
4242
.setName("y")
4343
.build();
44-
assertEquals(variable.name(), "y");
44+
assertEquals("y", variable.name());
4545
assertThat(variable.type()).isEqualTo(TypeNode.STRING);
4646
}
4747

@@ -54,7 +54,7 @@ public void createVariable_invalidType() {
5454
private static void assertValidVariable(TypeKind typeKind, String name) {
5555
TypeNode type = TypeNode.builder().setTypeKind(typeKind).build();
5656
Variable variable = Variable.builder().setType(type).setName(name).build();
57-
assertEquals(variable.name(), name);
57+
assertEquals(name, variable.name());
5858
assertThat(variable.type()).isEqualTo(type);
5959
}
6060

0 commit comments

Comments
 (0)