Put -s in front of other parameters for the ScalaTest runner. (bazelbuild#1412)

* Put -s in front of other parameters for the ScalaTest runner.

ScalaTest cares about the ordering between -s (class selection) and
-t (test name selection). "-s -t" will select the test in the specified class
with the specified name. "-t -s" will select all tests in the specified
class, and all tests with the specified name.

Putting the -s we derive from --test_filter at the front of the argument
list rather than at the back is more likely to do what people want when
they specify both --test_filter and other selector flags.

It is still possible to specify -s last by passing the arguments as
--test_arg=-t --test_arg=testName --test_arg=-s --test_arg=className
and leaving --test_filter out.

* Add tests

* Don't run the test target automatically

* formatting

* comments

* Remove wrong import added by intellij

* add to test_rules_scala

Author: srdo-humio

src/java/io/bazel/rulesscala/scala_test/Runner.java

@@ -35,7 +35,7 @@ public static void main(String[] args) throws IOException {
 
   private static String[] extendArgs(String[] args, Map<String, String> env) throws IOException {
     args = extendFromFileArgs(args);
-    args = extendFromEnvVar(args, env, TESTBRIDGE_TEST_ONLY, "-s");
+    args = prependFromEnvVar(args, env, TESTBRIDGE_TEST_ONLY, "-s");
     return args;
   }
 
@@ -65,16 +65,16 @@ private static String[] extendFromFileArgs(String[] args) throws IOException {
     return result;
   }
 
-  private static String[] extendFromEnvVar(
+  private static String[] prependFromEnvVar(
       String[] args, Map<String, String> env, String varName, String flagName) {
     String value = env.get(varName);
     if (value == null) {
       return args;
     }
     String[] flag = new String[] {flagName, value};
     String[] result = new String[args.length + flag.length];
-    System.arraycopy(args, 0, result, 0, args.length);
-    System.arraycopy(flag, 0, result, args.length, flag.length);
+    System.arraycopy(flag, 0, result, 0, flag.length);
+    System.arraycopy(args, 0, result, flag.length, args.length);
 
     return result;
   }

test/shell/test_scala_test_testfilter.sh

@@ -0,0 +1,16 @@
+# shellcheck source=./test_runner.sh
+dir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+. "${dir}"/test_runner.sh
+. "${dir}"/test_helper.sh
+runner=$(get_test_runner "${1:-local}")
+
+test_scala_test_testfilter_class_selection() {
+  bazel test --test_output=errors --test_filter=A //test_expect_failure/scala_test_testfilter:tests
+}
+
+test_scala_test_testfilter_method_selection() {
+  bazel test --test_output=errors --test_filter=A --test_arg=-t --test_arg="test 1" //test_expect_failure/scala_test_testfilter:tests
+}
+
+$runner test_scala_test_testfilter_class_selection
+$runner test_scala_test_testfilter_method_selection

test_expect_failure/scala_test_testfilter/A.scala

@@ -0,0 +1,9 @@
+import org.scalatest.funsuite.AnyFunSuite
+
+class A extends AnyFunSuite {
+
+  test("test 1") {
+
+  }
+
+}

test_expect_failure/scala_test_testfilter/B.scala

@@ -0,0 +1,9 @@
+import org.scalatest.funsuite.AnyFunSuite
+
+class B extends AnyFunSuite {
+
+  test("test 1") {
+    fail("This test should not be selected")
+  }
+
+}

test_expect_failure/scala_test_testfilter/BUILD

@@ -0,0 +1,9 @@
+load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
+
+scala_test(
+    name = "tests",
+    srcs = [
+        "A.scala",
+        "B.scala",
+    ],
+)

test_rules_scala.sh

@@ -48,6 +48,7 @@ $runner bazel build //test_statsfile:SimpleNoStatsFile_statsfile --extra_toolcha
 . "${test_dir}"/test_scala_proto_library.sh
 . "${test_dir}"/test_scala_library.sh
 . "${test_dir}"/test_scala_specs2.sh
+. "${test_dir}"/test_scala_test_testfilter.sh
 . "${test_dir}"/test_toolchain.sh
 . "${test_dir}"/test_strict_dependency.sh
 . "${test_dir}"/test_unused_dependency.sh