Skip to content

Commit 8ae5f31

Browse files
chanseokohchanseokoh
authored
chore: re-work generating unit golden files (#912)
* chore: re-work generating unit goldens * chore: clean up code
1 parent d210aa1 commit 8ae5f31

10 files changed

Lines changed: 64 additions & 173 deletions

File tree

‎rules_bazel/java/java_diff_test.bzl‎

Lines changed: 0 additions & 84 deletions
This file was deleted.

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
load("@rules_java//java:defs.bzl", "java_test")
2-
load("//:rules_bazel/java/java_diff_test.bzl", "golden_update")
32

43
package(default_visibility = ["//visibility:public"])
54

@@ -26,20 +25,20 @@ TEST_DEPS = [
2625

2726
[java_test(
2827
name = test_name,
29-
srcs = ["{0}.java".format(test_name)],
28+
srcs = ["%s.java" % test_name],
3029
data = ["//src/test/java/com/google/api/generator/engine/goldens:goldens_files"],
31-
test_class = "com.google.api.generator.engine.{0}".format(test_name),
30+
test_class = "com.google.api.generator.engine.%s" % test_name,
3231
deps = TEST_DEPS,
3332
) for test_name in TESTS]
3433

35-
TEST_CLASS_NAME = "com.google.api.generator.engine.JavaCodeGeneratorTest"
36-
3734
# Run `bazel run src/test/java/com/google/api/generator/engine:JavaCodeGeneratorTest_update`
3835
# to update goldens as expected generated code.
39-
[golden_update(
40-
name = "{0}_update".format(test_name),
41-
srcs = ["{0}.java".format(test_name)],
36+
[java_binary(
37+
name = "%s_update" % test_name,
38+
srcs = ["%s.java" % test_name],
4239
data = ["//src/test/java/com/google/api/generator/engine/goldens:goldens_files"],
43-
test_class = "com.google.api.generator.engine.{0}".format(test_name),
40+
main_class = "com.google.api.generator.test.framework.SingleJUnitTestRunner",
41+
args = ["com.google.api.generator.engine.%s" % test_name],
4442
deps = TEST_DEPS,
43+
runtime_deps = ["//src/test/java/com/google/api/generator/test/framework:junit_runner"],
4544
) for test_name in TESTS]

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

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
load("@rules_java//java:defs.bzl", "java_proto_library", "java_test")
2-
load("//:rules_bazel/java/java_diff_test.bzl", "golden_update")
32

43
package(default_visibility = ["//visibility:public"])
54

6-
UPDATE_GOLDENS_TESTS = [
5+
TESTS = [
76
"ComposerTest",
87
]
98

10-
TESTS = UPDATE_GOLDENS_TESTS
11-
129
TEST_DEPS = [
1310
":common_resources_java_proto",
1411
"//:service_config_java_proto",
@@ -60,31 +57,31 @@ java_proto_library(
6057
[java_test(
6158
name = test_name,
6259
srcs = [
63-
"{0}.java".format(test_name),
60+
"%s.java" % test_name,
6461
],
6562
data = [
6663
"//src/test/java/com/google/api/generator/gapic/composer/goldens:goldens_files",
6764
"//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files",
6865
"//src/test/java/com/google/api/generator/gapic/testdata:service_config_files",
6966
],
70-
test_class = "com.google.api.generator.gapic.composer.{0}".format(test_name),
67+
test_class = "com.google.api.generator.gapic.composer.%s" % test_name,
7168
deps = TEST_DEPS,
7269
) for test_name in TESTS]
7370

7471
# Run `bazel run src/test/java/com/google/api/generator/gapic/composer:testTargetName_update`
7572
# to update goldens as expected generated code.
7673
# `ServiceClient*` tests are not supported now since they are still in active development.
7774

78-
[golden_update(
79-
name = "{0}_update".format(test_name),
80-
srcs = [
81-
"{0}.java".format(test_name),
82-
],
75+
[java_binary(
76+
name = "%s_update" % test_name,
77+
srcs = ["%s.java" % test_name],
8378
data = [
8479
"//src/test/java/com/google/api/generator/gapic/composer/goldens:goldens_files",
8580
"//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files",
8681
"//src/test/java/com/google/api/generator/gapic/testdata:service_config_files",
8782
],
88-
test_class = "com.google.api.generator.gapic.composer.{0}".format(test_name),
83+
main_class = "com.google.api.generator.test.framework.SingleJUnitTestRunner",
84+
args = ["com.google.api.generator.gapic.composer.%s" % test_name],
8985
deps = TEST_DEPS,
90-
) for test_name in UPDATE_GOLDENS_TESTS]
86+
runtime_deps = ["//src/test/java/com/google/api/generator/test/framework:junit_runner"],
87+
) for test_name in TESTS]

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
load("@rules_java//java:defs.bzl", "java_proto_library", "java_test")
2-
load("//:rules_bazel/java/java_diff_test.bzl", "golden_update")
32

43
package(default_visibility = ["//visibility:public"])
54

@@ -70,31 +69,31 @@ java_proto_library(
7069
[java_test(
7170
name = test_name,
7271
srcs = [
73-
"{0}.java".format(test_name),
72+
"%s.java" % test_name,
7473
],
7574
data = [
7675
"//src/test/java/com/google/api/generator/gapic/composer/common/goldens:goldens_files",
7776
"//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files",
7877
"//src/test/java/com/google/api/generator/gapic/testdata:service_config_files",
7978
],
80-
test_class = "com.google.api.generator.gapic.composer.common.{0}".format(test_name),
79+
test_class = "com.google.api.generator.gapic.composer.common.%s" % test_name,
8180
deps = TEST_DEPS + [":common"],
8281
) for test_name in TESTS]
8382

8483
# Run `bazel run src/test/java/com/google/api/generator/gapic/composer/common:testTargetName_update`
8584
# to update goldens as expected generated code.
8685
# `ServiceClient*` tests are not supported now since they are still in active development.
8786

88-
[golden_update(
89-
name = "{0}_update".format(test_name),
90-
srcs = [
91-
"{0}.java".format(test_name),
92-
],
87+
[java_binary(
88+
name = "%s_update" % test_name,
89+
srcs = ["%s.java" % test_name],
9390
data = [
9491
"//src/test/java/com/google/api/generator/gapic/composer/common/goldens:goldens_files",
9592
"//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files",
9693
"//src/test/java/com/google/api/generator/gapic/testdata:service_config_files",
9794
],
98-
test_class = "com.google.api.generator.gapic.composer.common.{0}".format(test_name),
95+
main_class = "com.google.api.generator.test.framework.SingleJUnitTestRunner",
96+
args = ["com.google.api.generator.gapic.composer.common.%s" % test_name],
9997
deps = TEST_DEPS + [":common"],
98+
runtime_deps = ["//src/test/java/com/google/api/generator/test/framework:junit_runner"],
10099
) for test_name in UPDATE_GOLDENS_TESTS]

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
load("@rules_java//java:defs.bzl", "java_proto_library", "java_test")
2-
load("//:rules_bazel/java/java_diff_test.bzl", "golden_update")
32

43
package(default_visibility = ["//visibility:public"])
54

@@ -64,31 +63,31 @@ java_proto_library(
6463
name = test_name,
6564
size = "medium",
6665
srcs = [
67-
"{0}.java".format(test_name),
66+
"%s.java" % test_name,
6867
] + COMMON_SRCS,
6968
data = [
7069
"//src/test/java/com/google/api/generator/gapic/composer/grpc/goldens:goldens_files",
7170
"//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files",
7271
"//src/test/java/com/google/api/generator/gapic/testdata:service_config_files",
7372
],
74-
test_class = "com.google.api.generator.gapic.composer.grpc.{0}".format(test_name),
73+
test_class = "com.google.api.generator.gapic.composer.grpc.%s" % test_name,
7574
deps = TEST_DEPS,
7675
) for test_name in TESTS]
7776

7877
# Run `bazel run src/test/java/com/google/api/generator/gapic/composer/grpc:testTargetName_update`
7978
# to update goldens as expected generated code.
8079
# `ServiceClient*` tests are not supported now since they are still in active development.
8180

82-
[golden_update(
83-
name = "{0}_update".format(test_name),
84-
srcs = [
85-
"{0}.java".format(test_name),
86-
] + COMMON_SRCS,
81+
[java_binary(
82+
name = "%s_update" % test_name,
83+
srcs = ["%s.java" % test_name] + COMMON_SRCS,
8784
data = [
8885
"//src/test/java/com/google/api/generator/gapic/composer/grpc/goldens:goldens_files",
8986
"//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files",
9087
"//src/test/java/com/google/api/generator/gapic/testdata:service_config_files",
9188
],
92-
test_class = "com.google.api.generator.gapic.composer.grpc.{0}".format(test_name),
89+
main_class = "com.google.api.generator.test.framework.SingleJUnitTestRunner",
90+
args = ["com.google.api.generator.gapic.composer.grpc.%s" % test_name],
9391
deps = TEST_DEPS,
92+
runtime_deps = ["//src/test/java/com/google/api/generator/test/framework:junit_runner"],
9493
) for test_name in TESTS]

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
load("@rules_java//java:defs.bzl", "java_proto_library", "java_test")
2-
load("//:rules_bazel/java/java_diff_test.bzl", "golden_update")
32

43
package(default_visibility = ["//visibility:public"])
54

@@ -13,7 +12,7 @@ TESTS = UPDATE_GOLDENS_TESTS + [
1312

1413
filegroup(
1514
name = "resourcename_files",
16-
srcs = ["{0}.java".format(f) for f in TESTS],
15+
srcs = ["%s.java" % f for f in TESTS],
1716
)
1817

1918
TEST_DEPS = [
@@ -40,13 +39,13 @@ TEST_DEPS = [
4039

4140
[java_test(
4241
name = test_name,
43-
srcs = ["{0}.java".format(test_name)],
42+
srcs = ["%s.java" % test_name],
4443
data = [
4544
"//src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens:goldens_files",
4645
"//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files",
4746
"//src/test/java/com/google/api/generator/gapic/testdata:service_config_files",
4847
],
49-
test_class = "com.google.api.generator.gapic.composer.resourcename.{0}".format(test_name),
48+
test_class = "com.google.api.generator.gapic.composer.resourcename.%s" % test_name,
5049
deps = TEST_DEPS,
5150
) for test_name in TESTS]
5251

@@ -61,16 +60,16 @@ java_proto_library(
6160
# to update goldens as expected generated code.
6261
# `ServiceClient*` tests are not supported now since they are still in active development.
6362

64-
[golden_update(
65-
name = "{0}_update".format(test_name),
66-
srcs = [
67-
"{0}.java".format(test_name),
68-
],
63+
[java_binary(
64+
name = "%s_update" % test_name,
65+
srcs = ["%s.java" % test_name],
6966
data = [
7067
"//src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens:goldens_files",
7168
"//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files",
7269
"//src/test/java/com/google/api/generator/gapic/testdata:service_config_files",
7370
],
74-
test_class = "com.google.api.generator.gapic.composer.resourcename.{0}".format(test_name),
71+
main_class = "com.google.api.generator.test.framework.SingleJUnitTestRunner",
72+
args = ["com.google.api.generator.gapic.composer.resourcename.%s" % test_name],
7573
deps = TEST_DEPS,
74+
runtime_deps = ["//src/test/java/com/google/api/generator/test/framework:junit_runner"],
7675
) for test_name in UPDATE_GOLDENS_TESTS]

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
load("@rules_java//java:defs.bzl", "java_proto_library", "java_test")
2-
load("//:rules_bazel/java/java_diff_test.bzl", "golden_update")
32

43
package(default_visibility = ["//visibility:public"])
54

@@ -62,31 +61,31 @@ java_proto_library(
6261
name = test_name,
6362
size = "medium",
6463
srcs = [
65-
"{0}.java".format(test_name),
64+
"%s.java" % test_name,
6665
] + COMMON_SRCS,
6766
data = [
6867
"//src/test/java/com/google/api/generator/gapic/composer/rest/goldens:goldens_files",
6968
"//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files",
7069
"//src/test/java/com/google/api/generator/gapic/testdata:service_config_files",
7170
],
72-
test_class = "com.google.api.generator.gapic.composer.rest.{0}".format(test_name),
71+
test_class = "com.google.api.generator.gapic.composer.rest.%s" % test_name,
7372
deps = TEST_DEPS,
7473
) for test_name in TESTS]
7574

7675
# Run `bazel run src/test/java/com/google/api/generator/gapic/composer/rest:testTargetName_update`
7776
# to update goldens as expected generated code.
7877
# `ServiceClient*` tests are not supported now since they are still in active development.
7978

80-
[golden_update(
81-
name = "{0}_update".format(test_name),
82-
srcs = [
83-
"{0}.java".format(test_name),
84-
] + COMMON_SRCS,
79+
[java_binary(
80+
name = "%s_update" % test_name,
81+
srcs = ["%s.java" % test_name] + COMMON_SRCS,
8582
data = [
8683
"//src/test/java/com/google/api/generator/gapic/composer/rest/goldens:goldens_files",
8784
"//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files",
8885
"//src/test/java/com/google/api/generator/gapic/testdata:service_config_files",
8986
],
90-
test_class = "com.google.api.generator.gapic.composer.rest.{0}".format(test_name),
87+
main_class = "com.google.api.generator.test.framework.SingleJUnitTestRunner",
88+
args = ["com.google.api.generator.gapic.composer.rest.%s" % test_name],
9189
deps = TEST_DEPS,
90+
runtime_deps = ["//src/test/java/com/google/api/generator/test/framework:junit_runner"],
9291
) for test_name in TESTS]

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ java_library(
2727

2828
java_library(
2929
name = "junit_runner",
30-
srcs = [
31-
"SingleJUnitTestRunner.java",
32-
],
30+
srcs = ["SingleJUnitTestRunner.java"],
3331
deps = [
3432
":utils",
3533
"@junit_junit//jar",

‎src/test/java/com/google/api/generator/test/framework/SingleJUnitTestRunner.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,11 @@ public static class JUnitClassNotFoundException extends RuntimeException {
4545
public JUnitClassNotFoundException(String errorMessage) {
4646
super(errorMessage);
4747
}
48-
49-
public JUnitClassNotFoundException(String errorMessage, Throwable cause) {
50-
super(errorMessage, cause);
51-
}
5248
}
5349

5450
public static class MissingRequiredArgException extends RuntimeException {
5551
public MissingRequiredArgException(String errorMessage) {
5652
super(errorMessage);
5753
}
58-
59-
public MissingRequiredArgException(String errorMessage, Throwable cause) {
60-
super(errorMessage, cause);
61-
}
6254
}
6355
}

0 commit comments

Comments
 (0)