Skip to content

Commit 33ba423

Browse files
alicejlialicejli
authored
chore: refactor golden tests for autopopulation feature (#2446)
As a clean-up follow up to #2353, this PR refactors the unit golden tests for the autopopulation feature to a separate, new proto called `auto_populate_field_testing.proto`.
1 parent cbed743 commit 33ba423

27 files changed

+847
-327
lines changed

‎gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/defaultvalue/DefaultValueComposerTest.java

-6
Original file line numberDiff line numberDiff line change
@@ -568,12 +568,6 @@ public void createSimpleMessage_containsMessagesEnumsAndResourceName() {
568568
"EchoRequest.newBuilder().setName("
569569
+ "FoobarName.ofProjectFoobarName(\"[PROJECT]\", \"[FOOBAR]\").toString())"
570570
+ ".setParent(FoobarName.ofProjectFoobarName(\"[PROJECT]\", \"[FOOBAR]\").toString())"
571-
+ ".setRequestId(\"requestId693933066\")"
572-
+ ".setSecondRequestId(\"secondRequestId344404470\")"
573-
+ ".setThirdRequestId(true)"
574-
+ ".setFourthRequestId(\"fourthRequestId-2116417776\")"
575-
+ ".setFifthRequestId(\"fifthRequestId959024147\")"
576-
+ ".setSixthRequestId(\"sixthRequestId1005218260\")"
577571
+ ".setSeverity(Severity.forNumber(0))"
578572
+ ".setFoobar(Foobar.newBuilder().build()).build()",
579573
writerVisitor.write());

‎gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposerTest.java

+10
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,14 @@ public void generateGrpcServiceStubClass_createBatchingCallable() {
8282
Assert.assertGoldenClass(this.getClass(), clazz, "GrpcLoggingStub.golden");
8383
Assert.assertEmptySamples(clazz.samples());
8484
}
85+
86+
@Test
87+
public void generateGrpcServiceStubClass_autopopulateField() {
88+
GapicContext context = GrpcTestProtoLoader.instance().parseAutoPopulateFieldTesting();
89+
Service service = context.services().get(0);
90+
GapicClass clazz = GrpcServiceStubClassComposer.instance().generate(context, service);
91+
92+
Assert.assertGoldenClass(this.getClass(), clazz, "GrpcAutoPopulateFieldStub.golden");
93+
Assert.assertEmptySamples(clazz.samples());
94+
}
8595
}

‎gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoClient.golden

+1-47
Original file line numberDiff line numberDiff line change
@@ -517,12 +517,6 @@ public class EchoClient implements BackgroundResource {
517517
* EchoRequest.newBuilder()
518518
* .setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
519519
* .setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
520-
* .setRequestId("requestId693933066")
521-
* .setSecondRequestId("secondRequestId344404470")
522-
* .setThirdRequestId(true)
523-
* .setFourthRequestId("fourthRequestId-2116417776")
524-
* .setFifthRequestId("fifthRequestId959024147")
525-
* .setSixthRequestId("sixthRequestId1005218260")
526520
* .setSeverity(Severity.forNumber(0))
527521
* .setFoobar(Foobar.newBuilder().build())
528522
* .build();
@@ -552,12 +546,6 @@ public class EchoClient implements BackgroundResource {
552546
* EchoRequest.newBuilder()
553547
* .setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
554548
* .setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
555-
* .setRequestId("requestId693933066")
556-
* .setSecondRequestId("secondRequestId344404470")
557-
* .setThirdRequestId(true)
558-
* .setFourthRequestId("fourthRequestId-2116417776")
559-
* .setFifthRequestId("fifthRequestId959024147")
560-
* .setSixthRequestId("sixthRequestId1005218260")
561549
* .setSeverity(Severity.forNumber(0))
562550
* .setFoobar(Foobar.newBuilder().build())
563551
* .build();
@@ -583,11 +571,7 @@ public class EchoClient implements BackgroundResource {
583571
* // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
584572
* try (EchoClient echoClient = EchoClient.create()) {
585573
* ExpandRequest request =
586-
* ExpandRequest.newBuilder()
587-
* .setContent("content951530617")
588-
* .setInfo("info3237038")
589-
* .setRequestId("requestId693933066")
590-
* .build();
574+
* ExpandRequest.newBuilder().setContent("content951530617").setInfo("info3237038").build();
591575
* ServerStream<EchoResponse> stream = echoClient.expandCallable().call(request);
592576
* for (EchoResponse response : stream) {
593577
* // Do something when a response is received.
@@ -633,12 +617,6 @@ public class EchoClient implements BackgroundResource {
633617
* EchoRequest.newBuilder()
634618
* .setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
635619
* .setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
636-
* .setRequestId("requestId693933066")
637-
* .setSecondRequestId("secondRequestId344404470")
638-
* .setThirdRequestId(true)
639-
* .setFourthRequestId("fourthRequestId-2116417776")
640-
* .setFifthRequestId("fifthRequestId959024147")
641-
* .setSixthRequestId("sixthRequestId1005218260")
642620
* .setSeverity(Severity.forNumber(0))
643621
* .setFoobar(Foobar.newBuilder().build())
644622
* .build();
@@ -666,12 +644,6 @@ public class EchoClient implements BackgroundResource {
666644
* EchoRequest.newBuilder()
667645
* .setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
668646
* .setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
669-
* .setRequestId("requestId693933066")
670-
* .setSecondRequestId("secondRequestId344404470")
671-
* .setThirdRequestId(true)
672-
* .setFourthRequestId("fourthRequestId-2116417776")
673-
* .setFifthRequestId("fifthRequestId959024147")
674-
* .setSixthRequestId("sixthRequestId1005218260")
675647
* .setSeverity(Severity.forNumber(0))
676648
* .setFoobar(Foobar.newBuilder().build())
677649
* .build();
@@ -702,12 +674,6 @@ public class EchoClient implements BackgroundResource {
702674
* EchoRequest.newBuilder()
703675
* .setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
704676
* .setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
705-
* .setRequestId("requestId693933066")
706-
* .setSecondRequestId("secondRequestId344404470")
707-
* .setThirdRequestId(true)
708-
* .setFourthRequestId("fourthRequestId-2116417776")
709-
* .setFifthRequestId("fifthRequestId959024147")
710-
* .setSixthRequestId("sixthRequestId1005218260")
711677
* .setSeverity(Severity.forNumber(0))
712678
* .setFoobar(Foobar.newBuilder().build())
713679
* .build();
@@ -1116,12 +1082,6 @@ public class EchoClient implements BackgroundResource {
11161082
* EchoRequest.newBuilder()
11171083
* .setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
11181084
* .setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
1119-
* .setRequestId("requestId693933066")
1120-
* .setSecondRequestId("secondRequestId344404470")
1121-
* .setThirdRequestId(true)
1122-
* .setFourthRequestId("fourthRequestId-2116417776")
1123-
* .setFifthRequestId("fifthRequestId959024147")
1124-
* .setSixthRequestId("sixthRequestId1005218260")
11251085
* .setSeverity(Severity.forNumber(0))
11261086
* .setFoobar(Foobar.newBuilder().build())
11271087
* .build();
@@ -1151,12 +1111,6 @@ public class EchoClient implements BackgroundResource {
11511111
* EchoRequest.newBuilder()
11521112
* .setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
11531113
* .setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
1154-
* .setRequestId("requestId693933066")
1155-
* .setSecondRequestId("secondRequestId344404470")
1156-
* .setThirdRequestId(true)
1157-
* .setFourthRequestId("fourthRequestId-2116417776")
1158-
* .setFifthRequestId("fifthRequestId959024147")
1159-
* .setSixthRequestId("sixthRequestId1005218260")
11601114
* .setSeverity(Severity.forNumber(0))
11611115
* .setFoobar(Foobar.newBuilder().build())
11621116
* .build();

‎gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoClientTest.golden

+2-70
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,6 @@ public class EchoClientTest {
108108
EchoRequest.newBuilder()
109109
.setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
110110
.setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
111-
.setRequestId("requestId693933066")
112-
.setSecondRequestId("secondRequestId344404470")
113-
.setThirdRequestId(true)
114-
.setFourthRequestId("fourthRequestId-2116417776")
115-
.setFifthRequestId("fifthRequestId959024147")
116-
.setSixthRequestId("sixthRequestId1005218260")
117111
.setSeverity(Severity.forNumber(0))
118112
.setFoobar(Foobar.newBuilder().build())
119113
.build();
@@ -409,11 +403,7 @@ public class EchoClientTest {
409403
.build();
410404
mockEcho.addResponse(expectedResponse);
411405
ExpandRequest request =
412-
ExpandRequest.newBuilder()
413-
.setContent("content951530617")
414-
.setInfo("info3237038")
415-
.setRequestId("requestId693933066")
416-
.build();
406+
ExpandRequest.newBuilder().setContent("content951530617").setInfo("info3237038").build();
417407

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

@@ -430,11 +420,7 @@ public class EchoClientTest {
430420
StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT);
431421
mockEcho.addException(exception);
432422
ExpandRequest request =
433-
ExpandRequest.newBuilder()
434-
.setContent("content951530617")
435-
.setInfo("info3237038")
436-
.setRequestId("requestId693933066")
437-
.build();
423+
ExpandRequest.newBuilder().setContent("content951530617").setInfo("info3237038").build();
438424

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

@@ -463,12 +449,6 @@ public class EchoClientTest {
463449
EchoRequest.newBuilder()
464450
.setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
465451
.setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
466-
.setRequestId("requestId693933066")
467-
.setSecondRequestId("secondRequestId344404470")
468-
.setThirdRequestId(true)
469-
.setFourthRequestId("fourthRequestId-2116417776")
470-
.setFifthRequestId("fifthRequestId959024147")
471-
.setSixthRequestId("sixthRequestId1005218260")
472452
.setSeverity(Severity.forNumber(0))
473453
.setFoobar(Foobar.newBuilder().build())
474454
.build();
@@ -494,12 +474,6 @@ public class EchoClientTest {
494474
EchoRequest.newBuilder()
495475
.setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
496476
.setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
497-
.setRequestId("requestId693933066")
498-
.setSecondRequestId("secondRequestId344404470")
499-
.setThirdRequestId(true)
500-
.setFourthRequestId("fourthRequestId-2116417776")
501-
.setFifthRequestId("fifthRequestId959024147")
502-
.setSixthRequestId("sixthRequestId1005218260")
503477
.setSeverity(Severity.forNumber(0))
504478
.setFoobar(Foobar.newBuilder().build())
505479
.build();
@@ -533,12 +507,6 @@ public class EchoClientTest {
533507
EchoRequest.newBuilder()
534508
.setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
535509
.setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
536-
.setRequestId("requestId693933066")
537-
.setSecondRequestId("secondRequestId344404470")
538-
.setThirdRequestId(true)
539-
.setFourthRequestId("fourthRequestId-2116417776")
540-
.setFifthRequestId("fifthRequestId959024147")
541-
.setSixthRequestId("sixthRequestId1005218260")
542510
.setSeverity(Severity.forNumber(0))
543511
.setFoobar(Foobar.newBuilder().build())
544512
.build();
@@ -564,12 +532,6 @@ public class EchoClientTest {
564532
EchoRequest.newBuilder()
565533
.setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
566534
.setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
567-
.setRequestId("requestId693933066")
568-
.setSecondRequestId("secondRequestId344404470")
569-
.setThirdRequestId(true)
570-
.setFourthRequestId("fourthRequestId-2116417776")
571-
.setFifthRequestId("fifthRequestId959024147")
572-
.setSixthRequestId("sixthRequestId1005218260")
573535
.setSeverity(Severity.forNumber(0))
574536
.setFoobar(Foobar.newBuilder().build())
575537
.build();
@@ -603,12 +565,6 @@ public class EchoClientTest {
603565
EchoRequest.newBuilder()
604566
.setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
605567
.setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
606-
.setRequestId("requestId693933066")
607-
.setSecondRequestId("secondRequestId344404470")
608-
.setThirdRequestId(true)
609-
.setFourthRequestId("fourthRequestId-2116417776")
610-
.setFifthRequestId("fifthRequestId959024147")
611-
.setSixthRequestId("sixthRequestId1005218260")
612568
.setSeverity(Severity.forNumber(0))
613569
.setFoobar(Foobar.newBuilder().build())
614570
.build();
@@ -634,12 +590,6 @@ public class EchoClientTest {
634590
EchoRequest.newBuilder()
635591
.setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
636592
.setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
637-
.setRequestId("requestId693933066")
638-
.setSecondRequestId("secondRequestId344404470")
639-
.setThirdRequestId(true)
640-
.setFourthRequestId("fourthRequestId-2116417776")
641-
.setFifthRequestId("fifthRequestId959024147")
642-
.setSixthRequestId("sixthRequestId1005218260")
643593
.setSeverity(Severity.forNumber(0))
644594
.setFoobar(Foobar.newBuilder().build())
645595
.build();
@@ -898,12 +848,6 @@ public class EchoClientTest {
898848
EchoRequest.newBuilder()
899849
.setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
900850
.setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
901-
.setRequestId("requestId693933066")
902-
.setSecondRequestId("secondRequestId344404470")
903-
.setThirdRequestId(true)
904-
.setFourthRequestId("fourthRequestId-2116417776")
905-
.setFifthRequestId("fifthRequestId959024147")
906-
.setSixthRequestId("sixthRequestId1005218260")
907851
.setSeverity(Severity.forNumber(0))
908852
.setFoobar(Foobar.newBuilder().build())
909853
.build();
@@ -917,12 +861,6 @@ public class EchoClientTest {
917861

918862
Assert.assertEquals(request.getName(), actualRequest.getName());
919863
Assert.assertEquals(request.getParent(), actualRequest.getParent());
920-
Assert.assertEquals(request.getRequestId(), actualRequest.getRequestId());
921-
Assert.assertEquals(request.getSecondRequestId(), actualRequest.getSecondRequestId());
922-
Assert.assertEquals(request.getThirdRequestId(), actualRequest.getThirdRequestId());
923-
Assert.assertEquals(request.getFourthRequestId(), actualRequest.getFourthRequestId());
924-
Assert.assertEquals(request.getFifthRequestId(), actualRequest.getFifthRequestId());
925-
Assert.assertEquals(request.getSixthRequestId(), actualRequest.getSixthRequestId());
926864
Assert.assertEquals(request.getContent(), actualRequest.getContent());
927865
Assert.assertEquals(request.getError(), actualRequest.getError());
928866
Assert.assertEquals(request.getSeverity(), actualRequest.getSeverity());
@@ -943,12 +881,6 @@ public class EchoClientTest {
943881
EchoRequest.newBuilder()
944882
.setName(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
945883
.setParent(FoobarName.ofProjectFoobarName("[PROJECT]", "[FOOBAR]").toString())
946-
.setRequestId("requestId693933066")
947-
.setSecondRequestId("secondRequestId344404470")
948-
.setThirdRequestId(true)
949-
.setFourthRequestId("fourthRequestId-2116417776")
950-
.setFifthRequestId("fifthRequestId959024147")
951-
.setSixthRequestId("sixthRequestId1005218260")
952884
.setSeverity(Severity.forNumber(0))
953885
.setFoobar(Foobar.newBuilder().build())
954886
.build();

0 commit comments

Comments
 (0)