Add coverage support for specs2 with junit runner (#1250)

* Add coverage support for specs2 with junit runner

* Fix bazel file formatting

* Rename test/shell/test_coverage_scalatest_junit.sh -> test/shell/test_coverage_scalatest.sh

* rename test/coverage package to test/coverage_scalatest

* rename test/coverage_specs2 -> test/coverage_specs2_with_junit

Author: jauniusb

scala/private/phases/phase_write_executable.bzl

@@ -38,8 +38,10 @@ def phase_write_executable_repl(ctx, p):
 
 def phase_write_executable_junit_test(ctx, p):
     args = struct(
+        rjars = p.coverage_runfiles.rjars,
         jvm_flags = p.jvm_flags + ctx.attr.jvm_flags,
         main_class = "com.google.testing.junit.runner.BazelTestRunner",
+        use_jacoco = ctx.configuration.coverage_enabled,
     )
     return _phase_write_executable_default(ctx, p, args)
 

scala/private/rules/scala_junit_test.bzl

@@ -14,6 +14,7 @@ load(
     "phase_collect_jars_junit_test",
     "phase_compile_junit_test",
     "phase_coverage_common",
+    "phase_coverage_runfiles",
     "phase_declare_executable",
     "phase_default_info",
     "phase_dependency_common",
@@ -47,6 +48,7 @@ def _scala_junit_test_impl(ctx):
             ("coverage", phase_coverage_common),
             ("merge_jars", phase_merge_jars),
             ("runfiles", phase_runfiles_common),
+            ("coverage_runfiles", phase_coverage_runfiles),
             ("jvm_flags", phase_jvm_flags),
             ("write_executable", phase_write_executable_junit_test),
             ("default_info", phase_default_info),
@@ -78,6 +80,11 @@ _scala_junit_test_attrs = {
         ),
         allow_files = True,
     ),
+    "_lcov_merger": attr.label(
+        default = Label(
+            "@bazel_tools//tools/test/CoverageOutputGenerator/java/com/google/devtools/coverageoutputgenerator:Main",
+        ),
+    ),
 }
 
 _junit_resolve_deps = {

test/coverage/expected-coverage.dat

@@ -1,4 +1,4 @@
-package coverage;
+package coverage_scalatest
 
 object A1 {
   def a1(flag: Boolean): B1.type =

test/coverage/A1.scala renamed to test/coverage_scalatest/A1.scala

@@ -1,4 +1,4 @@
-package coverage;
+package coverage_scalatest
 
 object A2 {
   def a2(): Unit = {

test/coverage/A2.scala renamed to test/coverage_scalatest/A2.scala

@@ -1,4 +1,4 @@
-package coverage;
+package coverage_scalatest
 
 object B1 {
 

test/coverage/B1.scala renamed to test/coverage_scalatest/B1.scala

@@ -1,5 +1,5 @@
-package coverage;
-
+package coverage_scalatest;
+import coverage_scalatest.C2;
 class B2 {
     public static String b2_a() {
         return C2.c2("hello from b2_a");

test/coverage/B2.java renamed to test/coverage_scalatest/B2.java

@@ -2,9 +2,9 @@ load("@rules_java//java:defs.bzl", "java_library", "java_test")
 load("//scala:scala.bzl", "scala_library", "scala_test")
 
 scala_test(
-    name = "test-all",
+    name = "test-scalatest",
     srcs = [
-        "TestAll.scala",
+        "TestWithScalaTest.scala",
     ],
     deps = [
         ":a1",

test/coverage/BUILD renamed to test/coverage_scalatest/BUILD

@@ -1,4 +1,4 @@
-package coverage;
+package coverage_scalatest
 
 object C2 {
   def c2(input: String): String =

test/coverage/C2.scala renamed to test/coverage_scalatest/C2.scala

@@ -1,4 +1,4 @@
-package coverage
+package coverage_scalatest
 
 object D1 {
   def veryLongFunctionNameIsHereAaaaaaaaa(): Unit = {