From 3f568515aabcd27a99b281e300fbb5f9e13c4fda Mon Sep 17 00:00:00 2001 From: Simon Stewart Date: Tue, 16 Jul 2019 10:13:41 +0100 Subject: [PATCH] Move java_test_suite rule to test.bzl --- .../org/openqa/selenium/atoms/BUILD.bazel | 2 +- .../org/openqa/selenium/devtools/BUILD.bazel | 2 +- .../openqa/selenium/environment/BUILD.bazel | 2 +- .../test/org/openqa/selenium/io/BUILD.bazel | 2 +- .../test/org/openqa/selenium/json/BUILD.bazel | 2 +- .../test/org/openqa/selenium/net/BUILD.bazel | 2 +- .../test/org/openqa/selenium/os/BUILD.bazel | 2 +- .../openqa/selenium/remote/http/BUILD.bazel | 2 +- .../selenium/remote/http/okhttp/BUILD.bazel | 2 +- .../selenium/remote/internal/BUILD.bazel | 2 +- .../selenium/remote/tracing/BUILD.bazel | 2 +- .../org/openqa/selenium/testing/BUILD.bazel | 2 +- java/rules.bzl | 59 ------------------- .../selenium/webdriven/BUILD.bazel | 4 +- .../openqa/selenium/grid/config/BUILD.bazel | 2 +- .../org/openqa/selenium/grid/data/BUILD.bazel | 2 +- .../selenium/grid/distributor/BUILD.bazel | 2 +- .../org/openqa/selenium/grid/node/BUILD.bazel | 2 +- .../selenium/grid/node/local/BUILD.bazel | 2 +- .../openqa/selenium/grid/router/BUILD.bazel | 2 +- .../openqa/selenium/grid/server/BUILD.bazel | 2 +- .../selenium/grid/sessionmap/BUILD.bazel | 2 +- .../org/openqa/selenium/grid/web/BUILD.bazel | 2 +- java/test.bzl | 50 ++++++++++++++++ 24 files changed, 73 insertions(+), 82 deletions(-) diff --git a/java/client/test/org/openqa/selenium/atoms/BUILD.bazel b/java/client/test/org/openqa/selenium/atoms/BUILD.bazel index 451ddec8f43fa..a2a15469e3f63 100644 --- a/java/client/test/org/openqa/selenium/atoms/BUILD.bazel +++ b/java/client/test/org/openqa/selenium/atoms/BUILD.bazel @@ -1,5 +1,5 @@ load("//:copy_file.bzl", "copy_file") -load("//java:rules.bzl", "java_test_suite") +load("//java:test.bzl", "java_test_suite") copy_file( name = "execute_script", diff --git a/java/client/test/org/openqa/selenium/devtools/BUILD.bazel b/java/client/test/org/openqa/selenium/devtools/BUILD.bazel index 081f14ab5aa1f..95b9beeddfbba 100644 --- a/java/client/test/org/openqa/selenium/devtools/BUILD.bazel +++ b/java/client/test/org/openqa/selenium/devtools/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:rules.bzl", "java_test_suite") +load("//java:test.bzl", "java_test_suite") DEV_TOOLS_BROWSERS = { "chrome": { diff --git a/java/client/test/org/openqa/selenium/environment/BUILD.bazel b/java/client/test/org/openqa/selenium/environment/BUILD.bazel index 8ed78c2269d10..16e3ddaf2e274 100644 --- a/java/client/test/org/openqa/selenium/environment/BUILD.bazel +++ b/java/client/test/org/openqa/selenium/environment/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:rules.bzl", "java_test_suite") +load("//java:test.bzl", "java_test_suite") java_library( name = "environment", diff --git a/java/client/test/org/openqa/selenium/io/BUILD.bazel b/java/client/test/org/openqa/selenium/io/BUILD.bazel index 21eba2b076c3f..2c6a5de2f7ad9 100644 --- a/java/client/test/org/openqa/selenium/io/BUILD.bazel +++ b/java/client/test/org/openqa/selenium/io/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:rules.bzl", "java_test_suite") +load("//java:test.bzl", "java_test_suite") java_test_suite( name = "SmallTests", diff --git a/java/client/test/org/openqa/selenium/json/BUILD.bazel b/java/client/test/org/openqa/selenium/json/BUILD.bazel index e050f67a6a5ce..357d2c68ad897 100644 --- a/java/client/test/org/openqa/selenium/json/BUILD.bazel +++ b/java/client/test/org/openqa/selenium/json/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:rules.bzl", "java_test_suite") +load("//java:test.bzl", "java_test_suite") java_test_suite( name = "SmallTests", diff --git a/java/client/test/org/openqa/selenium/net/BUILD.bazel b/java/client/test/org/openqa/selenium/net/BUILD.bazel index 915f48c1feaf6..194e0ba21ea26 100644 --- a/java/client/test/org/openqa/selenium/net/BUILD.bazel +++ b/java/client/test/org/openqa/selenium/net/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:rules.bzl", "java_test_suite") +load("//java:test.bzl", "java_test_suite") java_library( name = "net", diff --git a/java/client/test/org/openqa/selenium/os/BUILD.bazel b/java/client/test/org/openqa/selenium/os/BUILD.bazel index c960c40d02677..70ed5ef9117bc 100644 --- a/java/client/test/org/openqa/selenium/os/BUILD.bazel +++ b/java/client/test/org/openqa/selenium/os/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:rules.bzl", "java_test_suite") +load("//java:test.bzl", "java_test_suite") java_test_suite( name = "AllTests", diff --git a/java/client/test/org/openqa/selenium/remote/http/BUILD.bazel b/java/client/test/org/openqa/selenium/remote/http/BUILD.bazel index ead71bd9b930b..97ecb29aca1af 100644 --- a/java/client/test/org/openqa/selenium/remote/http/BUILD.bazel +++ b/java/client/test/org/openqa/selenium/remote/http/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:rules.bzl", "java_test_suite") +load("//java:test.bzl", "java_test_suite") java_test_suite( name = "SmallTests", diff --git a/java/client/test/org/openqa/selenium/remote/http/okhttp/BUILD.bazel b/java/client/test/org/openqa/selenium/remote/http/okhttp/BUILD.bazel index bc75440ac8e29..b3a22e4fb9ef1 100644 --- a/java/client/test/org/openqa/selenium/remote/http/okhttp/BUILD.bazel +++ b/java/client/test/org/openqa/selenium/remote/http/okhttp/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:rules.bzl", "java_test_suite") +load("//java:test.bzl", "java_test_suite") java_test_suite( name = "MediumTests", diff --git a/java/client/test/org/openqa/selenium/remote/internal/BUILD.bazel b/java/client/test/org/openqa/selenium/remote/internal/BUILD.bazel index cf7557e059de4..4848c58b6397c 100644 --- a/java/client/test/org/openqa/selenium/remote/internal/BUILD.bazel +++ b/java/client/test/org/openqa/selenium/remote/internal/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:rules.bzl", "java_test_suite") +load("//java:test.bzl", "java_test_suite") java_library( name = "test-lib", diff --git a/java/client/test/org/openqa/selenium/remote/tracing/BUILD.bazel b/java/client/test/org/openqa/selenium/remote/tracing/BUILD.bazel index 6b7ca74f15be0..62e758b87c88e 100644 --- a/java/client/test/org/openqa/selenium/remote/tracing/BUILD.bazel +++ b/java/client/test/org/openqa/selenium/remote/tracing/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:rules.bzl", "java_test_suite") +load("//java:test.bzl", "java_test_suite") java_test_suite( name = "SmallTests", diff --git a/java/client/test/org/openqa/selenium/testing/BUILD.bazel b/java/client/test/org/openqa/selenium/testing/BUILD.bazel index 7fadf650b1137..3c7089215102c 100644 --- a/java/client/test/org/openqa/selenium/testing/BUILD.bazel +++ b/java/client/test/org/openqa/selenium/testing/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:rules.bzl", "java_test_suite") +load("//java:test.bzl", "java_test_suite") java_library( name = "annotations", diff --git a/java/rules.bzl b/java/rules.bzl index 62a20df7b5908..d2f8507f69b14 100644 --- a/java/rules.bzl +++ b/java/rules.bzl @@ -57,62 +57,3 @@ def java_binary(name, maven_coords = None, deps = [], **kwargs): deps = all_deps, **kwargs ) - -def java_test_suite( - name, - srcs, - resources=None, - jvm_flags=[], - deps=None, - visibility=None, - size = None, - tags = []): - - # By default bazel computes the name of test classes based on the - # standard Maven directory structure, which we don't use in - # Selenium, so try to compute the correct package name. - pkg = native.package_name() - idx = pkg.find("/com/") - if idx == -1: - idx = pkg.find("/org/") - if idx != -1: - pkg = pkg[idx+1:].replace("/", ".") - else: - pkg = None - - tests = [] - - actual_tags = [] - actual_tags.extend(tags) - if "small" != size: - actual_tags.append("no-sandbox") - - for src in srcs: - if src.endswith('Test.java'): - test_name = src[:-len('.java')] - - tests += [test_name] - test_class = None - if pkg != None: - test_class = pkg + "." + test_name.replace("/", ".") - - if test_name in native.existing_rules(): - test_name = "%s-%s" % (name, test_name) - - native.java_test( - name = test_name, - srcs = [src], - size = size, - jvm_flags = jvm_flags, - test_class = test_class, - resources = resources, - tags = actual_tags, - deps = deps, - visibility = ["//visibility:private"]) - - native.test_suite( - name = name, - tests = tests, - tags = ["manual"] + tags, - visibility = visibility) - diff --git a/java/server/test/com/thoughtworks/selenium/webdriven/BUILD.bazel b/java/server/test/com/thoughtworks/selenium/webdriven/BUILD.bazel index 1258f7830cb54..60cd3b1ce35da 100644 --- a/java/server/test/com/thoughtworks/selenium/webdriven/BUILD.bazel +++ b/java/server/test/com/thoughtworks/selenium/webdriven/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:rules.bzl", "java_test_suite") +load("//java:test.bzl", "java_test_suite") java_test_suite( name = "MediumTests", @@ -15,4 +15,4 @@ java_test_suite( "//third_party/java/jetty", "//third_party/java/junit", ] -) \ No newline at end of file +) diff --git a/java/server/test/org/openqa/selenium/grid/config/BUILD.bazel b/java/server/test/org/openqa/selenium/grid/config/BUILD.bazel index 8da860d954ee3..da89f6113b9d1 100644 --- a/java/server/test/org/openqa/selenium/grid/config/BUILD.bazel +++ b/java/server/test/org/openqa/selenium/grid/config/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:rules.bzl", "java_test_suite") +load("//java:test.bzl", "java_test_suite") java_test_suite( name = "SmallTests", diff --git a/java/server/test/org/openqa/selenium/grid/data/BUILD.bazel b/java/server/test/org/openqa/selenium/grid/data/BUILD.bazel index cb5a743657a2c..4429e39691b66 100644 --- a/java/server/test/org/openqa/selenium/grid/data/BUILD.bazel +++ b/java/server/test/org/openqa/selenium/grid/data/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:rules.bzl", "java_test_suite") +load("//java:test.bzl", "java_test_suite") java_test_suite( name = "SmallTests", diff --git a/java/server/test/org/openqa/selenium/grid/distributor/BUILD.bazel b/java/server/test/org/openqa/selenium/grid/distributor/BUILD.bazel index 54b4c7b854cf0..895a6408a13e0 100644 --- a/java/server/test/org/openqa/selenium/grid/distributor/BUILD.bazel +++ b/java/server/test/org/openqa/selenium/grid/distributor/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:rules.bzl", "java_test_suite") +load("//java:test.bzl", "java_test_suite") java_test_suite( name = "MediumTests", diff --git a/java/server/test/org/openqa/selenium/grid/node/BUILD.bazel b/java/server/test/org/openqa/selenium/grid/node/BUILD.bazel index ff2071b769b77..e02e1c8324706 100644 --- a/java/server/test/org/openqa/selenium/grid/node/BUILD.bazel +++ b/java/server/test/org/openqa/selenium/grid/node/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:rules.bzl", "java_test_suite") +load("//java:test.bzl", "java_test_suite") java_test_suite( name = "SmallTests", diff --git a/java/server/test/org/openqa/selenium/grid/node/local/BUILD.bazel b/java/server/test/org/openqa/selenium/grid/node/local/BUILD.bazel index c121f803e50a7..8b367c4b1884a 100644 --- a/java/server/test/org/openqa/selenium/grid/node/local/BUILD.bazel +++ b/java/server/test/org/openqa/selenium/grid/node/local/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:rules.bzl", "java_test_suite") +load("//java:test.bzl", "java_test_suite") java_test_suite( name = "SmallTests", diff --git a/java/server/test/org/openqa/selenium/grid/router/BUILD.bazel b/java/server/test/org/openqa/selenium/grid/router/BUILD.bazel index 0504eb709717f..374b9424a9ec9 100644 --- a/java/server/test/org/openqa/selenium/grid/router/BUILD.bazel +++ b/java/server/test/org/openqa/selenium/grid/router/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:rules.bzl", "java_test_suite") +load("//java:test.bzl", "java_test_suite") java_test_suite( name = "MediumTests", diff --git a/java/server/test/org/openqa/selenium/grid/server/BUILD.bazel b/java/server/test/org/openqa/selenium/grid/server/BUILD.bazel index fdc83a1242876..18dbb9914f1fa 100644 --- a/java/server/test/org/openqa/selenium/grid/server/BUILD.bazel +++ b/java/server/test/org/openqa/selenium/grid/server/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:rules.bzl", "java_test_suite") +load("//java:test.bzl", "java_test_suite") java_test_suite( name = "MediumTests", diff --git a/java/server/test/org/openqa/selenium/grid/sessionmap/BUILD.bazel b/java/server/test/org/openqa/selenium/grid/sessionmap/BUILD.bazel index 8cfd4539c3389..fecfd776f0947 100644 --- a/java/server/test/org/openqa/selenium/grid/sessionmap/BUILD.bazel +++ b/java/server/test/org/openqa/selenium/grid/sessionmap/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:rules.bzl", "java_test_suite") +load("//java:test.bzl", "java_test_suite") java_test_suite( name = "SmallTests", diff --git a/java/server/test/org/openqa/selenium/grid/web/BUILD.bazel b/java/server/test/org/openqa/selenium/grid/web/BUILD.bazel index 71907f61a3791..256f15a294ef4 100644 --- a/java/server/test/org/openqa/selenium/grid/web/BUILD.bazel +++ b/java/server/test/org/openqa/selenium/grid/web/BUILD.bazel @@ -1,4 +1,4 @@ -load("//java:rules.bzl", "java_test_suite") +load("//java:test.bzl", "java_test_suite") java_test_suite( name = "SmallTests", diff --git a/java/test.bzl b/java/test.bzl index 8272b7bf8f960..87bd093e71800 100644 --- a/java/test.bzl +++ b/java/test.bzl @@ -199,3 +199,53 @@ def java_selenium_test_suite( native.test_suite(name = test_name, tests = tests, tags = ["manual"]) suites.append(test_name) native.test_suite(name = name, tests = suites, tags = tags + ["manual"]) + + +def java_test_suite( + name, + srcs, + resources=None, + jvm_flags=[], + deps=None, + visibility=None, + size = None, + tags = []): + + # By default bazel computes the name of test classes based on the + # standard Maven directory structure, which we don't use in + # Selenium, so try to compute the correct package name. + pkg = _package_name() + + tests = [] + + actual_tags = [] + actual_tags.extend(tags) + if "small" != size: + actual_tags.append("no-sandbox") + + for src in srcs: + if src.endswith('Test.java'): + test_name = src[:-len('.java')] + + test_class = _test_class_name(src) + + if test_name in native.existing_rules(): + test_name = "%s-%s" % (name, test_name) + tests += [test_name] + + native.java_test( + name = test_name, + srcs = [src], + size = size, + jvm_flags = jvm_flags, + test_class = test_class, + resources = resources, + tags = actual_tags, + deps = deps, + visibility = ["//visibility:private"]) + + native.test_suite( + name = name, + tests = tests, + tags = ["manual"] + tags, + visibility = visibility)