Skip to content

Commit a2784c7

Browse files
committed
[bazel] Generate spotbugs tests for test code
1 parent 06f53b3 commit a2784c7

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

java/defs.bzl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ load(
22
"@rules_java//java:defs.bzl",
33
_java_binary = "java_binary",
44
_java_import = "java_import",
5-
_java_test = "java_test",
65
)
76
load("@rules_jvm_external//:defs.bzl", _artifact = "artifact", _javadoc = "javadoc")
87
load("//java/private:dist_zip.bzl", _java_dist_zip = "java_dist_zip")
9-
load("//java/private:library.bzl", _java_export = "java_export", _java_library = "java_library")
8+
load("//java/private:library.bzl", _java_export = "java_export", _java_library = "java_library", _java_test = "java_test")
109
load("//java/private:module.bzl", _java_module = "java_module")
1110
load("//java/private:selenium_test.bzl", _selenium_test = "selenium_test")
1211
load("//java/private:spotbugs_config.bzl", _spotbugs_config = "spotbugs_config")

java/private/library.bzl

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ load(
88
load(":export.bzl", _java_export = "java_export")
99
load(":spotbugs.bzl", "spotbugs_test")
1010

11-
def _add_lint_tests(name, **kwargs):
11+
def add_lint_tests(name, **kwargs):
1212
srcs = kwargs.get("srcs", [])
1313

1414
if len(srcs) == 0:
@@ -31,9 +31,13 @@ def _add_lint_tests(name, **kwargs):
3131
)
3232

3333
def java_export(name, **kwargs):
34-
_add_lint_tests(name, **kwargs)
34+
add_lint_tests(name, **kwargs)
3535
_java_export(name = name, **kwargs)
3636

3737
def java_library(name, **kwargs):
38-
_add_lint_tests(name, **kwargs)
38+
add_lint_tests(name, **kwargs)
3939
_java_library(name = name, **kwargs)
40+
41+
def java_test(name, **kwargs):
42+
add_lint_tests(name, **kwargs)
43+
_java_test(name = name, **kwargs)

java/private/selenium_test.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ load(
1111
"edge_jvm_flags",
1212
"firefox_jvm_flags",
1313
)
14+
load("//java/private:library.bzl", "add_lint_tests")
1415

1516
DEFAULT_BROWSER = "firefox"
1617

@@ -106,3 +107,4 @@ def selenium_test(name, test_class, size = "medium", browsers = BROWSERS.keys()
106107

107108
# Handy way to run everything
108109
native.test_suite(name = "%s-all-browsers" % name, tests = [":%s-%s" % (name, default_browser)], tags = tags + ["manual"])
110+
add_lint_tests(name, **kwargs)

java/private/suite.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load(":library.bzl", "java_library")
1+
load(":library.bzl", "java_library", "java_test")
22
load(":selenium_test.bzl", "BROWSERS", "DEFAULT_BROWSER", "selenium_test")
33
load(":package.bzl", "package_name")
44

@@ -85,7 +85,7 @@ def _create_java_test_target(
8585
test_class,
8686
tags = [],
8787
**kwargs):
88-
native.java_test(
88+
java_test(
8989
name = name,
9090
tags = tags,
9191
test_class = test_class,

0 commit comments

Comments
 (0)