Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 3c1f069

Browse files
xiaozhenliu-gg5xiaozhenliu-gg5
authored
[ggj][infra][5/5] support goldens updates for composer tests (#348)
* add golden folder * format * move all expected strings to golden files * format * update goldens * update ast integration test * keep service client test * constant helper * format * format * support update goldens for ast integration test * support update goldens for omposer tests * fix * update * remove unneeded dependencies * remove unneeded dependencies
1 parent a3f3c5b commit 3c1f069

14 files changed

+79
-2
lines changed

‎BUILD.bazel‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,15 @@ java_binary(
5353
srcs = [
5454
"//src/test/java/com/google/api/generator/gapic/dummy:dummy_files",
5555
"//src/test/java/com/google/api/generator/engine:engine_files",
56+
"//src/test/java/com/google/api/generator/gapic/composer:composer_files",
5657
"//src/test/java/com/google/api/generator/test/framework:framework_files",
5758
],
5859
data = [
5960
"//src/test/java/com/google/api/generator/gapic/dummy/goldens:goldens_files",
6061
"//src/test/java/com/google/api/generator/engine/goldens:goldens_files",
62+
"//src/test/java/com/google/api/generator/gapic/composer/goldens:goldens_files",
63+
"//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files",
64+
"//src/test/java/com/google/api/generator/gapic/testdata:service_config_files",
6165
],
6266
jvm_flags = ["-Xmx512m"],
6367
main_class = "com.google.api.generator.test.framework.SingleJUnitTestRunner",
@@ -67,7 +71,19 @@ java_binary(
6771
"//src/main/java/com/google/api/generator/engine/writer",
6872
"//src/test/java/com/google/api/generator/test/framework",
6973
"//src/main/java/com/google/api/generator/engine/lexicon",
74+
"//src/main/java/com/google/api/generator/gapic/composer",
75+
"//src/main/java/com/google/api/generator/gapic/model",
76+
"//src/main/java/com/google/api/generator/gapic/protoparser",
77+
"//src/test/java/com/google/api/generator/gapic/testdata:showcase_java_proto",
78+
"//src/test/java/com/google/api/generator/gapic/testdata:testgapic_java_proto",
79+
"//src/test/java/com/google/api/generator/gapic/composer:common_resources_java_proto",
7080
"@com_google_guava_guava//:com_google_guava_guava",
81+
"@com_google_api_gax_java//gax",
82+
"@com_google_googleapis//google/logging/v2:logging_java_proto",
83+
"@com_google_googleapis//google/pubsub/v1:pubsub_java_proto",
84+
"@com_google_googleapis//google/rpc:rpc_java_proto",
85+
"@com_google_protobuf//:protobuf_java",
86+
"//:service_config_java_proto",
7187
"@com_google_truth_truth//jar",
7288
"@io_github_java_diff_utils//jar",
7389
"@junit_junit//jar",

‎rules_bazel/java/java_diff_test.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ junit_output_zip = rule(
3939
),
4040
},
4141
outputs = {
42-
"output": "%{name}%.zip",
42+
"output": "%{name}.zip",
4343
},
4444
implementation = _junit_output_impl,
4545
)

‎src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
load("//:rules_bazel/java/java_diff_test.bzl", "golden_update")
2+
13
package(default_visibility = ["//visibility:public"])
24

35
TESTS = [
@@ -18,6 +20,19 @@ TESTS = [
1820
"ServiceStubClassComposerTest",
1921
]
2022

23+
UPDATE_GOLDENS_TESTS = [
24+
"BatchingDescriptorComposerTest",
25+
"ComposerTest",
26+
"GrpcServiceCallableFactoryClassComposerTest",
27+
"GrpcServiceStubClassComposerTest",
28+
"MockServiceClassComposerTest",
29+
"MockServiceImplClassComposerTest",
30+
"ResourceNameHelperClassComposerTest",
31+
"ServiceSettingsClassComposerTest",
32+
"ServiceStubSettingsClassComposerTest",
33+
"ServiceStubClassComposerTest",
34+
]
35+
2136
filegroup(
2237
name = "composer_files",
2338
srcs = glob(["*.java"]),
@@ -69,3 +84,20 @@ java_proto_library(
6984
"@junit_junit//jar",
7085
],
7186
) for test_name in TESTS]
87+
88+
89+
90+
TEST_CLASS_DIR = "com.google.api.generator.gapic.composer."
91+
# Run `bazel run src/test/java/com/google/api/generator/gapic/composer:testTargetName_update`
92+
# to update goldens as expected generated code.
93+
# `ServiceClient*` tests are not supported now since they are still in active development.
94+
95+
[golden_update(
96+
name = test_name + "_update",
97+
srcs = [
98+
":composer_files",
99+
"//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files",
100+
"//src/test/java/com/google/api/generator/gapic/testdata:service_config_files",
101+
],
102+
test_class_name = TEST_CLASS_DIR + test_name,
103+
) for test_name in UPDATE_GOLDENS_TESTS]

‎src/test/java/com/google/api/generator/gapic/composer/BatchingDescriptorComposerTest.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.google.api.generator.gapic.protoparser.Parser;
3030
import com.google.api.generator.gapic.protoparser.ServiceConfigParser;
3131
import com.google.api.generator.test.framework.Assert;
32+
import com.google.api.generator.test.framework.Utils;
3233
import com.google.logging.v2.LogEntryProto;
3334
import com.google.logging.v2.LoggingConfigProto;
3435
import com.google.logging.v2.LoggingMetricsProto;
@@ -99,6 +100,8 @@ public void batchingDescriptor_hasSubresponseField() {
99100
method, batchingSetting, messageTypes);
100101

101102
batchingDescriptorExpr.accept(writerVisitor);
103+
Utils.saveCodegenToFile(
104+
this.getClass(), "BatchingDescriptorComposerTestSubresponse.golden", writerVisitor.write());
102105
Path goldenFilePath =
103106
Paths.get(
104107
ComposerConstants.GOLDENFILES_DIRECTORY,
@@ -155,6 +158,10 @@ public void batchingDescriptor_noSubresponseField() {
155158
method, batchingSetting, messageTypes);
156159

157160
batchingDescriptorExpr.accept(writerVisitor);
161+
Utils.saveCodegenToFile(
162+
this.getClass(),
163+
"BatchingDescriptorComposerTestNoSubresponse.golden",
164+
writerVisitor.write());
158165
Path goldenFilePath =
159166
Paths.get(
160167
ComposerConstants.GOLDENFILES_DIRECTORY,

‎src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.google.api.generator.gapic.model.GapicClass;
2121
import com.google.api.generator.gapic.model.GapicClass.Kind;
2222
import com.google.api.generator.test.framework.Assert;
23+
import com.google.api.generator.test.framework.Utils;
2324
import java.nio.file.Path;
2425
import java.nio.file.Paths;
2526
import java.util.Arrays;
@@ -39,6 +40,7 @@ public void gapicClass_addApacheLicense() {
3940
Composer.addApacheLicense(Arrays.asList(GapicClass.create(Kind.TEST, classDef)));
4041
JavaWriterVisitor visitor = new JavaWriterVisitor();
4142
gapicClassWithHeaderList.get(0).classDefinition().accept(visitor);
43+
Utils.saveCodegenToFile(this.getClass(), "ComposerTest.golden", visitor.write());
4244
Path goldenFilePath = Paths.get(ComposerConstants.GOLDENFILES_DIRECTORY, "ComposerTest.golden");
4345
Assert.assertCodeEquals(goldenFilePath, visitor.write());
4446
}

‎src/test/java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposerTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.google.api.generator.gapic.model.Service;
2424
import com.google.api.generator.gapic.protoparser.Parser;
2525
import com.google.api.generator.test.framework.Assert;
26+
import com.google.api.generator.test.framework.Utils;
2627
import com.google.protobuf.Descriptors.FileDescriptor;
2728
import com.google.protobuf.Descriptors.ServiceDescriptor;
2829
import com.google.showcase.v1beta1.EchoOuterClass;
@@ -60,6 +61,7 @@ public void generateServiceClasses() {
6061

6162
JavaWriterVisitor visitor = new JavaWriterVisitor();
6263
clazz.classDefinition().accept(visitor);
64+
Utils.saveCodegenToFile(this.getClass(), "GrpcEchoCallableFactory.golden", visitor.write());
6365
Path goldenFilePath =
6466
Paths.get(ComposerConstants.GOLDENFILES_DIRECTORY, "GrpcEchoCallableFactory.golden");
6567
Assert.assertCodeEquals(goldenFilePath, visitor.write());

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.google.api.generator.gapic.model.Service;
2424
import com.google.api.generator.gapic.protoparser.Parser;
2525
import com.google.api.generator.test.framework.Assert;
26+
import com.google.api.generator.test.framework.Utils;
2627
import com.google.protobuf.Descriptors.FileDescriptor;
2728
import com.google.protobuf.Descriptors.ServiceDescriptor;
2829
import com.google.showcase.v1beta1.EchoOuterClass;
@@ -59,6 +60,7 @@ public void generateServiceClasses() {
5960

6061
JavaWriterVisitor visitor = new JavaWriterVisitor();
6162
clazz.classDefinition().accept(visitor);
63+
Utils.saveCodegenToFile(this.getClass(), "GrpcEchoStub.golden", visitor.write());
6264
Path goldenFilePath = Paths.get(ComposerConstants.GOLDENFILES_DIRECTORY, "GrpcEchoStub.golden");
6365
Assert.assertCodeEquals(goldenFilePath, visitor.write());
6466
}

‎src/test/java/com/google/api/generator/gapic/composer/MockServiceClassComposerTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.google.api.generator.gapic.model.Service;
2424
import com.google.api.generator.gapic.protoparser.Parser;
2525
import com.google.api.generator.test.framework.Assert;
26+
import com.google.api.generator.test.framework.Utils;
2627
import com.google.protobuf.Descriptors.FileDescriptor;
2728
import com.google.protobuf.Descriptors.ServiceDescriptor;
2829
import com.google.showcase.v1beta1.EchoOuterClass;
@@ -59,6 +60,7 @@ public void generateServiceClasses() {
5960

6061
JavaWriterVisitor visitor = new JavaWriterVisitor();
6162
clazz.classDefinition().accept(visitor);
63+
Utils.saveCodegenToFile(this.getClass(), "MockEcho.golden", visitor.write());
6264
Path goldenFilePath = Paths.get(ComposerConstants.GOLDENFILES_DIRECTORY, "MockEcho.golden");
6365
Assert.assertCodeEquals(goldenFilePath, visitor.write());
6466
}

‎src/test/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposerTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.google.api.generator.gapic.model.Service;
2424
import com.google.api.generator.gapic.protoparser.Parser;
2525
import com.google.api.generator.test.framework.Assert;
26+
import com.google.api.generator.test.framework.Utils;
2627
import com.google.protobuf.Descriptors.FileDescriptor;
2728
import com.google.protobuf.Descriptors.ServiceDescriptor;
2829
import com.google.showcase.v1beta1.EchoOuterClass;
@@ -60,6 +61,7 @@ public void generateServiceClasses() {
6061

6162
JavaWriterVisitor visitor = new JavaWriterVisitor();
6263
clazz.classDefinition().accept(visitor);
64+
Utils.saveCodegenToFile(this.getClass(), "MockEchoImpl.golden", visitor.write());
6365
Path goldenFilePath = Paths.get(ComposerConstants.GOLDENFILES_DIRECTORY, "MockEchoImpl.golden");
6466
Assert.assertCodeEquals(goldenFilePath, visitor.write());
6567
}

‎src/test/java/com/google/api/generator/gapic/composer/ResourceNameHelperClassComposerTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.google.api.generator.gapic.model.Service;
2525
import com.google.api.generator.gapic.protoparser.Parser;
2626
import com.google.api.generator.test.framework.Assert;
27+
import com.google.api.generator.test.framework.Utils;
2728
import com.google.protobuf.Descriptors.FileDescriptor;
2829
import com.google.protobuf.Descriptors.ServiceDescriptor;
2930
import com.google.showcase.v1beta1.EchoOuterClass;
@@ -97,6 +98,7 @@ public void generateResourceNameClass_echoFoobarMultiplePatterns() {
9798

9899
JavaWriterVisitor visitor = new JavaWriterVisitor();
99100
clazz.classDefinition().accept(visitor);
101+
Utils.saveCodegenToFile(this.getClass(), "FoobarName.golden", visitor.write());
100102
Path goldenFilePath = Paths.get(ComposerConstants.GOLDENFILES_DIRECTORY, "FoobarName.golden");
101103
Assert.assertCodeEquals(goldenFilePath, visitor.write());
102104
}
@@ -122,6 +124,7 @@ public void generateResourceNameClass_testingSessionOnePattern() {
122124

123125
JavaWriterVisitor visitor = new JavaWriterVisitor();
124126
clazz.classDefinition().accept(visitor);
127+
Utils.saveCodegenToFile(this.getClass(), "SessionName.golden", visitor.write());
125128
Path goldenFilePath = Paths.get(ComposerConstants.GOLDENFILES_DIRECTORY, "SessionName.golden");
126129
Assert.assertCodeEquals(goldenFilePath, visitor.write());
127130
}

0 commit comments

Comments
 (0)