Skip to content

Commit a7d905e

Browse files
chanseokohchanseokoh
authored
Remove warnings for test code (#842)
1 parent 8ca140c commit a7d905e

49 files changed

Lines changed: 121 additions & 243 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1246,8 +1246,7 @@ private static MethodDefinition createToStringMethod(
12461246

12471247
List<Expr> instantiateArgExprs = new ArrayList<>();
12481248
List<String> tokens = getTokenSet(tokenHierarchies).stream().collect(Collectors.toList());
1249-
for (int i = 0; i < tokens.size(); i++) {
1250-
String token = tokens.get(i);
1249+
for (String token : tokens) {
12511250
Preconditions.checkNotNull(
12521251
patternTokenVarExprs.get(token),
12531252
String.format(
@@ -1645,9 +1644,9 @@ private static ClassDefinition createNestedBuilderClass(
16451644
.build());
16461645
}
16471646

1648-
for (int i = 0; i < tokens.size(); i++) {
1647+
for (VariableExpr memberVarExpr : classMemberVarExprs) {
16491648
VariableExpr currClassTokenVarExpr =
1650-
classMemberVarExprs.get(i).toBuilder().setExprReferenceExpr(thisExpr).build();
1649+
memberVarExpr.toBuilder().setExprReferenceExpr(thisExpr).build();
16511650
builderCtorBodyExprs.add(
16521651
AssignmentExpr.builder()
16531652
.setVariableExpr(currClassTokenVarExpr)

‎src/test/java/com/google/api/generator/engine/JavaCodeGeneratorTest.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ private VariableExpr createVarPublicDeclExpr(Variable var) {
297297
.build();
298298
}
299299

300-
private NewObjectExpr createNewObjectExpr(Class clazz) {
300+
private NewObjectExpr createNewObjectExpr(Class<?> clazz) {
301301
return NewObjectExpr.builder()
302302
.setType(TypeNode.withReference(ConcreteReference.withClazz(clazz)))
303303
.setIsGeneric(true)
@@ -460,11 +460,8 @@ private MethodDefinition createOverrideCreateBookMethod(
460460
}
461461

462462
private MethodDefinition createAddShelfMethod() {
463-
ConcreteReference integerUtilRef =
464-
ConcreteReference.builder().setClazz(Integer.class).setIsStaticImport(true).build();
465463
Variable nameVar = createVarFromType(TypeNode.STRING, "name");
466464
Variable seriesDoubleNumVar = createVarFromType(TypeNode.DOUBLE, "seriesDoubleNum");
467-
Variable maxValueVar = createVarFromConcreteRef(integerUtilRef, "MAX_VALUE");
468465
CastExpr seriesNumDoubleToIntExpr =
469466
CastExpr.builder()
470467
.setExpr(VariableExpr.withVariable(seriesDoubleNumVar))

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

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
package com.google.api.generator.engine.ast;
1616

17-
import static junit.framework.Assert.assertEquals;
18-
import static junit.framework.Assert.assertTrue;
17+
import static org.junit.Assert.assertEquals;
1918
import static org.junit.Assert.assertThrows;
19+
import static org.junit.Assert.assertTrue;
2020

2121
import com.google.common.base.Function;
2222
import java.util.Arrays;
@@ -103,10 +103,7 @@ public void validAnonymousClass_genericAndVariableExpr() {
103103
public void invalidAnonymousClass_primitiveType() {
104104
assertThrows(
105105
IllegalStateException.class,
106-
() -> {
107-
AnonymousClassExpr anonymousClassExpr =
108-
AnonymousClassExpr.builder().setType(TypeNode.INT).build();
109-
});
106+
() -> AnonymousClassExpr.builder().setType(TypeNode.INT).build());
110107
}
111108

112109
@Test
@@ -126,10 +123,7 @@ public void invalidAnonymousClass_staticMethod() {
126123

127124
assertThrows(
128125
IllegalStateException.class,
129-
() -> {
130-
AnonymousClassExpr anonymousClassExpr =
131-
AnonymousClassExpr.builder().setType(type).setMethods(Arrays.asList(method)).build();
132-
});
126+
() -> AnonymousClassExpr.builder().setType(type).setMethods(Arrays.asList(method)).build());
133127
}
134128

135129
@Test
@@ -145,10 +139,7 @@ public void invalidAnonymousClass_explicitConstructor() {
145139
.build();
146140
assertThrows(
147141
IllegalStateException.class,
148-
() -> {
149-
AnonymousClassExpr anonymousClassExpr =
150-
AnonymousClassExpr.builder().setType(type).setMethods(Arrays.asList(method)).build();
151-
});
142+
() -> AnonymousClassExpr.builder().setType(type).setMethods(Arrays.asList(method)).build());
152143
}
153144

154145
@Test
@@ -162,13 +153,11 @@ public void invalidAnonymousClass_staticVariableExpr() {
162153
ExprStatement exprStatement = ExprStatement.withExpr(variableExpr);
163154
assertThrows(
164155
IllegalStateException.class,
165-
() -> {
166-
AnonymousClassExpr anonymousClassExpr =
167-
AnonymousClassExpr.builder()
168-
.setType(type)
169-
.setStatements(Arrays.asList(exprStatement))
170-
.build();
171-
});
156+
() ->
157+
AnonymousClassExpr.builder()
158+
.setType(type)
159+
.setStatements(Arrays.asList(exprStatement))
160+
.build());
172161
}
173162

174163
private static AssignmentExpr createAssignmentExpr(

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ public void validCastExpr_basic() {
3232

3333
@Test
3434
public void validCastExpr_basicNull() {
35-
Variable variable = Variable.builder().setName("x").setType(TypeNode.STRING).build();
36-
VariableExpr variableExpr = VariableExpr.builder().setVariable(variable).build();
3735
CastExpr.builder()
3836
.setType(TypeNode.withReference(ConcreteReference.withClazz(Object.class)))
3937
.setExpr(ValueExpr.createNullExpr())

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
package com.google.api.generator.engine.ast;
1616

17-
import static junit.framework.Assert.assertEquals;
18-
import static junit.framework.Assert.assertFalse;
19-
import static junit.framework.Assert.assertTrue;
17+
import static org.junit.Assert.assertEquals;
18+
import static org.junit.Assert.assertFalse;
19+
import static org.junit.Assert.assertTrue;
2020

2121
import java.util.ArrayList;
2222
import java.util.Arrays;

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,12 @@ public void invalidForStatement() {
4949
MethodInvocationExpr.builder().setMethodName("getSomeStrings").build();
5050
assertThrows(
5151
IllegalStateException.class,
52-
() -> {
53-
ForStatement forStatement =
54-
ForStatement.builder()
55-
.setLocalVariableExpr(variableExpr)
56-
.setCollectionExpr(methodExpr)
57-
.setBody(Arrays.asList(ExprStatement.withExpr(createAssignmentExpr())))
58-
.build();
59-
});
52+
() ->
53+
ForStatement.builder()
54+
.setLocalVariableExpr(variableExpr)
55+
.setCollectionExpr(methodExpr)
56+
.setBody(Arrays.asList(ExprStatement.withExpr(createAssignmentExpr())))
57+
.build());
6058
}
6159

6260
private static AssignmentExpr createAssignmentExpr() {

‎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
@@ -14,7 +14,7 @@
1414

1515
package com.google.api.generator.engine.ast;
1616

17-
import static junit.framework.Assert.assertEquals;
17+
import static org.junit.Assert.assertEquals;
1818
import static org.junit.Assert.assertThrows;
1919

2020
import com.google.api.generator.engine.ast.IdentifierNode.InvalidIdentifierException;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package com.google.api.generator.engine.ast;
1616

17-
import static junit.framework.Assert.assertEquals;
17+
import static org.junit.Assert.assertEquals;
1818

1919
import com.google.api.generator.testutils.LineFormatter;
2020
import java.util.Arrays;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
package com.google.api.generator.engine.ast;
1616

17-
import static junit.framework.Assert.assertEquals;
17+
import static org.junit.Assert.assertEquals;
1818
import static org.junit.Assert.assertThrows;
1919

2020
import java.util.Arrays;

‎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
@@ -15,7 +15,7 @@
1515
package com.google.api.generator.engine.ast;
1616

1717
import static com.google.common.truth.Truth.assertThat;
18-
import static junit.framework.Assert.assertEquals;
18+
import static org.junit.Assert.assertEquals;
1919

2020
import org.junit.Test;
2121

0 commit comments

Comments
 (0)