1 files changed, 24 insertions, 27 deletions
diff --git a/java/org/brotli/dec/BUILD b/java/org/brotli/dec/BUILD
index e6d3a4d..8c61fe7 100644
--- a/java/org/brotli/dec/BUILD
+++ b/java/org/brotli/dec/BUILD
@@ -5,6 +5,11 @@ package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # MIT
 
+TEST_DEPS = [
+    ":dec",
+    "@junit_junit//jar",
+]
+
 java_library(
     name = "dec",
     srcs = glob(
@@ -14,48 +19,40 @@ java_library(
     proguard_specs = ["proguard.cfg"],
 )
 
-java_library(
-    name = "test_lib",
-    testonly = 1,
-    srcs = glob(["*Test*.java"]),
-    deps = [
-        ":dec",
-        "@junit_junit//jar",
-    ],
-)
+load(":build_defs.bzl", "brotli_java_test")
 
-java_test(
+brotli_java_test(
     name = "BitReaderTest",
-    test_class = "org.brotli.dec.BitReaderTest",
-    runtime_deps = [":test_lib"],
+    srcs = ["BitReaderTest.java"],
+    deps = TEST_DEPS,
 )
 
-java_test(
+brotli_java_test(
     name = "DecodeTest",
-    test_class = "org.brotli.dec.DecodeTest",
-    runtime_deps = [":test_lib"],
+    srcs = ["DecodeTest.java"],
+    deps = TEST_DEPS,
 )
 
-java_test(
+brotli_java_test(
     name = "DictionaryTest",
-    test_class = "org.brotli.dec.DictionaryTest",
-    runtime_deps = [":test_lib"],
+    srcs = ["DictionaryTest.java"],
+    deps = TEST_DEPS,
 )
 
-java_test(
+brotli_java_test(
     name = "EagerStreamTest",
-    test_class = "org.brotli.dec.EagerStreamTest",
-    runtime_deps = [":test_lib"],
+    srcs = ["EagerStreamTest.java"],
+    deps = TEST_DEPS,
 )
 
-java_test(
+brotli_java_test(
     name = "SynthTest",
-    test_class = "org.brotli.dec.SynthTest",
-    runtime_deps = [":test_lib"],
+    srcs = ["SynthTest.java"],
+    deps = TEST_DEPS,
 )
 
-java_test(
+brotli_java_test(
     name = "TransformTest",
-    test_class = "org.brotli.dec.TransformTest",
-    runtime_deps = [":test_lib"],
+    srcs = ["TransformTest.java"],
+    deps = TEST_DEPS,
 )