Break the build if beforeAllthrows exception

Author: giurim

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

@@ -74,25 +74,29 @@ private void executeSuite(TestDescriptor test, JUnitReporter reporter) {
         List<ScalatestTestDescriptor> tests = children.stream().filter(c -> c instanceof ScalatestTestDescriptor)
                 .map(c -> (ScalatestTestDescriptor) c).collect(Collectors.toList());
 
-        Set<TestDescriptor> nonTests = new HashSet<>(children);
-        nonTests.removeAll(tests);
+        Set<TestDescriptor> subSuites = new HashSet<>(children);
+        subSuites.removeAll(tests);
 
+        subSuites.stream()
+                .sorted(Comparator.comparing(TestDescriptor::getDisplayName))
+                .forEach(c -> executeTest(c, reporter));
+
+        boolean suitExecutedOk = true;
         if (!tests.isEmpty()) {
-            runScalatests((ScalatestSuiteDescriptor) test,
+            suitExecutedOk = runScalatests((ScalatestSuiteDescriptor) test,
                     tests.stream()
                             .sorted(Comparator.comparing(TestDescriptor::getDisplayName))
                             .collect(Collectors.toList()),
                     reporter);
         }
 
-        nonTests.stream()
-                .sorted(Comparator.comparing(TestDescriptor::getDisplayName))
-                .forEach(c -> executeTest(c, reporter));
-
-        reporter.getJunitListener().executionFinished(test, TestExecutionResult.successful());
+        if (suitExecutedOk){
+            // if exception is thrown during suit execution (init, before/after all) we should not report a SUCCESS
+            reporter.getJunitListener().executionFinished(test, TestExecutionResult.successful());
+        }
     }
 
-    private void runScalatests(ScalatestSuiteDescriptor containingSuite, List<ScalatestTestDescriptor> tests, JUnitReporter reporter) {
+    private boolean runScalatests(ScalatestSuiteDescriptor containingSuite, List<ScalatestTestDescriptor> tests, JUnitReporter reporter) {
 
         Suite scalasuite = containingSuite.getScalasuite();
 
@@ -125,6 +129,7 @@ private void runScalatests(ScalatestSuiteDescriptor containingSuite, List<Scalat
         try {
             Status status = scalasuite.run(Option.apply(null), args);
             status.waitUntilCompleted();
+            return true;
         } catch (Throwable e) {
             if (e instanceof InstantiationException || e instanceof IllegalAccessException) {
                 reporter.apply(suiteAborted(args.tracker().nextOrdinal(), e, Resources.cannotInstantiateSuite(e.getMessage()), scalasuite));
@@ -139,6 +144,7 @@ private void runScalatests(ScalatestSuiteDescriptor containingSuite, List<Scalat
                     throw e;
                 }
             }
+            return false;
         }
     }
 

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

@@ -117,4 +117,22 @@ void afterAllFailedTest() {
         verifyTestSuccessReported("[engine:scalatest]/[suite:tests.FailInAfterAllTest]/[test:test 2]", listener);
         verifyTestFailReportedWith("[engine:scalatest]/[suite:tests.FailInAfterAllTest]", listener, null);
     }
+
+    @Test
+    void beforeAllThrowsExceptionTest() {
+        EngineDiscoveryRequest discoveryRequest = createClassDiscoveryRequest("tests.ExceptionBeforeAllTest");
+        TestDescriptor discoveredTests = engine.discover(discoveryRequest, engineId);
+        TestEngineExecutionListener listener = spy(new TestEngineExecutionListener());
+        ExecutionRequest executionRequest = new ExecutionRequest(discoveredTests, listener, null);
+
+        Map<String, Integer> calls = new HashMap<String, Integer>() {{
+            put("beforeAll begin", 1);
+            put("afterEach", 0);
+            put("runs", 0);
+            put("runs again", 0);
+        }};
+
+        verifyTestExecuteCode(calls, () -> engine.execute(executionRequest));
+        verifyTestFailReportedWith("[engine:scalatest]/[suite:tests.ExceptionBeforeAllTest]", listener, null);
+    }
 }

src/test/scala/tests/ExceptionBeforeAllTest.scala

@@ -0,0 +1,28 @@
+package tests
+
+import co.helmethair.scalatest.helper.RegisterCall
+import org.scalatest.BeforeAndAfterAll
+import org.scalatest.funspec.AnyFunSpec
+
+class ExceptionBeforeAllTest extends AnyFunSpec with RegisterCall with BeforeAndAfterAll {
+
+  override def beforeAll(): Unit = {
+    super.beforeAll()
+    register("beforeAll begin")
+    throw new Exception("before all faliled")
+  }
+
+  describe("BeforeAndAfterAll") {
+    it("runs") {
+      register("runs")
+    }
+
+    it("runs again") {
+      register("runs again")
+    }
+  }
+
+  override def afterAll(): Unit = {
+    register("afterAll")
+  }
+}