Skip to content

Commit ca747f5

Browse files
authored
[ggj][codegen] fix: ServiceClientTest settings init and tearDown method (#335)
* feat: add protobuf comment parser util * fix: add basic proto build rules * feat: add header comments to ServiceClient * fix: build protoc at test time * fix!: wrap protobuf location and process comments * feat: add comment parsing to methods and fields * fix: test * feat: add protobuf comments to ServiceClient * fix: solidify codegen method order with TypeNode/MethodArg and Comparable * fix: clean up tests * fix: ServiceClient member variables and method calls * fix: ServiceStubSettings builder type * fix: ServiceSettings Builder construction * fix: ServiceStub callable types * feat: java_gapic_library rule impl * fix: remove debugging comments * feat: add gradle assembly Bazel rules * feat: add java_gapic_test Bazel rule * fix: use Java packages for resname codegen * fix: build resnames separately and extract into proto/ dir * fix: remove debug printf * feat: add ServiceClient.MethodPagedResponse inner class * feat: add ServiceClient.MethodPage inner class * feat: add ServiceClient.MethodFixedSizeCollection innser class * fix: clean up resname codegen, lower_snake varnames * fix: init remaining resname tokenVars to null * fix: ServiceStubSettings paged descriptor rep. field getter name * fix: handle map/list args in ServiceClient * fix: ServiceSTubSettings batching request type * fix: GrpcServiceStub createPagedCallable * fix: remove @OverRide from MockServiceImpl * fix: sServiceClientTest ettings var init * fix: tearDown method in test
1 parent b89bc3a commit ca747f5

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ private static MethodDefinition createSetUpMethod(
326326

327327
Expr initLocalSettingsExpr =
328328
AssignmentExpr.builder()
329-
.setVariableExpr(localSettingsVarExpr)
329+
.setVariableExpr(localSettingsVarExpr.toBuilder().setIsDecl(true).build())
330330
.setValueExpr(settingsBuilderExpr)
331331
.build();
332332

@@ -365,7 +365,6 @@ private static MethodDefinition createTearDownMethod(
365365
return MethodDefinition.builder()
366366
.setAnnotations(Arrays.asList(AnnotationNode.withType(staticTypes.get("After"))))
367367
.setScope(ScopeNode.PUBLIC)
368-
.setIsStatic(true)
369368
.setReturnType(TypeNode.VOID)
370369
.setName("tearDown")
371370
.setThrowsExceptions(

src/test/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public void generateServiceClasses() {
102102
+ " public void setUp() throws IOException {\n"
103103
+ " mockServiceHelper.reset();\n"
104104
+ " channelProvider = mockServiceHelper.createChannelProvider();\n"
105-
+ " settings =\n"
105+
+ " EchoSettings settings =\n"
106106
+ " EchoSettings.newBuilder()\n"
107107
+ " .setTransportChannelProvider(channelProvider)\n"
108108
+ " .setCredentialsProvider(NoCredentialsProvider.create())\n"
@@ -111,7 +111,7 @@ public void generateServiceClasses() {
111111
+ " }\n"
112112
+ "\n"
113113
+ " @After\n"
114-
+ " public static void tearDown() throws Exception {\n"
114+
+ " public void tearDown() throws Exception {\n"
115115
+ " client.close();\n"
116116
+ " }\n"
117117
+ "}\n";

0 commit comments

Comments
 (0)