[bazel] Move more java test infra into the java package

gryznar · Mar 15, 2021 · c0ec2b8 · c0ec2b8
1 parent 58a72e9
commit c0ec2b8
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/common/browsers.bzl b/common/browsers.bzl
@@ -1,3 +1,9 @@
+COMMON_TAGS = [
+    "browser-test",
+    "no-sandbox",
+    "requires-network",
+]
+
 chrome_data = select({
     "@selenium//common:use_pinned_linux_chrome": [
         "@linux_chromedriver//:chromedriver",

diff --git a/common/defs.bzl b/common/defs.bzl
@@ -1,7 +1,5 @@
 load("@bazel_skylib//rules:copy_file.bzl", _copy_file = "copy_file")
-load("//common/private:selenium_test.bzl", _selenium_test = "selenium_test")
 load("//common/private:zip_file.bzl", _zip_file = "zip_file")
 
 copy_file = _copy_file
-selenium_test = _selenium_test
 zip_file = _zip_file
diff --git a/java/client/test/org/openqa/selenium/environment/BUILD.bazel b/java/client/test/org/openqa/selenium/environment/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@rules_jvm_external//:defs.bzl", "artifact")
-load("//common/private:selenium_test.bzl", "BROWSERS")
+load("//java/private:selenium_test.bzl", "BROWSERS")
 load("//java:defs.bzl", "java_binary", "java_library", "java_test_suite")
 
 filegroup(

diff --git a/java/defs.bzl b/java/defs.bzl
@@ -8,6 +8,7 @@ load("@rules_jvm_external//:defs.bzl", _artifact = "artifact", _javadoc = "javad
 load("//java/private:dist_zip.bzl", _java_dist_zip = "java_dist_zip")
 load("//java/private:library.bzl", _java_export = "java_export", _java_library = "java_library")
 load("//java/private:module.bzl", _java_module = "java_module")
+load("//java/private:selenium_test.bzl", _selenium_test = "selenium_test")
 load("//java/private:spotbugs_config.bzl", _spotbugs_config = "spotbugs_config")
 load("//java/private:suite.bzl", _java_selenium_test_suite = "java_selenium_test_suite", _java_test_suite = "java_test_suite")
 
@@ -22,4 +23,5 @@ java_selenium_test_suite = _java_selenium_test_suite
 java_test = _java_test
 java_test_suite = _java_test_suite
 javadoc = _javadoc
+selenium_test = _selenium_test
 spotbugs_config = _spotbugs_config
diff --git a/common/private/selenium_test.bzl → java/private/selenium_test.bzl b/common/private/selenium_test.bzl → java/private/selenium_test.bzl
@@ -1,5 +1,6 @@
 load(
     "//common:browsers.bzl",
+    "COMMON_TAGS",
     "chrome_data",
     "edge_data",
     "firefox_data",
@@ -13,30 +14,24 @@ load(
 
 DEFAULT_BROWSER = "firefox"
 
-_COMMON_TAGS = [
-    "browser-test",
-    "no-sandbox",
-    "requires-network",
-]
-
 BROWSERS = {
     "chrome": {
         "deps": ["//java/client/src/org/openqa/selenium/chrome"],
         "jvm_flags": ["-Dselenium.browser=chrome"] + chrome_jvm_flags,
         "data": chrome_data,
-        "tags": _COMMON_TAGS + ["chrome"],
+        "tags": COMMON_TAGS + ["chrome"],
     },
     "edge": {
         "deps": ["//java/client/src/org/openqa/selenium/edge"],
         "jvm_flags": ["-Dselenium.browser=edge"] + edge_jvm_flags,
         "data": edge_data,
-        "tags": _COMMON_TAGS + ["edge"],
+        "tags": COMMON_TAGS + ["edge"],
     },
     "firefox": {
         "deps": ["//java/client/src/org/openqa/selenium/firefox"],
         "jvm_flags": ["-Dselenium.browser=ff"] + firefox_jvm_flags,
         "data": firefox_data,
-        "tags": _COMMON_TAGS + ["firefox"],
+        "tags": COMMON_TAGS + ["firefox"],
     },
     "ie": {
         "deps": ["//java/client/src/org/openqa/selenium/ie"],
@@ -46,7 +41,7 @@ BROWSERS = {
                          "@selenium//conditions:default": ["-Dselenium.skiptest=true"],
                      }),
         "data": [],
-        "tags": _COMMON_TAGS + ["exclusive", "ie"],
+        "tags": COMMON_TAGS + ["exclusive", "ie"],
     },
     "safari": {
         "deps": ["//java/client/src/org/openqa/selenium/safari"],
@@ -56,12 +51,11 @@ BROWSERS = {
                          "@selenium//conditions:default": ["-Dselenium.skiptest=true"],
                      }),
         "data": [],
-        "tags": _COMMON_TAGS + ["exclusive", "safari"],
+        "tags": COMMON_TAGS + ["exclusive", "safari"],
     },
 }
 
 def selenium_test(name, test_class, size = "medium", browsers = BROWSERS.keys() , **kwargs):
-
     if len(browsers) == 0:
         fail("At least one browser must be specified.")
 

diff --git a/java/private/suite.bzl b/java/private/suite.bzl
@@ -1,4 +1,4 @@
-load("//common/private:selenium_test.bzl", "BROWSERS", "DEFAULT_BROWSER", "selenium_test")
+load(":selenium_test.bzl", "BROWSERS", "DEFAULT_BROWSER", "selenium_test")
 load(":package.bzl", "package_name")
 
 def _test_class_name(src_file):

diff --git a/javascript/private/test_suite.bzl b/javascript/private/test_suite.bzl
@@ -1,5 +1,5 @@
 load("@rules_jvm_external//:defs.bzl", "artifact")
-load("//common:defs.bzl", "selenium_test")
+load("//java:defs.bzl", "selenium_test")
 
 def closure_test_suite(name, data = [], browsers = None):
     data = data + [