Skip to content

Commit 7408a5a

Browse files
committed
[bazel] Bump contrib_rules_jvm to 0.19.0
1 parent e7babc9 commit 7408a5a

File tree

5 files changed

+63
-7
lines changed

5 files changed

+63
-7
lines changed

WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ rules_jvm_external_setup()
144144

145145
http_archive(
146146
name = "contrib_rules_jvm",
147-
sha256 = "548f0583192ff79c317789b03b882a7be9b1325eb5d3da5d7fdcc4b7ca69d543",
148-
strip_prefix = "rules_jvm-0.9.0",
149-
url = "https://github.com/bazel-contrib/rules_jvm/archive/refs/tags/v0.9.0.tar.gz",
147+
sha256 = "4d62589dc6a55e74bbe33930b826d593367fc777449a410604b2ad7c6c625ef7",
148+
strip_prefix = "rules_jvm-0.19.0",
149+
url = "https://github.com/bazel-contrib/rules_jvm/releases/download/v0.19.0/rules_jvm-v0.19.0.tar.gz",
150150
)
151151

152152
load("@contrib_rules_jvm//:repositories.bzl", "contrib_rules_jvm_deps")

java/defs.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
load(
22
"@contrib_rules_jvm//java:defs.bzl",
33
_JUNIT5_DEPS = "JUNIT5_DEPS",
4-
_java_test_suite = "java_test_suite",
54
)
65
load(
76
"@rules_java//java:defs.bzl",
@@ -10,6 +9,7 @@ load(
109
)
1110
load("@rules_jvm_external//:defs.bzl", _artifact = "artifact", _javadoc = "javadoc", _maven_bom = "maven_bom")
1211
load("//java/private:dist_zip.bzl", _java_dist_zip = "java_dist_zip")
12+
load("//java/private:java_test_suite.bzl", _java_test_suite = "java_test_suite")
1313
load("//java/private:library.bzl", _java_export = "java_export", _java_library = "java_library", _java_test = "java_test")
1414
load("//java/private:merge_jars.bzl", _merge_jars = "merge_jars")
1515
load("//java/private:module.bzl", _java_module = "java_module")

java/private/java_test_suite.bzl

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
load("@contrib_rules_jvm//java/private:create_jvm_test_suite.bzl", "create_jvm_test_suite")
2+
load("@contrib_rules_jvm//java/private:java_test_suite_shared_constants.bzl", "DEFAULT_TEST_SUFFIXES")
3+
load("@contrib_rules_jvm//java/private:library.bzl", "java_library")
4+
load(":junit5_test.bzl", "junit5_test")
5+
6+
def java_test_suite(
7+
name,
8+
srcs,
9+
runner = "junit5",
10+
test_suffixes = DEFAULT_TEST_SUFFIXES,
11+
package = None,
12+
deps = None,
13+
runtime_deps = [],
14+
size = None,
15+
**kwargs):
16+
create_jvm_test_suite(
17+
name,
18+
srcs = srcs,
19+
test_suffixes = test_suffixes,
20+
package = package,
21+
define_library = java_library,
22+
# We want to use our own test runner
23+
define_test = junit5_test,
24+
runner = runner,
25+
deps = deps,
26+
runtime_deps = runtime_deps,
27+
size = size,
28+
**kwargs
29+
)

java/private/junit5_test.bzl

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
load("@contrib_rules_jvm//java:defs.bzl", "java_test")
2+
load("@contrib_rules_jvm//java/private:package.bzl", "get_package_name")
3+
4+
def junit5_test(
5+
name,
6+
test_class = None,
7+
runtime_deps = [],
8+
package_prefixes = [],
9+
jvm_flags = [],
10+
**kwargs):
11+
if test_class:
12+
clazz = test_class
13+
else:
14+
clazz = get_package_name(package_prefixes) + name
15+
16+
java_test(
17+
name = name,
18+
main_class = "com.github.bazel_contrib.contrib_rules_jvm.junit5.JUnit5Runner",
19+
test_class = clazz,
20+
runtime_deps = runtime_deps + [
21+
"@contrib_rules_jvm//java/src/com/github/bazel_contrib/contrib_rules_jvm/junit5",
22+
],
23+
jvm_flags = jvm_flags + ["-Djava.security.manager=allow"],
24+
**kwargs
25+
)
26+
27+
return name

java/private/selenium_test.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
load("@contrib_rules_jvm//java:defs.bzl", "java_junit5_test")
21
load(
32
"//common:browsers.bzl",
43
"COMMON_TAGS",
@@ -16,6 +15,7 @@ load(
1615
"firefox_dev_jvm_flags",
1716
"firefox_jvm_flags",
1817
)
18+
load(":junit5_test.bzl", "junit5_test")
1919

2020
DEFAULT_BROWSER = "firefox"
2121

@@ -105,7 +105,7 @@ def selenium_test(name, test_class, size = "medium", browsers = DEFAULT_BROWSERS
105105

106106
test = name if browser == default_browser else "%s-%s" % (name, browser)
107107

108-
java_junit5_test(
108+
junit5_test(
109109
name = test,
110110
test_class = test_class,
111111
size = size,
@@ -124,7 +124,7 @@ def selenium_test(name, test_class, size = "medium", browsers = DEFAULT_BROWSERS
124124
all_tests.append(":%s" % test)
125125

126126
if remote:
127-
java_junit5_test(
127+
junit5_test(
128128
name = "%s-remote" % test,
129129
test_class = test_class,
130130
size = size,

0 commit comments

Comments
 (0)