Skip to content

fix: Update generated tests to use Message instead of AbstractMessage #3729

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

Draft
wants to merge 10 commits into
base: main
Choose a base branch
from
Draft

fix: Update generated tests to use Message instead of AbstractMessage #3729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b7790c7
chore: Update gax-grpc's testlib refrences to use Message
lqiu96 Apr 1, 2025
b89f792
chore: Update gax-grpc's testlib refrences to use Message
lqiu96 Apr 1, 2025
4ee6251
chore: Update generator to generate Message
lqiu96 Apr 2, 2025
e6e8b97
chore: generate libraries at Wed Apr 2 04:21:51 UTC 2025
cloud-java-bot Apr 2, 2025
d80187e
chore: Rengerate golden tests
lqiu96 Apr 2, 2025
0eee404
chore: Update generated tests
lqiu96 Apr 2, 2025
055e76a
chore: generate libraries at Wed Apr 2 14:40:34 UTC 2025
cloud-java-bot Apr 2, 2025
def6570
chore: Update golden tests
lqiu96 Apr 2, 2025
5389d5d
chore: Update golden tests
lqiu96 Apr 2, 2025
9e705fb
chore: Fix lint issues
lqiu96 Apr 2, 2025
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
3 changes: 1 addition & 2 deletions ...om/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.longrunning.Operation;
import com.google.protobuf.AbstractMessage;
import com.google.protobuf.Any;
import java.io.IOException;
import java.util.ArrayList;
Expand Down Expand Up @@ -902,7 +901,7 @@ protected abstract List<Statement> createRpcLroExceptionTestCatchBody(
private static TypeStore createStaticTypes() {
List<Class<?>> concreteClazzes =
Arrays.asList(
AbstractMessage.class,
com.google.protobuf.Message.class,
After.class,
AfterClass.class,
Any.class,
Expand Down
12 changes: 4 additions & 8 deletions .../src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import com.google.api.generator.gapic.model.GapicClass.Kind;
import com.google.api.generator.gapic.model.GapicContext;
import com.google.api.generator.gapic.model.Service;
import com.google.protobuf.AbstractMessage;
import com.google.protobuf.Message;
import io.grpc.ServerServiceDefinition;
import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -130,7 +130,7 @@ private static MethodDefinition createGetRequestsMethod(
TypeNode.withReference(
ConcreteReference.builder()
.setClazz(List.class)
.setGenerics(Arrays.asList(typeStore.get("AbstractMessage").reference()))
.setGenerics(Arrays.asList(typeStore.get("Message").reference()))
.build());
String methodName = "getRequests";
Expr returnExpr =
Expand All @@ -153,10 +153,7 @@ private static MethodDefinition createAddResponseMethod(
String methodName = "addResponse";
VariableExpr responseArgExpr =
VariableExpr.withVariable(
Variable.builder()
.setName("response")
.setType(typeStore.get("AbstractMessage"))
.build());
Variable.builder().setName("response").setType(typeStore.get("Message")).build());

Expr methodInvocationExpr =
MethodInvocationExpr.builder()
Expand Down Expand Up @@ -235,8 +232,7 @@ private static MethodDefinition createResetMethod(VariableExpr serviceImplVarExp

private static TypeStore createTypes(Service service) {
List<Class<?>> concreteClazzes =
Arrays.asList(
AbstractMessage.class, BetaApi.class, Generated.class, ServerServiceDefinition.class);
Arrays.asList(Message.class, BetaApi.class, Generated.class, ServerServiceDefinition.class);
TypeStore typeStore = new TypeStore(concreteClazzes);

typeStore.put("com.google.api.gax.grpc.testing", "MockGrpcService");
Expand Down
15 changes: 5 additions & 10 deletions .../main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
import com.google.api.generator.gapic.model.Service;
import com.google.api.generator.gapic.utils.JavaStyle;
import com.google.longrunning.Operation;
import com.google.protobuf.AbstractMessage;
import com.google.protobuf.Message;
import io.grpc.ServerServiceDefinition;
import io.grpc.stub.StreamObserver;
import java.util.ArrayList;
Expand All @@ -75,8 +75,7 @@ public class MockServiceImplClassComposer implements ClassComposer {
TypeNode.withReference(
ConcreteReference.builder()
.setClazz(List.class)
.setGenerics(
Arrays.asList(FIXED_TYPESTORE.get("AbstractMessage").reference()))
.setGenerics(Arrays.asList(FIXED_TYPESTORE.get("Message").reference()))
.build()))
.build());

Expand Down Expand Up @@ -179,10 +178,7 @@ private static MethodDefinition createGetRequestsMethod() {
private static MethodDefinition createAddResponseMethod() {
VariableExpr responseArgExpr =
VariableExpr.withVariable(
Variable.builder()
.setName("response")
.setType(FIXED_TYPESTORE.get("AbstractMessage"))
.build());
Variable.builder().setName("response").setType(FIXED_TYPESTORE.get("Message")).build());
Expr methodInvocationExpr =
MethodInvocationExpr.builder()
.setMethodName("add")
Expand All @@ -207,8 +203,7 @@ private static MethodDefinition createSetResponsesMethod(Service service) {
TypeNode.withReference(
ConcreteReference.builder()
.setClazz(List.class)
.setGenerics(
Arrays.asList(FIXED_TYPESTORE.get("AbstractMessage").reference()))
.setGenerics(Arrays.asList(FIXED_TYPESTORE.get("Message").reference()))
.build()))
.build());
Expr responseAssignExpr =
Expand Down Expand Up @@ -598,7 +593,7 @@ private static Statement createHandleObjectStatement(
private static TypeStore createStaticTypes() {
List<Class<?>> concreteClazzes =
Arrays.asList(
AbstractMessage.class,
Message.class,
ArrayList.class,
BetaApi.class,
Generated.class,
Expand Down
6 changes: 3 additions & 3 deletions ...ain/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
import com.google.api.generator.gapic.model.Service;
import com.google.api.generator.gapic.utils.JavaStyle;
import com.google.common.base.Preconditions;
import com.google.protobuf.AbstractMessage;
import io.grpc.StatusRuntimeException;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -378,7 +377,8 @@ protected List<Statement> constructRpcTestCheckerLogic(
ConcreteReference.builder()
.setClazz(List.class)
.setGenerics(
Arrays.asList(ConcreteReference.withClazz(AbstractMessage.class)))
Arrays.asList(
ConcreteReference.withClazz(com.google.protobuf.Message.class)))
.build()))
.setName("actualRequests")
.build());
Expand Down Expand Up @@ -416,7 +416,7 @@ protected List<Statement> constructRpcTestCheckerLogic(
.setArguments(
ValueExpr.withValue(
PrimitiveValue.builder().setType(TypeNode.INT).setValue("0").build()))
.setReturnType(FIXED_TYPESTORE.get("AbstractMessage"))
.setReturnType(FIXED_TYPESTORE.get("Message"))
.build();
getFirstRequestExpr =
CastExpr.builder().setType(method.inputType()).setExpr(getFirstRequestExpr).build();
Expand Down
6 changes: 3 additions & 3 deletions ...a/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceClientTest.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import com.google.api.gax.grpc.testing.MockGrpcService;
import com.google.api.gax.grpc.testing.MockServiceHelper;
import com.google.api.gax.rpc.ApiClientHeaderProvider;
import com.google.api.gax.rpc.InvalidArgumentException;
import com.google.protobuf.AbstractMessage;
import com.google.protobuf.Empty;
import com.google.protobuf.Message;
import io.grpc.StatusRuntimeException;
import java.io.IOException;
import java.util.Arrays;
Expand Down Expand Up @@ -69,7 +69,7 @@ public class DeprecatedServiceClientTest {

client.fastFibonacci(request);

List<AbstractMessage> actualRequests = mockDeprecatedService.getRequests();
List<Message> actualRequests = mockDeprecatedService.getRequests();
Assert.assertEquals(1, actualRequests.size());
FibonacciRequest actualRequest = ((FibonacciRequest) actualRequests.get(0));

Expand Down Expand Up @@ -103,7 +103,7 @@ public class DeprecatedServiceClientTest {

client.slowFibonacci(request);

List<AbstractMessage> actualRequests = mockDeprecatedService.getRequests();
List<Message> actualRequests = mockDeprecatedService.getRequests();
Assert.assertEquals(1, actualRequests.size());
FibonacciRequest actualRequest = ((FibonacciRequest) actualRequests.get(0));

Expand Down
30 changes: 15 additions & 15 deletions .../src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoClientTest.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import com.google.api.gax.rpc.StatusCode;
import com.google.api.resourcenames.ResourceName;
import com.google.common.collect.Lists;
import com.google.longrunning.Operation;
import com.google.protobuf.AbstractMessage;
import com.google.protobuf.Any;
import com.google.protobuf.Duration;
import com.google.protobuf.Message;
import com.google.protobuf.Timestamp;
import com.google.rpc.Status;
import io.grpc.StatusRuntimeException;
Expand Down Expand Up @@ -88,7 +88,7 @@ public class EchoClientTest {
EchoResponse actualResponse = client.echo();
Assert.assertEquals(expectedResponse, actualResponse);

List<AbstractMessage> actualRequests = mockEcho.getRequests();
List<Message> actualRequests = mockEcho.getRequests();
Assert.assertEquals(1, actualRequests.size());
EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0));

Expand Down Expand Up @@ -132,7 +132,7 @@ public class EchoClientTest {
EchoResponse actualResponse = client.echo(parent);
Assert.assertEquals(expectedResponse, actualResponse);

List<AbstractMessage> actualRequests = mockEcho.getRequests();
List<Message> actualRequests = mockEcho.getRequests();
Assert.assertEquals(1, actualRequests.size());
EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0));

Expand Down Expand Up @@ -171,7 +171,7 @@ public class EchoClientTest {
EchoResponse actualResponse = client.echo(error);
Assert.assertEquals(expectedResponse, actualResponse);

List<AbstractMessage> actualRequests = mockEcho.getRequests();
List<Message> actualRequests = mockEcho.getRequests();
Assert.assertEquals(1, actualRequests.size());
EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0));

Expand Down Expand Up @@ -210,7 +210,7 @@ public class EchoClientTest {
EchoResponse actualResponse = client.echo(name);
Assert.assertEquals(expectedResponse, actualResponse);

List<AbstractMessage> actualRequests = mockEcho.getRequests();
List<Message> actualRequests = mockEcho.getRequests();
Assert.assertEquals(1, actualRequests.size());
EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0));

Expand Down Expand Up @@ -249,7 +249,7 @@ public class EchoClientTest {
EchoResponse actualResponse = client.echo(content);
Assert.assertEquals(expectedResponse, actualResponse);

List<AbstractMessage> actualRequests = mockEcho.getRequests();
List<Message> actualRequests = mockEcho.getRequests();
Assert.assertEquals(1, actualRequests.size());
EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0));

Expand Down Expand Up @@ -288,7 +288,7 @@ public class EchoClientTest {
EchoResponse actualResponse = client.echo(name);
Assert.assertEquals(expectedResponse, actualResponse);

List<AbstractMessage> actualRequests = mockEcho.getRequests();
List<Message> actualRequests = mockEcho.getRequests();
Assert.assertEquals(1, actualRequests.size());
EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0));

Expand Down Expand Up @@ -327,7 +327,7 @@ public class EchoClientTest {
EchoResponse actualResponse = client.echo(parent);
Assert.assertEquals(expectedResponse, actualResponse);

List<AbstractMessage> actualRequests = mockEcho.getRequests();
List<Message> actualRequests = mockEcho.getRequests();
Assert.assertEquals(1, actualRequests.size());
EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0));

Expand Down Expand Up @@ -367,7 +367,7 @@ public class EchoClientTest {
EchoResponse actualResponse = client.echo(content, severity);
Assert.assertEquals(expectedResponse, actualResponse);

List<AbstractMessage> actualRequests = mockEcho.getRequests();
List<Message> actualRequests = mockEcho.getRequests();
Assert.assertEquals(1, actualRequests.size());
EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0));

Expand Down Expand Up @@ -635,7 +635,7 @@ public class EchoClientTest {
Assert.assertEquals(1, resources.size());
Assert.assertEquals(expectedResponse.getResponsesList().get(0), resources.get(0));

List<AbstractMessage> actualRequests = mockEcho.getRequests();
List<Message> actualRequests = mockEcho.getRequests();
Assert.assertEquals(1, actualRequests.size());
PagedExpandRequest actualRequest = ((PagedExpandRequest) actualRequests.get(0));

Expand Down Expand Up @@ -684,7 +684,7 @@ public class EchoClientTest {
Assert.assertEquals(1, resources.size());
Assert.assertEquals(expectedResponse.getResponsesList().get(0), resources.get(0));

List<AbstractMessage> actualRequests = mockEcho.getRequests();
List<Message> actualRequests = mockEcho.getRequests();
Assert.assertEquals(1, actualRequests.size());
PagedExpandRequest actualRequest = ((PagedExpandRequest) actualRequests.get(0));

Expand Down Expand Up @@ -730,7 +730,7 @@ public class EchoClientTest {
WaitResponse actualResponse = client.waitAsync(ttl).get();
Assert.assertEquals(expectedResponse, actualResponse);

List<AbstractMessage> actualRequests = mockEcho.getRequests();
List<Message> actualRequests = mockEcho.getRequests();
Assert.assertEquals(1, actualRequests.size());
WaitRequest actualRequest = ((WaitRequest) actualRequests.get(0));

Expand Down Expand Up @@ -774,7 +774,7 @@ public class EchoClientTest {
WaitResponse actualResponse = client.waitAsync(endTime).get();
Assert.assertEquals(expectedResponse, actualResponse);

List<AbstractMessage> actualRequests = mockEcho.getRequests();
List<Message> actualRequests = mockEcho.getRequests();
Assert.assertEquals(1, actualRequests.size());
WaitRequest actualRequest = ((WaitRequest) actualRequests.get(0));

Expand Down Expand Up @@ -812,7 +812,7 @@ public class EchoClientTest {
BlockResponse actualResponse = client.block(request);
Assert.assertEquals(expectedResponse, actualResponse);

List<AbstractMessage> actualRequests = mockEcho.getRequests();
List<Message> actualRequests = mockEcho.getRequests();
Assert.assertEquals(1, actualRequests.size());
BlockRequest actualRequest = ((BlockRequest) actualRequests.get(0));

Expand Down Expand Up @@ -855,7 +855,7 @@ public class EchoClientTest {
Object actualResponse = client.collideName(request);
Assert.assertEquals(expectedResponse, actualResponse);

List<AbstractMessage> actualRequests = mockEcho.getRequests();
List<Message> actualRequests = mockEcho.getRequests();
Assert.assertEquals(1, actualRequests.size());
EchoRequest actualRequest = ((EchoRequest) actualRequests.get(0));

Expand Down
Loading
Loading