[bazel] Generate a test per test file for java

The developer experience of only having a test suite and using filters
was pretty nasty in IJ with a single suite. Rolling back that change
so that we generate a test target per test class.

Author: shs96c

java/client/test/org/openqa/selenium/edge/BUILD.bazel

@@ -33,9 +33,6 @@ java_selenium_test_suite(
     data = [
         "//third_party/chrome_ext:backspace.crx",
     ],
-    tags = [
-        "no-remote",
-    ],
     deps = [
         "//java/client/src/org/openqa/selenium/edge",
         "//java/client/src/org/openqa/selenium/remote",

java/client/test/org/openqa/selenium/firefox/BUILD.bazel

@@ -45,9 +45,6 @@ java_selenium_test_suite(
         "//third_party/firebug:firebug-1.5.0-fx.xpi",
         "//third_party/firebug:mooltipass-1.1.87.xpi",
     ],
-    tags = [
-        "no-remote",
-    ],
     deps = [
         "//java/client/src/org/openqa/selenium/firefox",
         "//java/client/src/org/openqa/selenium/remote",

java/client/test/org/openqa/selenium/ie/BUILD.bazel

@@ -33,9 +33,6 @@ java_selenium_test_suite(
     browsers = [
         "ie",
     ],
-    tags = [
-        "no-remote",
-    ],
     deps = [
         "//java/client/src/org/openqa/selenium/ie",
         "//java/client/src/org/openqa/selenium/remote",

java/client/test/org/openqa/selenium/safari/BUILD.bazel

@@ -8,9 +8,6 @@ java_selenium_test_suite(
     browsers = [
         "safari",
     ],
-    tags = [
-        "no-remote",
-    ],
     deps = [
         "//java/client/src/org/openqa/selenium/remote",
         "//java/client/src/org/openqa/selenium/safari",

java/private/selenium_test.bzl

@@ -76,7 +76,7 @@ def selenium_test(name, test_class, size = "medium", browsers = BROWSERS.keys()
         if not browser in BROWSERS:
             fail("Unrecognized browser: " + browser)
 
-        test = "%s-%s" % (name, browser)
+        test = name if browser == default_browser else "%s-%s" % (name, browser)
 
         native.java_test(
             name = test,
@@ -88,7 +88,7 @@ def selenium_test(name, test_class, size = "medium", browsers = BROWSERS.keys()
             **stripped_args
         )
 
-        if not "no-remote" in tags:
+        if "selenium-remote" in tags:
             native.java_test(
                 name = "%s-remote" % test,
                 test_class = test_class,
@@ -105,4 +105,4 @@ def selenium_test(name, test_class, size = "medium", browsers = BROWSERS.keys()
             )
 
     # Handy way to run everything
-    native.test_suite(name = name, tests = [":%s-%s" % (name, default_browser)], tags = tags + ["manual"])
+    native.test_suite(name = "%s-all-browsers" % name, tests = [":%s-%s" % (name, default_browser)], tags = tags + ["manual"])

java/private/suite.bzl

@@ -1,55 +1,9 @@
+load(":library.bzl", "java_library")
 load(":selenium_test.bzl", "BROWSERS", "DEFAULT_BROWSER", "selenium_test")
 load(":package.bzl", "package_name")
 
-def _test_class_name(src_file):
-    test_name = src_file[:-len(".java")]
-
-    pkg = package_name()
-    if pkg != None:
-        return pkg + "." + test_name.replace("/", ".")
-    return test_name.replace("/", ".")
-
-def _write_suite_impl(ctx):
-    src_file = ctx.actions.declare_file("%s.java" % ctx.attr.suite_name)
-
-    class_names = [t + ".class" for t in ctx.attr.test_classes]
-
-    contents = """
-package %s;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-%s
-})
-public class %s {
-}
-""" % (ctx.attr.package, ",\n".join(class_names), ctx.attr.suite_name)
-    ctx.actions.write(src_file, contents)
-
-    return [
-        DefaultInfo(
-            files = depset([src_file]),
-        ),
-    ]
-
-_write_suite = rule(
-    _write_suite_impl,
-    attrs = {
-        "package": attr.string(),
-        "suite_name": attr.string(),
-        "test_classes": attr.string_list(),
-    },
-)
-
-def _matches(identifiers, name):
-    for identifier in identifiers:
-        if name.startswith(identifier) or name.endswith(identifier):
-            return True
-    return False
-
 _test_attrs = [
+    "browsers",
     "deploy_manifest_lines",
     "flaky",
     "jvm_flags",
@@ -63,45 +17,79 @@ _test_attrs = [
     "use_testrunner",
 ]
 
-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 _test_class_name(pkg, src_file):
+    test_name = src_file[:-len(".java")]
+    return pkg + test_name.replace("/", ".")
+
+def _matches(identifiers, name):
+    for identifier in identifiers:
+        if name.startswith(identifier) or name.endswith(identifier):
+            return True
+    return False
 
-def _generate_common_targets(
+def _generate_test_suite(
         name,
+        create_test_target,
         size,
-        suite_name,
         srcs,
         deps,
         tags,
         test_identifiers,
         **kwargs):
-    suite_name = _suite_name(name, suite_name)
+    lib_srcs = [src for src in srcs if not _matches(test_identifiers, src)]
+    test_srcs = [src for src in srcs if _matches(test_identifiers, src)]
+
+    if len(lib_srcs):
+        libargs = {}
+        for (key, value) in kwargs.items():
+            if key not in _test_attrs:
+                libargs.update({key: value})
+
+        java_library(
+            name = "%s-support" % name,
+            testonly = True,
+            srcs = srcs,
+            deps = deps,
+            **libargs
+        )
+        deps = deps + [":%s-support" % name]
 
+    additional_tags = [] if size == "small" else ["no-sandbox"]
+    suite_targets = []
     pkg = package_name()
-    test_classes = [pkg + src[:-len(".java")].replace("/", ".") for src in srcs if _matches(test_identifiers, src)]
-
-    libargs = {}
-    for (key, value) in kwargs.items():
-        if key not in _test_attrs:
-            libargs.update({key: value})
-
-    # Allow linting of sources we've written
-    native.java_library(
-        name = "%s-suite-lib" % name,
+    for test in test_srcs:
+        test_class = _test_class_name(pkg, test)
+        test_name = test_class.rpartition(".")[2]
+
+        suite_targets.append(":%s" % test_name)
+
+        create_test_target(
+            name = test_name,
+            test_class = test_class,
+            size = size,
+            srcs = [test],
+            deps = deps,
+            tags = tags + additional_tags,
+            **kwargs
+        )
+
+    native.test_suite(
+        name = name,
+        tags = tags + ["manual"],
         testonly = True,
-        srcs = srcs,
-        deps = deps,
-        tags = tags,
-        **libargs
+        tests = suite_targets,
     )
 
-    _write_suite(
-        name = "%s-suite-src" % name,
-        package = pkg[:-1],
-        suite_name = suite_name,
-        test_classes = test_classes,
+def _create_java_test_target(
+        name,
+        test_class,
+        tags = [],
+        **kwargs):
+    native.java_test(
+        name = name,
+        tags = tags,
+        test_class = test_class,
+        **kwargs
     )
 
 def java_test_suite(
@@ -113,69 +101,51 @@ def java_test_suite(
         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,
+    _generate_test_suite(
+        name = name,
+        create_test_target = _create_java_test_target,
+        size = size,
+        srcs = srcs,
+        deps = deps,
+        tags = tags,
+        test_identifiers = test_identifiers,
         **kwargs
     )
 
-    # Skip linting for the generated test suite
-    native.java_test(
+def _create_selenium_test_target(
+        name,
+        test_class,
+        tags = [],
+        **kwargs):
+    selenium_test(
         name = name,
-        test_class = pkg + suite_name,
-        size = size,
-        srcs = [":%s-suite-src" % name],
-        deps = deps + ["%s-suite-lib" % name],
-        shard_count = len(test_classes),
-        tags = tags + additional_tags,
+        test_class = test_class,
+        tags = tags,
         **kwargs
     )
 
 def java_selenium_test_suite(
         name,
         browsers = BROWSERS.keys(),
         srcs = None,
+        size = 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
-    )
+    args = {}
+    args.update(kwargs)
+    args.update({"browsers": browsers})
 
-    selenium_test(
+    _generate_test_suite(
         name = name,
-        test_class = pkg + suite_name,
-        browsers = browsers,
-        size = "large",
-        srcs = [":%s-suite-src" % name],
-        deps = deps + ["%s-suite-lib" % name],
-        data = data,
-        jvm_flags = jvm_flags,
+        create_test_target = _create_selenium_test_target,
+        size = size,
+        srcs = srcs,
+        deps = deps,
         tags = tags,
+        test_identifiers = test_identifiers,
+        **args
     )

java/server/test/org/openqa/selenium/grid/router/BUILD.bazel

@@ -44,9 +44,6 @@ java_selenium_test_suite(
         "--release",
         "11",
     ],
-    tags = [
-        "no-remote",
-    ],
     deps = [
         ":support",
         "//java/client/src/org/openqa/selenium/chrome",