Fix exceptions during @afterclass not being reported via Instrumentat…

…ionResultPrinter

PiperOrigin-RevId: 637095159

runner/android_junit_runner/CHANGELOG.md

@@ -5,6 +5,7 @@
 `androidx.test:runner:{version}` is released.
 
 **Bug Fixes**
+* Exceptions during `@AfterClass` were not being reported via `InstrumentationResultPrinter`.
 
 **New Features**
 

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

@@ -152,18 +152,18 @@ public void testFinished(Description description) throws Exception {
 
   @Override
   public void testFailure(Failure failure) throws Exception {
-    boolean shouldCallFinish = false;
-    if (!isAnyTestStarted()) {
+    // Exception thrown during @BeforeClass or @AfterClass.
+    boolean shouldCallStartAndFinish = failure.getDescription().getMethodName() == null;
+    if (shouldCallStartAndFinish) {
       // Junit failed during initialization and testStarted was never called. For example, an
       // exception was thrown in @BeforeClass method. We must artificially call testStarted and
       // testFinished in order to print a descriptive result that external tools (like Studio) can
       // understand.
       testStarted(failure.getDescription());
-      shouldCallFinish = true;
     }
     testResultCode = REPORT_VALUE_RESULT_FAILURE;
     reportFailure(failure);
-    if (shouldCallFinish) {
+    if (shouldCallStartAndFinish) {
       testFinished(failure.getDescription());
     }
   }

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

@@ -78,7 +78,7 @@ public void testFinished(Description description) throws Exception {
           }
         };
 
-    Description d = Description.createTestDescription(this.getClass(), "Failure Description");
+    Description d = Description.createSuiteDescription(this.getClass());
     Failure testFailure = new Failure(d, new Exception());
     intrResultPrinter.testFailure(testFailure);