Skip to content

chore: re-work generating unit goldens #911

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

Closed
chanseokoh wants to merge 1 commit into from
Closed

chore: re-work generating unit goldens #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
84 changes: 0 additions & 84 deletions rules_bazel/java/java_diff_test.bzl
View file
Open in desktop

This file was deleted.

20 changes: 20 additions & 0 deletions rules_bazel/unit_golden_update.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Macro expanding to two rules:
# (1) java_library(): compiles given .java files
# (2) sh_binary(): script to update .golden (depends on (1))
def golden_update(name, srcs, test_class, data, deps):
srcs_name = "%s_srcs" % name
native.java_library(
name = srcs_name,
srcs = srcs,
deps = deps,
)

native.sh_binary(
name = name,
srcs = ["//scripts:update_unit_golden.sh"],
args = [test_class],
data = data + deps + [
"//src/test/java/com/google/api/generator/test/framework:junit_runner",
srcs_name,
],
)
6 changes: 5 additions & 1 deletion scripts/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
package(default_visibility = ["//test/integration:__pkg__"])

exports_files(["diff_gen_and_golden.sh", "update_golden.sh"])
exports_files([
"diff_gen_and_golden.sh",
"update_golden.sh",
"update_unit_golden.sh",
])
9 changes: 9 additions & 0 deletions scripts/update_unit_golden.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/sh

set -o errexit

TEST_CLASS=$1
CLASSPATH=$( find . -name '*.jar' ! -name 'liblite.jar' | xargs echo | tr ' ' ':' )

TEST_OUTPUT_HOME=${BUILD_WORKSPACE_DIRECTORY}/src/test/java \
java -cp ${CLASSPATH} com.google.api.generator.test.framework.SingleJUnitTestRunner ${TEST_CLASS}
14 changes: 6 additions & 8 deletions src/test/java/com/google/api/generator/engine/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_java//java:defs.bzl", "java_test")
load("//:rules_bazel/java/java_diff_test.bzl", "golden_update")
load("//:rules_bazel/unit_golden_update.bzl", "golden_update")

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

Expand All @@ -26,20 +26,18 @@ TEST_DEPS = [

[java_test(
name = test_name,
srcs = ["{0}.java".format(test_name)],
srcs = ["%s.java" % test_name],
data = ["//src/test/java/com/google/api/generator/engine/goldens:goldens_files"],
test_class = "com.google.api.generator.engine.{0}".format(test_name),
test_class = "com.google.api.generator.engine.%s" % test_name,
deps = TEST_DEPS,
) for test_name in TESTS]

TEST_CLASS_NAME = "com.google.api.generator.engine.JavaCodeGeneratorTest"

# Run `bazel run src/test/java/com/google/api/generator/engine:JavaCodeGeneratorTest_update`
# to update goldens as expected generated code.
[golden_update(
name = "{0}_update".format(test_name),
srcs = ["{0}.java".format(test_name)],
name = "%s_update" % test_name,
srcs = ["%s.java" % test_name],
data = ["//src/test/java/com/google/api/generator/engine/goldens:goldens_files"],
test_class = "com.google.api.generator.engine.{0}".format(test_name),
test_class = "com.google.api.generator.engine.%s" % test_name,
deps = TEST_DEPS,
) for test_name in TESTS]
18 changes: 8 additions & 10 deletions src/test/java/com/google/api/generator/gapic/composer/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
load("@rules_java//java:defs.bzl", "java_proto_library", "java_test")
load("//:rules_bazel/java/java_diff_test.bzl", "golden_update")
load("//:rules_bazel/unit_golden_update.bzl", "golden_update")

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

UPDATE_GOLDENS_TESTS = [
TESTS = [
"ComposerTest",
]

TESTS = UPDATE_GOLDENS_TESTS

TEST_DEPS = [
":common_resources_java_proto",
"//:service_config_java_proto",
Expand Down Expand Up @@ -60,14 +58,14 @@ java_proto_library(
[java_test(
name = test_name,
srcs = [
"{0}.java".format(test_name),
"%s.java" % test_name,
],
data = [
"//src/test/java/com/google/api/generator/gapic/composer/goldens:goldens_files",
"//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files",
"//src/test/java/com/google/api/generator/gapic/testdata:service_config_files",
],
test_class = "com.google.api.generator.gapic.composer.{0}".format(test_name),
test_class = "com.google.api.generator.gapic.composer.%s" % test_name,
deps = TEST_DEPS,
) for test_name in TESTS]

Expand All @@ -76,15 +74,15 @@ java_proto_library(
# `ServiceClient*` tests are not supported now since they are still in active development.

[golden_update(
name = "{0}_update".format(test_name),
name = "%s_update" % test_name,
srcs = [
"{0}.java".format(test_name),
"%s.java" % test_name,
],
data = [
"//src/test/java/com/google/api/generator/gapic/composer/goldens:goldens_files",
"//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files",
"//src/test/java/com/google/api/generator/gapic/testdata:service_config_files",
],
test_class = "com.google.api.generator.gapic.composer.{0}".format(test_name),
test_class = "com.google.api.generator.gapic.composer.%s" % test_name,
deps = TEST_DEPS,
) for test_name in UPDATE_GOLDENS_TESTS]
) for test_name in TESTS]
12 changes: 6 additions & 6 deletions src/test/java/com/google/api/generator/gapic/composer/common/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_java//java:defs.bzl", "java_proto_library", "java_test")
load("//:rules_bazel/java/java_diff_test.bzl", "golden_update")
load("//:rules_bazel/unit_golden_update.bzl", "golden_update")

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

Expand Down Expand Up @@ -70,14 +70,14 @@ java_proto_library(
[java_test(
name = test_name,
srcs = [
"{0}.java".format(test_name),
"%s.java" % test_name,
],
data = [
"//src/test/java/com/google/api/generator/gapic/composer/common/goldens:goldens_files",
"//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files",
"//src/test/java/com/google/api/generator/gapic/testdata:service_config_files",
],
test_class = "com.google.api.generator.gapic.composer.common.{0}".format(test_name),
test_class = "com.google.api.generator.gapic.composer.common.%s" % test_name,
deps = TEST_DEPS + [":common"],
) for test_name in TESTS]

Expand All @@ -86,15 +86,15 @@ java_proto_library(
# `ServiceClient*` tests are not supported now since they are still in active development.

[golden_update(
name = "{0}_update".format(test_name),
name = "%s_update" % test_name,
srcs = [
"{0}.java".format(test_name),
"%s.java" % test_name,
],
data = [
"//src/test/java/com/google/api/generator/gapic/composer/common/goldens:goldens_files",
"//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files",
"//src/test/java/com/google/api/generator/gapic/testdata:service_config_files",
],
test_class = "com.google.api.generator.gapic.composer.common.{0}".format(test_name),
test_class = "com.google.api.generator.gapic.composer.common.%s" % test_name,
deps = TEST_DEPS + [":common"],
) for test_name in UPDATE_GOLDENS_TESTS]
12 changes: 6 additions & 6 deletions src/test/java/com/google/api/generator/gapic/composer/grpc/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_java//java:defs.bzl", "java_proto_library", "java_test")
load("//:rules_bazel/java/java_diff_test.bzl", "golden_update")
load("//:rules_bazel/unit_golden_update.bzl", "golden_update")

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

Expand Down Expand Up @@ -64,14 +64,14 @@ java_proto_library(
name = test_name,
size = "medium",
srcs = [
"{0}.java".format(test_name),
"%s.java" % test_name,
] + COMMON_SRCS,
data = [
"//src/test/java/com/google/api/generator/gapic/composer/grpc/goldens:goldens_files",
"//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files",
"//src/test/java/com/google/api/generator/gapic/testdata:service_config_files",
],
test_class = "com.google.api.generator.gapic.composer.grpc.{0}".format(test_name),
test_class = "com.google.api.generator.gapic.composer.grpc.%s" % test_name,
deps = TEST_DEPS,
) for test_name in TESTS]

Expand All @@ -80,15 +80,15 @@ java_proto_library(
# `ServiceClient*` tests are not supported now since they are still in active development.

[golden_update(
name = "{0}_update".format(test_name),
name = "%s_update" % test_name,
srcs = [
"{0}.java".format(test_name),
"%s.java" % test_name,
] + COMMON_SRCS,
data = [
"//src/test/java/com/google/api/generator/gapic/composer/grpc/goldens:goldens_files",
"//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files",
"//src/test/java/com/google/api/generator/gapic/testdata:service_config_files",
],
test_class = "com.google.api.generator.gapic.composer.grpc.{0}".format(test_name),
test_class = "com.google.api.generator.gapic.composer.grpc.%s" % test_name,
deps = TEST_DEPS,
) for test_name in TESTS]
14 changes: 7 additions & 7 deletions src/test/java/com/google/api/generator/gapic/composer/resourcename/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_java//java:defs.bzl", "java_proto_library", "java_test")
load("//:rules_bazel/java/java_diff_test.bzl", "golden_update")
load("//:rules_bazel/unit_golden_update.bzl", "golden_update")

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

Expand All @@ -13,7 +13,7 @@ TESTS = UPDATE_GOLDENS_TESTS + [

filegroup(
name = "resourcename_files",
srcs = ["{0}.java".format(f) for f in TESTS],
srcs = ["%s.java" % f for f in TESTS],
)

TEST_DEPS = [
Expand All @@ -40,13 +40,13 @@ TEST_DEPS = [

[java_test(
name = test_name,
srcs = ["{0}.java".format(test_name)],
srcs = ["%s.java" % test_name],
data = [
"//src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens:goldens_files",
"//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files",
"//src/test/java/com/google/api/generator/gapic/testdata:service_config_files",
],
test_class = "com.google.api.generator.gapic.composer.resourcename.{0}".format(test_name),
test_class = "com.google.api.generator.gapic.composer.resourcename.%s" % test_name,
deps = TEST_DEPS,
) for test_name in TESTS]

Expand All @@ -62,15 +62,15 @@ java_proto_library(
# `ServiceClient*` tests are not supported now since they are still in active development.

[golden_update(
name = "{0}_update".format(test_name),
name = "%s_update" % test_name,
srcs = [
"{0}.java".format(test_name),
"%s.java" % test_name,
],
data = [
"//src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens:goldens_files",
"//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files",
"//src/test/java/com/google/api/generator/gapic/testdata:service_config_files",
],
test_class = "com.google.api.generator.gapic.composer.resourcename.{0}".format(test_name),
test_class = "com.google.api.generator.gapic.composer.resourcename.%s" % test_name,
deps = TEST_DEPS,
) for test_name in UPDATE_GOLDENS_TESTS]
12 changes: 6 additions & 6 deletions src/test/java/com/google/api/generator/gapic/composer/rest/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_java//java:defs.bzl", "java_proto_library", "java_test")
load("//:rules_bazel/java/java_diff_test.bzl", "golden_update")
load("//:rules_bazel/unit_golden_update.bzl", "golden_update")

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

Expand Down Expand Up @@ -62,14 +62,14 @@ java_proto_library(
name = test_name,
size = "medium",
srcs = [
"{0}.java".format(test_name),
"%s.java" % test_name,
] + COMMON_SRCS,
data = [
"//src/test/java/com/google/api/generator/gapic/composer/rest/goldens:goldens_files",
"//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files",
"//src/test/java/com/google/api/generator/gapic/testdata:service_config_files",
],
test_class = "com.google.api.generator.gapic.composer.rest.{0}".format(test_name),
test_class = "com.google.api.generator.gapic.composer.rest.%s" % test_name,
deps = TEST_DEPS,
) for test_name in TESTS]

Expand All @@ -78,15 +78,15 @@ java_proto_library(
# `ServiceClient*` tests are not supported now since they are still in active development.

[golden_update(
name = "{0}_update".format(test_name),
name = "%s_update" % test_name,
srcs = [
"{0}.java".format(test_name),
"%s.java" % test_name,
] + COMMON_SRCS,
data = [
"//src/test/java/com/google/api/generator/gapic/composer/rest/goldens:goldens_files",
"//src/test/java/com/google/api/generator/gapic/testdata:gapic_config_files",
"//src/test/java/com/google/api/generator/gapic/testdata:service_config_files",
],
test_class = "com.google.api.generator.gapic.composer.rest.{0}".format(test_name),
test_class = "com.google.api.generator.gapic.composer.rest.%s" % test_name,
deps = TEST_DEPS,
) for test_name in TESTS]
Loading