chore: re-work generating unit golden files

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

@@ -1,5 +1,4 @@
 load("@rules_java//java:defs.bzl", "java_test")
-load("//:rules_bazel/java/java_diff_test.bzl", "golden_update")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -26,20 +25,20 @@ 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)],
+[java_binary(
+    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),
+    main_class = "com.google.api.generator.test.framework.SingleJUnitTestRunner",
+    args = ["com.google.api.generator.engine.%s" % test_name],
     deps = TEST_DEPS,
+    runtime_deps = ["//src/test/java/com/google/api/generator/test/framework:junit_runner"],
 ) for test_name in TESTS]

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

@@ -1,14 +1,11 @@
 load("@rules_java//java:defs.bzl", "java_proto_library", "java_test")
-load("//:rules_bazel/java/java_diff_test.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",
@@ -60,31 +57,31 @@ 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]
 
 # Run `bazel run src/test/java/com/google/api/generator/gapic/composer:testTargetName_update`
 # to update goldens as expected generated code.
 # `ServiceClient*` tests are not supported now since they are still in active development.
 
-[golden_update(
-    name = "{0}_update".format(test_name),
-    srcs = [
-        "{0}.java".format(test_name),
-    ],
+[java_binary(
+    name = "%s_update" % test_name,
+    srcs = ["%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),
+    main_class = "com.google.api.generator.test.framework.SingleJUnitTestRunner",
+    args = ["com.google.api.generator.gapic.composer.%s" % test_name],
     deps = TEST_DEPS,
-) for test_name in UPDATE_GOLDENS_TESTS]
+    runtime_deps = ["//src/test/java/com/google/api/generator/test/framework:junit_runner"],
+) for test_name in TESTS]

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

@@ -1,5 +1,4 @@
 load("@rules_java//java:defs.bzl", "java_proto_library", "java_test")
-load("//:rules_bazel/java/java_diff_test.bzl", "golden_update")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -70,31 +69,31 @@ 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]
 
 # Run `bazel run src/test/java/com/google/api/generator/gapic/composer/common:testTargetName_update`
 # to update goldens as expected generated code.
 # `ServiceClient*` tests are not supported now since they are still in active development.
 
-[golden_update(
-    name = "{0}_update".format(test_name),
-    srcs = [
-        "{0}.java".format(test_name),
-    ],
+[java_binary(
+    name = "%s_update" % test_name,
+    srcs = ["%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),
+    main_class = "com.google.api.generator.test.framework.SingleJUnitTestRunner",
+    args = ["com.google.api.generator.gapic.composer.common.%s" % test_name],
     deps = TEST_DEPS + [":common"],
+    runtime_deps = ["//src/test/java/com/google/api/generator/test/framework:junit_runner"],
 ) for test_name in UPDATE_GOLDENS_TESTS]

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

@@ -1,5 +1,4 @@
 load("@rules_java//java:defs.bzl", "java_proto_library", "java_test")
-load("//:rules_bazel/java/java_diff_test.bzl", "golden_update")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -64,31 +63,31 @@ 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]
 
 # Run `bazel run src/test/java/com/google/api/generator/gapic/composer/grpc:testTargetName_update`
 # to update goldens as expected generated code.
 # `ServiceClient*` tests are not supported now since they are still in active development.
 
-[golden_update(
-    name = "{0}_update".format(test_name),
-    srcs = [
-        "{0}.java".format(test_name),
-    ] + COMMON_SRCS,
+[java_binary(
+    name = "%s_update" % test_name,
+    srcs = ["%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),
+    main_class = "com.google.api.generator.test.framework.SingleJUnitTestRunner",
+    args = ["com.google.api.generator.gapic.composer.grpc.%s" % test_name],
     deps = TEST_DEPS,
+    runtime_deps = ["//src/test/java/com/google/api/generator/test/framework:junit_runner"],
 ) for test_name in TESTS]

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

@@ -1,5 +1,4 @@
 load("@rules_java//java:defs.bzl", "java_proto_library", "java_test")
-load("//:rules_bazel/java/java_diff_test.bzl", "golden_update")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -13,7 +12,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 = [
@@ -40,13 +39,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]
 
@@ -61,16 +60,16 @@ java_proto_library(
 # to update goldens as expected generated code.
 # `ServiceClient*` tests are not supported now since they are still in active development.
 
-[golden_update(
-    name = "{0}_update".format(test_name),
-    srcs = [
-        "{0}.java".format(test_name),
-    ],
+[java_binary(
+    name = "%s_update" % 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),
+    main_class = "com.google.api.generator.test.framework.SingleJUnitTestRunner",
+    args = ["com.google.api.generator.gapic.composer.resourcename.%s" % test_name],
     deps = TEST_DEPS,
+    runtime_deps = ["//src/test/java/com/google/api/generator/test/framework:junit_runner"],
 ) for test_name in UPDATE_GOLDENS_TESTS]

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

@@ -1,5 +1,4 @@
 load("@rules_java//java:defs.bzl", "java_proto_library", "java_test")
-load("//:rules_bazel/java/java_diff_test.bzl", "golden_update")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -62,31 +61,31 @@ 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]
 
 # Run `bazel run src/test/java/com/google/api/generator/gapic/composer/rest:testTargetName_update`
 # to update goldens as expected generated code.
 # `ServiceClient*` tests are not supported now since they are still in active development.
 
-[golden_update(
-    name = "{0}_update".format(test_name),
-    srcs = [
-        "{0}.java".format(test_name),
-    ] + COMMON_SRCS,
+[java_binary(
+    name = "%s_update" % test_name,
+    srcs = ["%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),
+    main_class = "com.google.api.generator.test.framework.SingleJUnitTestRunner",
+    args = ["com.google.api.generator.gapic.composer.rest.%s" % test_name],
     deps = TEST_DEPS,
+    runtime_deps = ["//src/test/java/com/google/api/generator/test/framework:junit_runner"],
 ) for test_name in TESTS]

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

@@ -27,9 +27,7 @@ java_library(
 
 java_library(
     name = "junit_runner",
-    srcs = [
-        "SingleJUnitTestRunner.java",
-    ],
+    srcs = ["SingleJUnitTestRunner.java"],
     deps = [
         ":utils",
         "@junit_junit//jar",

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

@@ -45,19 +45,11 @@ public static class JUnitClassNotFoundException extends RuntimeException {
     public JUnitClassNotFoundException(String errorMessage) {
       super(errorMessage);
     }
-
-    public JUnitClassNotFoundException(String errorMessage, Throwable cause) {
-      super(errorMessage, cause);
-    }
   }
 
   public static class MissingRequiredArgException extends RuntimeException {
     public MissingRequiredArgException(String errorMessage) {
       super(errorMessage);
     }
-
-    public MissingRequiredArgException(String errorMessage, Throwable cause) {
-      super(errorMessage, cause);
-    }
   }
 }