Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ggj][codegen] fix: handle clientStreamingCall in generated tests #586

Merged
merged 7 commits into from
Dec 4, 2020
Merged

[ggj][codegen] fix: handle clientStreamingCall in generated tests #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8bc63f4
fix: fix dep ordering in Bazel dedupe rules
miraleung Dec 2, 2020
43307c0
Merge branch 'master' of github.com:googleapis/gapic-generator-java
miraleung Dec 2, 2020
6a139fa
Merge branch 'master' of github.com:googleapis/gapic-generator-java
miraleung Dec 3, 2020
5db4adb
Merge branch 'master' of github.com:googleapis/gapic-generator-java
miraleung Dec 4, 2020
f71562e
fix: use lowerCamelCase for string types in DefaultValueComposer
miraleung Dec 4, 2020
4514078
fix: handle clientStreamingCall in generated tests
miraleung Dec 4, 2020
3acfb13
Merge branch 'master' into dev/1
miraleung Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,8 @@ private static MethodDefinition createStreamingRpcTestMethod(
.setName("requestObserver")
.build());
List<Expr> callableMethodArgs = new ArrayList<>();
if (!method.stream().equals(Method.Stream.BIDI)) {
if (!method.stream().equals(Method.Stream.BIDI)
&& !method.stream().equals(Method.Stream.CLIENT)) {
callableMethodArgs.add(requestVarExpr);
}
callableMethodArgs.add(responseObserverVarExpr);
Expand Down Expand Up @@ -1361,7 +1362,8 @@ private static List<Statement> createStreamingRpcExceptionTestStatements(
.build());

List<Expr> callableMethodArgs = new ArrayList<>();
if (!method.stream().equals(Method.Stream.BIDI)) {
if (!method.stream().equals(Method.Stream.BIDI)
&& !method.stream().equals(Method.Stream.CLIENT)) {
callableMethodArgs.add(requestVarExpr);
}
callableMethodArgs.add(responseObserverVarExpr);
Expand Down
6 changes: 2 additions & 4 deletions src/test/java/com/google/api/generator/gapic/composer/goldens/EchoClientTest.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,8 +424,7 @@ public class EchoClientTest {
MockStreamObserver<EchoResponse> responseObserver = new MockStreamObserver<>();

ClientStreamingCallable<EchoRequest, EchoResponse> callable = client.collectCallable();
ApiStreamObserver<EchoRequest> requestObserver =
callable.clientStreamingCall(request, responseObserver);
ApiStreamObserver<EchoRequest> requestObserver = callable.clientStreamingCall(responseObserver);

requestObserver.onNext(request);
requestObserver.onCompleted();
Expand All @@ -449,8 +448,7 @@ public class EchoClientTest {
MockStreamObserver<EchoResponse> responseObserver = new MockStreamObserver<>();

ClientStreamingCallable<EchoRequest, EchoResponse> callable = client.collectCallable();
ApiStreamObserver<EchoRequest> requestObserver =
callable.clientStreamingCall(request, responseObserver);
ApiStreamObserver<EchoRequest> requestObserver = callable.clientStreamingCall(responseObserver);

requestObserver.onNext(request);

Expand Down