[bazel] Do not generate suites that should never be run

Author: shs96c

java/defs.bzl

@@ -8,8 +8,9 @@ load("//java/private:library.bzl", _java_export = "java_export", _java_library =
 load("//java/private:javadoc.bzl", _javadoc = "javadoc")
 load("//java/private:module.bzl", _java_module = "java_module")
 load("//java/private:spotbugs_config.bzl", _spotbugs_config = "spotbugs_config")
-load("//java/private:suite.bzl", _java_test_suite = "java_test_suite")
-load("//java/private:selenium_suite.bzl", _java_selenium_test_suite = "java_selenium_test_suite")
+load("//java/private:suite.bzl", _java_selenium_test_suite = "java_selenium_test_suite", _java_test_suite = "java_test_suite")
+#load("//java/private:suite.bzl", _java_test_suite = "java_test_suite")
+#load("//java/private:selenium_suite.bzl", _java_selenium_test_suite = "java_selenium_test_suite")
 
 java_binary = _java_binary
 java_dist_zip = _java_dist_zip

java/private/selenium_suite.bzl

@@ -1,3 +1,4 @@
+load("//common/private:selenium_test.bzl", "BROWSERS", "DEFAULT_BROWSER", "selenium_test")
 load(":package.bzl", "package_name")
 
 def _test_class_name(src_file):
@@ -62,23 +63,25 @@ _test_attrs = [
     "use_testrunner",
 ]
 
-def java_test_suite(
+def _suite_name(name, suite_name):
+    if not suite_name:
+        return "".join([p.capitalize() for p in name.replace("-", " ").replace("_", " ").split(" ")])
+    return suite_name
+
+def _generate_common_targets(
         name,
+        size,
+        suite_name,
         srcs,
-        size = None,
-        suite_name = None,
-        test_identifiers = ["Test.java"],
-        deps = [],
-        tags = [],
+        deps,
+        tags,
+        test_identifiers,
         **kwargs):
-    if not suite_name:
-        suite_name = "".join([p.capitalize() for p in name.replace("-", " ").replace("_", " ").split(" ")])
+    suite_name = _suite_name(name, suite_name)
 
     pkg = package_name()
     test_classes = [pkg + src[:-len(".java")].replace("/", ".") for src in srcs if _matches(test_identifiers, src)]
 
-    additional_tags = [] if size == "small" else ["no-sandbox"]
-
     libargs = {}
     for (key, value) in kwargs.items():
         if key not in _test_attrs:
@@ -101,6 +104,32 @@ def java_test_suite(
         test_classes = test_classes,
     )
 
+
+def java_test_suite(
+        name,
+        srcs,
+        size = None,
+        suite_name = None,
+        test_identifiers = ["Test.java"],
+        deps = [],
+        tags = [],
+        **kwargs):
+    suite_name = _suite_name(name, suite_name)
+    pkg = package_name()
+    test_classes = [pkg + src[:-len(".java")].replace("/", ".") for src in srcs if _matches(test_identifiers, src)]
+    additional_tags = [] if size == "small" else ["no-sandbox"]
+
+    _generate_common_targets(
+        name,
+        size,
+        suite_name,
+        srcs,
+        deps,
+        tags,
+        test_identifiers,
+        **kwargs,
+    )
+
     # Skip linting for the generated test suite
     native.java_test(
         name = name,
@@ -112,3 +141,43 @@ def java_test_suite(
         tags = tags + additional_tags,
         **kwargs,
     )
+
+def java_selenium_test_suite(
+        name,
+        browsers = BROWSERS.keys(),
+        srcs = None,
+        test_identifiers = ["Test.java"],
+        deps = None,
+        data = [],
+        jvm_flags = [],
+        tags = [],
+        **kwargs):
+    suite_name = _suite_name(name, None)
+    pkg = package_name()
+    test_classes = [pkg + src[:-len(".java")].replace("/", ".") for src in srcs if _matches(test_identifiers, src)]
+
+    amended_flags = {k: v for (k, v) in kwargs.items() if k != "size"}
+
+    _generate_common_targets(
+        name,
+        "large",
+        suite_name,
+        srcs,
+        deps,
+        tags,
+        test_identifiers,
+        **amended_flags
+    )
+
+    selenium_test(
+        name = name,
+        test_class = pkg + suite_name,
+        browsers = browsers,
+        size = "large",
+        srcs = [":%s-suite-src" % name],
+        deps = deps + ["%s-suite-lib" % name],
+        shard_count = len(srcs),
+        data = data,
+        jvm_flags = jvm_flags,
+        tags = tags
+    )