Use main_class as specified in java_test even if use_testrunner is true.

--
MOS_MIGRATED_REVID=138180229

4 files changed, 74 insertions, 12 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaRuleClasses.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaRuleClasses.java
index 2dd4172ab2..857e83a362 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaRuleClasses.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaRuleClasses.java
@@ -299,12 +299,14 @@ public class BazelJavaRuleClasses {
           <!-- #END_BLAZE_RULE.ATTRIBUTE --> */
           .add(attr("jvm_flags", STRING_LIST))
           /* <!-- #BLAZE_RULE($base_java_binary).ATTRIBUTE(use_testrunner) -->
-          Use the
-          <code>com.google.testing.junit.runner.BazelTestRunner</code> class as the
-          main entry point for a Java program.
+          Use the test runner (by default
+          <code>com.google.testing.junit.runner.BazelTestRunner</code>) class as the
+          main entry point for a Java program, and provide the test class
+          to the test runner as a value of <code>bazel.test_suite</code>
+          system property.
 
           You can use this to override the default
-          behavior, which is to use <code>BazelTestRunner</code> for
+          behavior, which is to use test runner for
           <code>java_test</code> rules,
           and not use it for <code>java_binary</code> rules.  It is unlikely
           you will want to do this.  One use is for <code>AllTest</code>
@@ -312,6 +314,8 @@ public class BazelJavaRuleClasses {
           before running the tests, for example).  The <code>AllTest</code>
           rule must be declared as a <code>java_binary</code>, but should
           still use the test runner as its main entry point.
+
+          The name of a test runner class can be overriden with <code>main_class</code> attribute.
           <!-- #END_BLAZE_RULE.ATTRIBUTE --> */
           .add(attr("use_testrunner", BOOLEAN).value(false))
           /* <!-- #BLAZE_RULE($base_java_binary).ATTRIBUTE(main_class) -->
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java
index 9fe7b81d71..0d7217f1a0 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaSemantics.java
@@ -95,16 +95,27 @@ public class BazelJavaSemantics implements JavaSemantics {
   public void checkForProtoLibraryAndJavaProtoLibraryOnSameProto(
       RuleContext ruleContext, JavaCommon javaCommon) {}
 
+  private static final String JUNIT4_RUNNER = "org.junit.runner.JUnitCore";
+
   private String getMainClassInternal(RuleContext ruleContext, ImmutableList<Artifact> sources) {
     if (!ruleContext.attributes().get("create_executable", Type.BOOLEAN)) {
       return null;
     }
-    if (ruleContext.attributes().get("use_testrunner", Type.BOOLEAN)
-        && !useLegacyJavaTest(ruleContext)) {
-      return "com.google.testing.junit.runner.BazelTestRunner";
-    }
     String mainClass = ruleContext.attributes().get("main_class", Type.STRING);
+
+    // Legacy behavior for java_test rules: main_class defaulted to JUnit4 runner.
+    // TODO(dmarting): remove once we drop the legacy bazel java_test behavior.
+    if (mainClass.isEmpty()
+        && useLegacyJavaTest(ruleContext)
+        && "java_test".equals(ruleContext.getRule().getRuleClass())) {
+      mainClass = JUNIT4_RUNNER;
+    }
+
     if (mainClass.isEmpty()) {
+      if (ruleContext.attributes().get("use_testrunner", Type.BOOLEAN)
+          && !useLegacyJavaTest(ruleContext)) {
+        return "com.google.testing.junit.runner.BazelTestRunner";
+      }
       mainClass = JavaCommon.determinePrimaryClass(ruleContext, sources);
     }
     return mainClass;
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaTestRule.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaTestRule.java
index 0de34ae90c..fb990f448f 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaTestRule.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/BazelJavaTestRule.java
@@ -39,8 +39,6 @@ import com.google.devtools.build.lib.rules.java.Jvm;
  */
 public final class BazelJavaTestRule implements RuleDefinition {
 
-  private static final String JUNIT4_RUNNER = "org.junit.runner.JUnitCore";
-
   @Override
   public RuleClass build(Builder builder, RuleDefinitionEnvironment env) {
     /* <!-- #BLAZE_RULE(java_test).IMPLICIT_OUTPUTS -->
@@ -60,8 +58,6 @@ public final class BazelJavaTestRule implements RuleDefinition {
         .override(attr("stamp", TRISTATE).value(TriState.NO))
         .override(attr("use_testrunner", BOOLEAN).value(true))
         .override(attr(":java_launcher", LABEL).value(JavaSemantics.JAVA_LAUNCHER))
-        // TODO(dmarting): remove once we drop the legacy bazel java_test behavior.
-        .override(attr("main_class", STRING).value(JUNIT4_RUNNER))
         /* <!-- #BLAZE_RULE(java_test).ATTRIBUTE(test_class) -->
         The Java class to be loaded by the test runner.<br/>
         <p>
diff --git a/src/test/shell/bazel/bazel_java_test.sh b/src/test/shell/bazel/bazel_java_test.sh
index d2d1346a16..99611c94ee 100755
--- a/src/test/shell/bazel/bazel_java_test.sh
+++ b/src/test/shell/bazel/bazel_java_test.sh
@@ -108,4 +108,55 @@ EOF
   expect_not_log "error: \[ArrayEquals\] Reference equality used to compare arrays"
 }
 
+function test_java_test_main_class() {
+  mkdir -p java/testrunners || fail "mkdir failed"
+  cat > java/testrunners/TestRunner.java <<EOF
+package testrunners;
+
+import com.google.testing.junit.runner.BazelTestRunner;
+
+public class TestRunner {
+  public static void main(String[] argv) {
+    System.out.println("Custom test runner was run");
+    BazelTestRunner.main(argv);
+  }
+}
+EOF
+
+  cat > java/testrunners/Tests.java <<EOF
+package testrunners;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.junit.Test;
+
+@RunWith(JUnit4.class)
+public class Tests {
+
+  @Test
+  public void testTest() {
+    System.out.println("testTest was run");
+  }
+}
+EOF
+
+  cat > java/testrunners/BUILD <<EOF
+java_library(name = "test_runner",
+             srcs = ['TestRunner.java'],
+             deps = ['@bazel_tools//tools/jdk:TestRunner_deploy.jar'],
+)
+
+java_test(name = "Tests",
+          srcs = ['Tests.java'],
+          deps = ['@bazel_tools//tools/jdk:TestRunner_deploy.jar'],
+          main_class = "testrunners.TestRunner",
+          runtime_deps = [':test_runner']
+)
+EOF
+  bazel test --test_output=streamed //java/testrunners:Tests &> "$TEST_log"
+  expect_log "Custom test runner was run"
+  expect_log "testTest was run"
+}
+
+
 run_suite "Java integration tests"