Fix instrumentation output on assumption failures at class level.

Currently if a ClassRule or a BeforeClass method throws an assumptionFailure,
InstrumentationResultPrinter does not emit testStarted and testFinished events.

This change modifies the assumption failure logic so they get treated in the
same way as test failures - emitting testStarted and testFinished events
on class-level assumption failures.

PiperOrigin-RevId: 666398526

Author: brettchabot

runner/android_junit_runner/CHANGELOG.md

@@ -8,6 +8,7 @@
 
 * Exceptions during `@AfterClass` were not being reported via `InstrumentationResultPrinter`.
 * Exceptions arising in AndroidJUnitRunner.buildRequest are now handled.
+* Assumption failures during a ClassRule or BeforeClass are now reported more consistently via `InstrumentationResultPrinter`
 
 **New Features**
 

runner/android_junit_runner/java/androidx/test/internal/runner/listener/InstrumentationResultPrinter.java

@@ -113,14 +113,14 @@ public InstrumentationResultPrinter() {
   }
 
   @Override
-  public void testRunStarted(Description description) throws Exception {
+  public void testRunStarted(Description description) {
     resultTemplate.putString(Instrumentation.REPORT_KEY_IDENTIFIER, REPORT_VALUE_ID);
     resultTemplate.putInt(REPORT_KEY_NUM_TOTAL, description.testCount());
   }
 
   /** send a status for the start of a each test, so long tests can be seen as "running" */
   @Override
-  public void testStarted(Description description) throws Exception {
+  public void testStarted(Description description) {
     testNum.incrementAndGet();
     this.description = description; // cache Description in case of a crash
     String testClass = description.getClassName();
@@ -143,33 +143,45 @@ public void testStarted(Description description) throws Exception {
   }
 
   @Override
-  public void testFinished(Description description) throws Exception {
+  public void testFinished(Description description) {
     if (testResultCode == REPORT_VALUE_RESULT_OK) {
       testResult.putString(Instrumentation.REPORT_KEY_STREAMRESULT, ".");
     }
     sendStatus(testResultCode, testResult);
   }
 
   @Override
-  public void testFailure(Failure failure) throws Exception {
+  public void testFailure(Failure failure) {
+    handleFailure(
+        failure,
+        () -> {
+          testResultCode = REPORT_VALUE_RESULT_FAILURE;
+          reportFailure(failure);
+        });
+  }
+
+  private void handleFailure(Failure failure, Runnable action) {
     // getMethodName() == null when an exception is thrown during @BeforeClass or @AfterClass.
     // No matching testStart() / testFinish() is emitted, so simulate them here for the sake of
     // instrumentation consumers.
     boolean shouldCallFinish = failure.getDescription().getMethodName() == null;
     if (shouldCallFinish) {
       testStarted(failure.getDescription());
     }
-    testResultCode = REPORT_VALUE_RESULT_FAILURE;
-    reportFailure(failure);
+    action.run();
     if (shouldCallFinish) {
       testFinished(failure.getDescription());
     }
   }
 
   @Override
   public void testAssumptionFailure(Failure failure) {
-    testResultCode = REPORT_VALUE_RESULT_ASSUMPTION_FAILURE;
-    testResult.putString(REPORT_KEY_STACK, failure.getTrace());
+    handleFailure(
+        failure,
+        () -> {
+          testResultCode = REPORT_VALUE_RESULT_ASSUMPTION_FAILURE;
+          testResult.putString(REPORT_KEY_STACK, StackTrimmer.getTrimmedStackTrace(failure));
+        });
   }
 
   private void reportFailure(Failure failure) {
@@ -182,7 +194,7 @@ private void reportFailure(Failure failure) {
   }
 
   @Override
-  public void testIgnored(Description description) throws Exception {
+  public void testIgnored(Description description) {
     testStarted(description);
     testResultCode = REPORT_VALUE_RESULT_IGNORED;
     testFinished(description);

runner/android_junit_runner/javatests/androidx/test/internal/runner/listener/BUILD

@@ -45,6 +45,7 @@ axt_android_library_test(
         "//runner/android_junit_runner",
         "//runner/android_junit_runner/javatests/androidx/test/testing/fixtures",
         "@androidsdk//:legacy_test-34",
+        "@maven//:com_google_truth_truth",
         "@maven//:junit_junit",
     ],
 )

runner/android_junit_runner/javatests/androidx/test/internal/runner/listener/InstrumentationResultPrinterTest.java

@@ -17,8 +17,10 @@
 package androidx.test.internal.runner.listener;
 
 import static androidx.test.internal.runner.listener.InstrumentationResultPrinter.REPORT_KEY_STACK;
+import static com.google.common.truth.Truth.assertThat;
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
 
 import android.os.Bundle;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -114,4 +116,29 @@ public void verifyBeforeClassExceptionsReported() throws Exception {
             "code=-2, name=" + className + "#null"),
         intrResultPrinter.resultsLog);
   }
+
+  public static class AssumptionFailureInClassTest {
+    @BeforeClass
+    public static void setUpClass() {
+      assumeTrue(false);
+    }
+
+    @Test
+    public void emptyTest() {}
+  }
+
+  @Test
+  public void verifyBeforeClassAssumptionsReported() throws Exception {
+    JUnitCore core = new JUnitCore();
+    var intrResultPrinter = new TestInstrumentationResultPrinter();
+    core.addListener(intrResultPrinter);
+    Request testRequest = Request.classes(new Computer(), AssumptionFailureInClassTest.class);
+    core.run(testRequest);
+
+    String className = AssumptionFailureInClassTest.class.getName();
+    assertThat(intrResultPrinter.resultsLog)
+        .containsExactly(
+            "code=1, name=" + className + "#null", "code=-4, name=" + className + "#null")
+        .inOrder();
+  }
 }