Merge branch 'main' into dependabot/gradle/com.adarshr.test-logger-2.1.1

Author: giurim

src/main/java/co/helmethair/scalatest/reporter/JUnitReporter.java

@@ -7,6 +7,7 @@
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestExecutionResult;
 import org.scalatest.Reporter;
+import org.scalatest.Suite;
 import org.scalatest.events.*;
 
 import java.util.Collections;
@@ -50,8 +51,16 @@ public void apply(Event event) {
                     descriptor,
                     TestExecutionResult.failed(cause));
         } else if (event instanceof RunAborted) {
-            junitListener.executionFinished(rootTestDescriptor,
-                    TestExecutionResult.aborted(getOrElse(((RunAborted) event).throwable(), null)));
+            RunAborted e = (RunAborted) event;
+            Throwable ex = getOrElse(e.throwable(), null);
+            TestDescriptor testDescriptor = rootTestDescriptor;
+            Object payload = e.payload().getOrElse(null);
+            if (payload != null && payload instanceof Suite) {
+                Suite s = (Suite) payload;
+                testDescriptor = getOrCreateDescriptor(s.suiteId(), s.suiteName(), null);
+            }
+            junitListener.executionFinished(testDescriptor,
+                    TestExecutionResult.failed(ex)); // tests reported as "aborted" does not fail the build
         } else if (event instanceof SuiteStarting) {
             SuiteStarting e = (SuiteStarting) event;
             junitListener.executionStarted(

src/main/java/co/helmethair/scalatest/runtime/Executor.java

@@ -9,10 +9,11 @@
 import org.junit.platform.engine.TestDescriptor;
 import org.junit.platform.engine.TestExecutionResult;
 import org.scalatest.*;
-import org.scalatest.events.*;
-import org.scalatest.exceptions.TestCanceledException;
+import org.scalatest.events.Event;
+import org.scalatest.events.Ordinal;
+import org.scalatest.events.RunAborted$;
+import org.scalatest.events.SuiteAborted$;
 import org.scalatest.exceptions.TestFailedException;
-import org.scalatest.tools.SuiteResult$;
 import scala.Option;
 import scala.util.control.NonFatal$;
 
@@ -126,10 +127,10 @@ private void runScalatests(ScalatestSuiteDescriptor containingSuite, List<Scalat
             status.waitUntilCompleted();
         } catch (Throwable e) {
             if (e instanceof InstantiationException || e instanceof IllegalAccessException) {
-                reporter.apply( suiteAborted(args.tracker().nextOrdinal(), e, Resources.cannotInstantiateSuite(e.getMessage()), scalasuite));
-            } else if (e instanceof TestFailedException ) {
-                reporter.apply( suiteAborted(args.tracker().nextOrdinal(),
-                        getOrElse(((TestFailedException) e).cause(),e), Resources.bigProblems(e), scalasuite));
+                reporter.apply(suiteAborted(args.tracker().nextOrdinal(), e, Resources.cannotInstantiateSuite(e.getMessage()), scalasuite));
+            } else if (e instanceof TestFailedException) {
+                reporter.apply(suiteAborted(args.tracker().nextOrdinal(),
+                        getOrElse(((TestFailedException) e).cause(), e), Resources.bigProblems(e), scalasuite));
             } else if (e instanceof NoClassDefFoundError) {
                 reporter.apply(runAborted(args.tracker().nextOrdinal(), e, Resources.cannotLoadClass(e.getMessage()), scalasuite));
             } else {

src/test/java/co/helmethair/scalatest/ClassRunningErrorTest.java

@@ -0,0 +1,28 @@
+package co.helmethair.scalatest;
+
+import co.helmethair.scalatest.helper.TestEngineExecutionListener;
+import co.helmethair.scalatest.helper.TestHelpers;
+import org.junit.jupiter.api.Test;
+import org.junit.platform.engine.EngineDiscoveryRequest;
+import org.junit.platform.engine.ExecutionRequest;
+import org.junit.platform.engine.TestDescriptor;
+import org.junit.platform.engine.TestExecutionResult;
+
+import static org.mockito.Mockito.spy;
+
+public class ClassRunningErrorTest implements TestHelpers {
+    @Test
+    void failedToInitializeClass() {
+        EngineDiscoveryRequest discoveryRequest = createClassDiscoveryRequest("tests.NoClassDefFoundErrorTest");
+        TestDescriptor discoveredTests = engine.discover(discoveryRequest, engineId);
+        TestEngineExecutionListener listener = spy(new TestEngineExecutionListener());
+        ExecutionRequest executionRequest = new ExecutionRequest(discoveredTests, listener, null);
+
+        engine.execute(executionRequest);
+
+        String testId = "[engine:scalatest]/[suite:tests.NoClassDefFoundErrorTest]";
+
+        verifyTestStartReported(testId, listener);
+        verifyTestStatusReported(testId, listener, TestExecutionResult.Status.FAILED);
+    }
+}

src/test/java/co/helmethair/scalatest/helper/TestHelpers.java

@@ -143,11 +143,19 @@ default void verifyTestFailReported(String testIdsuffix, TestEngineExecutionList
     }
 
     default void verifyTestFailReportedWith(String testIdsuffix, TestEngineExecutionListener listener, Class<? extends Throwable> cause) {
+        verifyTestStatusReportedWith(testIdsuffix, listener, cause, TestExecutionResult.Status.FAILED);
+    }
+
+    default void verifyTestStatusReported(String testIdsuffix, TestEngineExecutionListener listener, TestExecutionResult.Status status) {
+        verifyTestStatusReportedWith(testIdsuffix, listener, null, status);
+    }
+
+    default void verifyTestStatusReportedWith(String testIdsuffix, TestEngineExecutionListener listener, Class<? extends Throwable> cause, TestExecutionResult.Status status) {
         verify(listener, atLeastOnce()).executionFinished(
                 argThat(a -> a.getUniqueId().toString().endsWith(testIdsuffix)),
                 argThat(a -> a.getThrowable().isPresent()
                         && (cause == null || cause.isInstance(a.getThrowable().get()))
-                        && a.getStatus() == TestExecutionResult.Status.FAILED
+                        && a.getStatus() == status
                 )
         );
     }

src/test/scala/tests/NoClassDefFoundErrorTest.scala

@@ -0,0 +1,14 @@
+package tests
+
+import co.helmethair.scalatest.helper.RegisterCall
+import org.scalatest.funspec.AnyFunSpec
+
+class NoClassDefFoundErrorTest extends AnyFunSpec with RegisterCall {
+  describe("InitErrorTest") {
+    it("never runs") {
+      //throw an error what Scalatest handles as an abort instead failure
+      throw new NoClassDefFoundError("ThisFails")
+      register()
+    }
+  }
+}