Add a global failure when a test is interrupted/cancelled.

When a timeout occurred, the current test case is interrupted and the others are cancelled. This was not reflected in any way and all tests were reported as success, even if there was a timeout and the tests were cancelled/interrupted.

Also add a status xml attribute to mark if the test was completed, cancelled or interrupted.

Fixes #3763

RELNOTES: None.
PiperOrigin-RevId: 169665622

Author: iirina

src/java_tools/junitrunner/java/com/google/testing/junit/runner/model/AntXmlResultWriter.java

@@ -49,6 +49,7 @@ public final class AntXmlResultWriter implements XmlResultWriter {
   private static final String JUNIT_ATTR_PROPERTY_VALUE = "value";
   private static final String JUNIT_ELEMENT_TESTCASE = "testcase";
   private static final String JUNIT_ELEMENT_FAILURE = "failure";
+  private static final String JUNIT_ELEMENT_STATUS = "status";
   private static final String JUNIT_ATTR_FAILURE_MESSAGE = "message";
   private static final String JUNIT_ATTR_FAILURE_TYPE = "type";
   private static final String JUNIT_ATTR_TESTCASE_NAME = "name";
@@ -162,6 +163,7 @@ private void writeTestCase(XmlWriter writer, TestResult result,
     writer.writeAttribute(JUNIT_ATTR_TESTCASE_CLASSNAME, result.getClassName());
     writer.writeAttribute(JUNIT_ATTR_TESTCASE_TIME, getFormattedRunTime(
             result.getRunTimeInterval()));
+    writer.writeAttribute(JUNIT_ELEMENT_STATUS, result.getStatus().toString());
 
     for (Throwable failure : parentFailures) {
       writeThrowableToXmlWriter(writer, failure);

src/java_tools/junitrunner/java/com/google/testing/junit/runner/model/TestCaseNode.java

@@ -81,9 +81,12 @@ public void started(long now) {
   @Override
   public void testInterrupted(long now) {
     if (compareAndSetState(State.STARTED, State.INTERRUPTED, now)) {
+      globalFailures.add(new Exception("Test interrupted"));
       return;
     }
-    compareAndSetState(INITIAL_STATES, State.CANCELLED, now);
+    if (compareAndSetState(INITIAL_STATES, State.CANCELLED, now)) {
+      globalFailures.add(new Exception("Test cancelled"));
+    }
   }
 
   @Override

src/java_tools/junitrunner/javatests/com/google/testing/junit/runner/testbed/XmlOutputExercises.ant.xml

@@ -7,7 +7,7 @@
     </testsuite>
     <testsuite name='com.google.testing.junit.runner.testbed.XmlOutputExercises$FailureTest' timestamp='' hostname='localhost' tests='1' failures='1' errors='0' time='' package='' id='1'>
       <properties />
-      <testcase name='testFail' classname='com.google.testing.junit.runner.testbed.XmlOutputExercises$FailureTest' time=''>
+      <testcase name='testFail' classname='com.google.testing.junit.runner.testbed.XmlOutputExercises$FailureTest' time='' status='COMPLETED'>
         <failure message='This is an expected error. The test is supposed to fail.' type='java.lang.AssertionError'>java.lang.AssertionError: This is an expected error. The test is supposed to fail.
 
         </failure>
@@ -17,22 +17,22 @@
     </testsuite>
     <testsuite name='com.google.testing.junit.runner.testbed.XmlOutputExercises$OtherTests' timestamp='' hostname='localhost' tests='1' failures='0' errors='0' time='' package='' id='2'>
         <properties />
-        <testcase name='testToString' classname='com.google.testing.junit.runner.testbed.XmlOutputExercises$OtherTests' time='' />
+        <testcase name='testToString' classname='com.google.testing.junit.runner.testbed.XmlOutputExercises$OtherTests' time='' status='COMPLETED' />
         <system-out />
         <system-err />
     </testsuite>
     <testsuite name='com.google.testing.junit.runner.testbed.XmlOutputExercises$EqualsHashCodeTest' timestamp='' hostname='localhost' tests='2' failures='0' errors='0' time='' package='' id='3'>
         <properties />
-        <testcase name='testHashCode' classname='com.google.testing.junit.runner.testbed.XmlOutputExercises$EqualsHashCodeTest' time='' />
-        <testcase name='testEquals' classname='com.google.testing.junit.runner.testbed.XmlOutputExercises$EqualsHashCodeTest' time='' />
+        <testcase name='testHashCode' classname='com.google.testing.junit.runner.testbed.XmlOutputExercises$EqualsHashCodeTest' time='' status='COMPLETED' />
+        <testcase name='testEquals' classname='com.google.testing.junit.runner.testbed.XmlOutputExercises$EqualsHashCodeTest' time='' status='COMPLETED' />
         <system-out />
         <system-err />
     </testsuite>
     <testsuite name='com.google.testing.junit.runner.testbed.XmlOutputExercises$ComparabilityTest' timestamp='' hostname='localhost' tests='3' failures='0' errors='0' time='' package='' id='4'>
         <properties />
-        <testcase name='compareToEqualInstance' classname='com.google.testing.junit.runner.testbed.XmlOutputExercises$ComparabilityTest' time='' />
-        <testcase name='compareToGreaterInstance' classname='com.google.testing.junit.runner.testbed.XmlOutputExercises$ComparabilityTest' time='' />
-        <testcase name='compareToLessInstance' classname='com.google.testing.junit.runner.testbed.XmlOutputExercises$ComparabilityTest' time='' />
+        <testcase name='compareToEqualInstance' classname='com.google.testing.junit.runner.testbed.XmlOutputExercises$ComparabilityTest' time='' status='COMPLETED' />
+        <testcase name='compareToGreaterInstance' classname='com.google.testing.junit.runner.testbed.XmlOutputExercises$ComparabilityTest' time='' status='COMPLETED' />
+        <testcase name='compareToLessInstance' classname='com.google.testing.junit.runner.testbed.XmlOutputExercises$ComparabilityTest' time='' status='COMPLETED' />
         <system-out />
         <system-err />
     </testsuite>

src/test/shell/bazel/bazel_java_test.sh

@@ -1384,5 +1384,51 @@ EOF
   expect_log "In java_common.create_provider the value of use_ijar is True. Make sure the java_toolchain argument is a valid java_toolchain Target."
 }
 
+function test_java_test_timeout() {
+  setup_javatest_support
+  mkdir -p javatests/com/google/timeout
+  touch javatests/com/google/timeout/{BUILD,TimeoutTests.java}
+
+  cat > javatests/com/google/timeout/TimeoutTests.java << EOF
+package com.google.timeout;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.junit.Test;
+
+@RunWith(JUnit4.class)
+public class TimeoutTests {
+
+  @Test
+  public void testPasses() throws InterruptedException { }
+
+  @Test
+  public void testTimesOut() throws InterruptedException {
+    // sleep more than 1 min
+    Thread.sleep(Long.MAX_VALUE);
+  }
+}
+EOF
+
+  cat > javatests/com/google/timeout/BUILD <<EOF
+java_test(
+  name = "TimeoutTests",
+  srcs = ["TimeoutTests.java"],
+  deps = ['//third_party:junit4'],
+  timeout = "short", # 1 min
+)
+EOF
+
+  bazel test javatests/com/google/timeout:TimeoutTests --test_timeout=5  >& "$TEST_log" && fail "Unexpected success"
+  xml_log=bazel-testlogs/javatests/com/google/timeout/TimeoutTests/test.xml
+  [[ -s $xml_log ]] || fail "$xml_log was not present after test"
+  cat "$xml_log" > "$TEST_log"
+  expect_log "failures='2'"
+  expect_log "status='INTERRUPTED"
+  expect_log "status='CANCELLED'"
+  expect_log "<failure message='Test cancelled' type='java.lang.Exception'>java.lang.Exception: Test cancelled"
+  expect_log "<failure message='Test interrupted' type='java.lang.Exception'>java.lang.Exception: Test interrupted"
+}
+
 run_suite "Java integration tests"