Skip to content

chore: refactor golden tests for autopopulation feature #2446

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

Merged
merged 11 commits into from
Feb 8, 2024
Merged

chore: refactor golden tests for autopopulation feature #2446

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
de0ad99
feat: refactor golden tests for autopopulation feature
alicejli Feb 7, 2024
2ab5c69
Merge branch 'main' into refactorGoldenTests
alicejli Feb 7, 2024
ca8c469
Merge branch 'main' into refactorGoldenTests
alicejli Feb 8, 2024
b060dec
fix name of unit test
alicejli Feb 8, 2024
02acb2e
Merge branch 'refactorGoldenTests' of https://github.com/googleapis/s…
alicejli Feb 8, 2024
0b7cdcf
add grpcrest tests
alicejli Feb 8, 2024
1d96eee
Merge branch 'main' into refactorGoldenTests
alicejli Feb 8, 2024
4ea87da
remove grpcrest tests
alicejli Feb 8, 2024
13283b0
Merge branch 'refactorGoldenTests' of https://github.com/googleapis/s…
alicejli Feb 8, 2024
2a6bc06
Merge branch 'main' into refactorGoldenTests
alicejli Feb 8, 2024
87c58c9
Merge branch 'main' into refactorGoldenTests
alicejli Feb 8, 2024
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
6 changes: 0 additions & 6 deletions ...t/java/com/google/api/generator/gapic/composer/defaultvalue/DefaultValueComposerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,12 +568,6 @@ public void createSimpleMessage_containsMessagesEnumsAndResourceName() {
"EchoRequest.newBuilder().setName("
+ "FoobarName.ofProjectFoobarName(\"[PROJECT]\", \"[FOOBAR]\").toString())"
+ ".setParent(FoobarName.ofProjectFoobarName(\"[PROJECT]\", \"[FOOBAR]\").toString())"
+ ".setRequestId(\"requestId693933066\")"
+ ".setSecondRequestId(\"secondRequestId344404470\")"
+ ".setThirdRequestId(true)"
+ ".setFourthRequestId(\"fourthRequestId-2116417776\")"
+ ".setFifthRequestId(\"fifthRequestId959024147\")"
+ ".setSixthRequestId(\"sixthRequestId1005218260\")"
+ ".setSeverity(Severity.forNumber(0))"
+ ".setFoobar(Foobar.newBuilder().build()).build()",
writerVisitor.write());
Expand Down
10 changes: 10 additions & 0 deletions ...t/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,14 @@ public void generateGrpcServiceStubClass_createBatchingCallable() {
Assert.assertGoldenClass(this.getClass(), clazz, "GrpcLoggingStub.golden");
Assert.assertEmptySamples(clazz.samples());
}

@Test
public void generateGrpcServiceStubClass_autopopulateField() {
GapicContext context = GrpcTestProtoLoader.instance().parseAutoPopulateFieldTesting();
Service service = context.services().get(0);
GapicClass clazz = GrpcServiceStubClassComposer.instance().generate(context, service);

Assert.assertGoldenClass(this.getClass(), clazz, "GrpcAutoPopulateFieldStub.golden");
Assert.assertEmptySamples(clazz.samples());
}
}
48 changes: 1 addition & 47 deletions ...java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoClient.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,12 +517,6 @@ public class EchoClient implements BackgroundResource {
* EchoRequest.newBuilder()
* .setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
* .setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
* .setRequestId("requestId693933066")
* .setSecondRequestId("secondRequestId344404470")
* .setThirdRequestId(true)
* .setFourthRequestId("fourthRequestId-2116417776")
* .setFifthRequestId("fifthRequestId959024147")
* .setSixthRequestId("sixthRequestId1005218260")
* .setSeverity(Severity.forNumber(0))
* .setFoobar(Foobar.newBuilder().build())
* .build();
Expand Down Expand Up @@ -552,12 +546,6 @@ public class EchoClient implements BackgroundResource {
* EchoRequest.newBuilder()
* .setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
* .setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
* .setRequestId("requestId693933066")
* .setSecondRequestId("secondRequestId344404470")
* .setThirdRequestId(true)
* .setFourthRequestId("fourthRequestId-2116417776")
* .setFifthRequestId("fifthRequestId959024147")
* .setSixthRequestId("sixthRequestId1005218260")
* .setSeverity(Severity.forNumber(0))
* .setFoobar(Foobar.newBuilder().build())
* .build();
Expand All @@ -583,11 +571,7 @@ public class EchoClient implements BackgroundResource {
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
* try (EchoClient echoClient = EchoClient.create()) {
* ExpandRequest request =
* ExpandRequest.newBuilder()
* .setContent("content951530617")
* .setInfo("info3237038")
* .setRequestId("requestId693933066")
* .build();
* ExpandRequest.newBuilder().setContent("content951530617").setInfo("info3237038").build();
* ServerStream<EchoResponse> stream = echoClient.expandCallable().call(request);
* for (EchoResponse response : stream) {
* // Do something when a response is received.
Expand Down Expand Up @@ -633,12 +617,6 @@ public class EchoClient implements BackgroundResource {
* EchoRequest.newBuilder()
* .setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
* .setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
* .setRequestId("requestId693933066")
* .setSecondRequestId("secondRequestId344404470")
* .setThirdRequestId(true)
* .setFourthRequestId("fourthRequestId-2116417776")
* .setFifthRequestId("fifthRequestId959024147")
* .setSixthRequestId("sixthRequestId1005218260")
* .setSeverity(Severity.forNumber(0))
* .setFoobar(Foobar.newBuilder().build())
* .build();
Expand Down Expand Up @@ -666,12 +644,6 @@ public class EchoClient implements BackgroundResource {
* EchoRequest.newBuilder()
* .setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
* .setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
* .setRequestId("requestId693933066")
* .setSecondRequestId("secondRequestId344404470")
* .setThirdRequestId(true)
* .setFourthRequestId("fourthRequestId-2116417776")
* .setFifthRequestId("fifthRequestId959024147")
* .setSixthRequestId("sixthRequestId1005218260")
* .setSeverity(Severity.forNumber(0))
* .setFoobar(Foobar.newBuilder().build())
* .build();
Expand Down Expand Up @@ -702,12 +674,6 @@ public class EchoClient implements BackgroundResource {
* EchoRequest.newBuilder()
* .setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
* .setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
* .setRequestId("requestId693933066")
* .setSecondRequestId("secondRequestId344404470")
* .setThirdRequestId(true)
* .setFourthRequestId("fourthRequestId-2116417776")
* .setFifthRequestId("fifthRequestId959024147")
* .setSixthRequestId("sixthRequestId1005218260")
* .setSeverity(Severity.forNumber(0))
* .setFoobar(Foobar.newBuilder().build())
* .build();
Expand Down Expand Up @@ -1116,12 +1082,6 @@ public class EchoClient implements BackgroundResource {
* EchoRequest.newBuilder()
* .setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
* .setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
* .setRequestId("requestId693933066")
* .setSecondRequestId("secondRequestId344404470")
* .setThirdRequestId(true)
* .setFourthRequestId("fourthRequestId-2116417776")
* .setFifthRequestId("fifthRequestId959024147")
* .setSixthRequestId("sixthRequestId1005218260")
* .setSeverity(Severity.forNumber(0))
* .setFoobar(Foobar.newBuilder().build())
* .build();
Expand Down Expand Up @@ -1151,12 +1111,6 @@ public class EchoClient implements BackgroundResource {
* EchoRequest.newBuilder()
* .setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
* .setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
* .setRequestId("requestId693933066")
* .setSecondRequestId("secondRequestId344404470")
* .setThirdRequestId(true)
* .setFourthRequestId("fourthRequestId-2116417776")
* .setFifthRequestId("fifthRequestId959024147")
* .setSixthRequestId("sixthRequestId1005218260")
* .setSeverity(Severity.forNumber(0))
* .setFoobar(Foobar.newBuilder().build())
* .build();
Expand Down
72 changes: 2 additions & 70 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 @@ -108,12 +108,6 @@ public class EchoClientTest {
EchoRequest.newBuilder()
.setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
.setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
.setRequestId("requestId693933066")
.setSecondRequestId("secondRequestId344404470")
.setThirdRequestId(true)
.setFourthRequestId("fourthRequestId-2116417776")
.setFifthRequestId("fifthRequestId959024147")
.setSixthRequestId("sixthRequestId1005218260")
.setSeverity(Severity.forNumber(0))
.setFoobar(Foobar.newBuilder().build())
.build();
Expand Down Expand Up @@ -409,11 +403,7 @@ public class EchoClientTest {
.build();
mockEcho.addResponse(expectedResponse);
ExpandRequest request =
ExpandRequest.newBuilder()
.setContent("content951530617")
.setInfo("info3237038")
.setRequestId("requestId693933066")
.build();
ExpandRequest.newBuilder().setContent("content951530617").setInfo("info3237038").build();

MockStreamObserver<EchoResponse> responseObserver = new MockStreamObserver<>();

Expand All @@ -430,11 +420,7 @@ public class EchoClientTest {
StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT);
mockEcho.addException(exception);
ExpandRequest request =
ExpandRequest.newBuilder()
.setContent("content951530617")
.setInfo("info3237038")
.setRequestId("requestId693933066")
.build();
ExpandRequest.newBuilder().setContent("content951530617").setInfo("info3237038").build();

MockStreamObserver<EchoResponse> responseObserver = new MockStreamObserver<>();

Expand Down Expand Up @@ -463,12 +449,6 @@ public class EchoClientTest {
EchoRequest.newBuilder()
.setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
.setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
.setRequestId("requestId693933066")
.setSecondRequestId("secondRequestId344404470")
.setThirdRequestId(true)
.setFourthRequestId("fourthRequestId-2116417776")
.setFifthRequestId("fifthRequestId959024147")
.setSixthRequestId("sixthRequestId1005218260")
.setSeverity(Severity.forNumber(0))
.setFoobar(Foobar.newBuilder().build())
.build();
Expand All @@ -494,12 +474,6 @@ public class EchoClientTest {
EchoRequest.newBuilder()
.setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
.setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
.setRequestId("requestId693933066")
.setSecondRequestId("secondRequestId344404470")
.setThirdRequestId(true)
.setFourthRequestId("fourthRequestId-2116417776")
.setFifthRequestId("fifthRequestId959024147")
.setSixthRequestId("sixthRequestId1005218260")
.setSeverity(Severity.forNumber(0))
.setFoobar(Foobar.newBuilder().build())
.build();
Expand Down Expand Up @@ -533,12 +507,6 @@ public class EchoClientTest {
EchoRequest.newBuilder()
.setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
.setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
.setRequestId("requestId693933066")
.setSecondRequestId("secondRequestId344404470")
.setThirdRequestId(true)
.setFourthRequestId("fourthRequestId-2116417776")
.setFifthRequestId("fifthRequestId959024147")
.setSixthRequestId("sixthRequestId1005218260")
.setSeverity(Severity.forNumber(0))
.setFoobar(Foobar.newBuilder().build())
.build();
Expand All @@ -564,12 +532,6 @@ public class EchoClientTest {
EchoRequest.newBuilder()
.setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
.setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
.setRequestId("requestId693933066")
.setSecondRequestId("secondRequestId344404470")
.setThirdRequestId(true)
.setFourthRequestId("fourthRequestId-2116417776")
.setFifthRequestId("fifthRequestId959024147")
.setSixthRequestId("sixthRequestId1005218260")
.setSeverity(Severity.forNumber(0))
.setFoobar(Foobar.newBuilder().build())
.build();
Expand Down Expand Up @@ -603,12 +565,6 @@ public class EchoClientTest {
EchoRequest.newBuilder()
.setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
.setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
.setRequestId("requestId693933066")
.setSecondRequestId("secondRequestId344404470")
.setThirdRequestId(true)
.setFourthRequestId("fourthRequestId-2116417776")
.setFifthRequestId("fifthRequestId959024147")
.setSixthRequestId("sixthRequestId1005218260")
.setSeverity(Severity.forNumber(0))
.setFoobar(Foobar.newBuilder().build())
.build();
Expand All @@ -634,12 +590,6 @@ public class EchoClientTest {
EchoRequest.newBuilder()
.setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
.setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
.setRequestId("requestId693933066")
.setSecondRequestId("secondRequestId344404470")
.setThirdRequestId(true)
.setFourthRequestId("fourthRequestId-2116417776")
.setFifthRequestId("fifthRequestId959024147")
.setSixthRequestId("sixthRequestId1005218260")
.setSeverity(Severity.forNumber(0))
.setFoobar(Foobar.newBuilder().build())
.build();
Expand Down Expand Up @@ -898,12 +848,6 @@ public class EchoClientTest {
EchoRequest.newBuilder()
.setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
.setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
.setRequestId("requestId693933066")
.setSecondRequestId("secondRequestId344404470")
.setThirdRequestId(true)
.setFourthRequestId("fourthRequestId-2116417776")
.setFifthRequestId("fifthRequestId959024147")
.setSixthRequestId("sixthRequestId1005218260")
.setSeverity(Severity.forNumber(0))
.setFoobar(Foobar.newBuilder().build())
.build();
Expand All @@ -917,12 +861,6 @@ public class EchoClientTest {

Assert.assertEquals(request.getName(), actualRequest.getName());
Assert.assertEquals(request.getParent(), actualRequest.getParent());
Assert.assertEquals(request.getRequestId(), actualRequest.getRequestId());
Assert.assertEquals(request.getSecondRequestId(), actualRequest.getSecondRequestId());
Assert.assertEquals(request.getThirdRequestId(), actualRequest.getThirdRequestId());
Assert.assertEquals(request.getFourthRequestId(), actualRequest.getFourthRequestId());
Assert.assertEquals(request.getFifthRequestId(), actualRequest.getFifthRequestId());
Assert.assertEquals(request.getSixthRequestId(), actualRequest.getSixthRequestId());
Assert.assertEquals(request.getContent(), actualRequest.getContent());
Assert.assertEquals(request.getError(), actualRequest.getError());
Assert.assertEquals(request.getSeverity(), actualRequest.getSeverity());
Expand All @@ -943,12 +881,6 @@ public class EchoClientTest {
EchoRequest.newBuilder()
.setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
.setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
.setRequestId("requestId693933066")
.setSecondRequestId("secondRequestId344404470")
.setThirdRequestId(true)
.setFourthRequestId("fourthRequestId-2116417776")
.setFifthRequestId("fifthRequestId959024147")
.setSixthRequestId("sixthRequestId1005218260")
.setSeverity(Severity.forNumber(0))
.setFoobar(Foobar.newBuilder().build())
.build();
Expand Down
Loading