Merge pull request #7 from bazelbuild/johnynek/automatic_test_discovery

deprecate scala_test suites

Author: johnynek

README.md

@@ -277,6 +277,7 @@ scala_test(name, srcs, suites, deps, data, main_class, resources, scalacopts, jv
 using the `scalatest` library. It may depend on `scala_library`,
 `scala_macro_library` and `java_library` rules.
 
-A `scala_test` requires a `suites` attribute, specifying the fully qualified
-(canonical) names of the test suites to run. In a future version, we might
-investigate lifting this requirement.
+A `scala_test` by default runs all tests in a given target.
+For backwards compatiblity it accepts a `suites` attribute which
+is ignored due to the ease with which that field is not correctly
+populated and tests are not run.

scala/scala.bzl

@@ -145,23 +145,19 @@ cd $0.runfiles
       output=ctx.outputs.executable,
       content=content)
 
-def _args_for_suites(suites):
-  args = ["-o"]
-  for suite in suites:
-    args.extend(["-s", suite])
-  return args
-
 def _write_test_launcher(ctx, jars):
+  if len(ctx.attr.suites) != 0:
+    print("suites attribute is deprecated. All scalatest test suites are run")
+
   content = """#!/bin/bash
 cd $0.runfiles
 {java} -cp {cp} {name} {args} "$@"
 """
   content = content.format(
       java=ctx.file._java.path,
+      cp=":".join([j.short_path for j in jars]),
       name=ctx.attr.main_class,
-      args=' '.join(_args_for_suites(ctx.attr.suites)),
-      deploy_jar=ctx.outputs.jar.path,
-      cp=":".join([j.short_path for j in jars]))
+      args="-R \"{path}\" -oWDF".format(path=ctx.outputs.jar.short_path))
   ctx.file_action(
       output=ctx.outputs.executable,
       content=content)
@@ -319,7 +315,7 @@ scala_test = rule(
   implementation=_scala_test_impl,
   attrs={
       "main_class": attr.string(default="org.scalatest.tools.Runner"),
-      "suites": attr.string_list(non_empty=True, mandatory=True),
+      "suites": attr.string_list(),
       "_scalatest": attr.label(executable=True, default=Label("@scalatest//file"), single_file=True, allow_files=True),
       "_java": attr.label(executable=True, default=Label("@bazel_tools//tools/jdk:java"), single_file=True, allow_files=True),
       } + _implicit_deps + _common_attrs,

test/BUILD

@@ -38,10 +38,6 @@ scala_test(
     name = "HelloLibTest",
     size = "small",  # Not a macro, can pass test-specific attributes.
     srcs = ["HelloLibTest.scala"],
-    suites = [
-        "scala.test.ScalaSuite",
-        "scala.test.JavaSuite",
-    ],
     deps = [
         ":HelloLib",
     ],