fix(Issue-1865): Some aborted tests report as success

relates to Issue-1625

Signed-off-by: l-1squared <[email protected]>

Author: l-1squared

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Release v2.0.2
 ## Fixed issues
 * The java 17 example projects now comes with a basic logger. [#374](https://github.com/TNG/JGiven/issues/374) (thanks to rolfschumacher for reporting)
+* Fixed an issue where tests that aborted in the main method were reported as
+  success. [#1865](https://github.com/TNG/JGiven/issues/1865) (thanks to abika for reporting)
 
 # Release v2.0.1
 ## Fixed issues

jgiven-junit5/src/main/java/com/tngtech/jgiven/junit5/JGivenExtension.java

@@ -9,17 +9,13 @@
 import com.tngtech.jgiven.impl.util.ThrowableUtil;
 import com.tngtech.jgiven.report.impl.CommonReportHelper;
 import com.tngtech.jgiven.report.model.ReportModel;
-import java.util.EnumSet;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.TestInstance;
-import org.junit.jupiter.api.extension.AfterAllCallback;
-import org.junit.jupiter.api.extension.AfterTestExecutionCallback;
-import org.junit.jupiter.api.extension.BeforeAllCallback;
-import org.junit.jupiter.api.extension.BeforeEachCallback;
-import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.*;
 import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
-import org.junit.jupiter.api.extension.TestInstancePostProcessor;
+
+import java.util.EnumSet;
 
 import static com.tngtech.jgiven.report.model.ExecutionStatus.*;
 
@@ -87,6 +83,8 @@ public void afterTestExecution(ExtensionContext context) throws Exception {
         try {
             if (context.getExecutionException().isPresent() && !ThrowableUtil.isAssumptionException(context.getExecutionException().get())) {
                 scenario.getExecutor().failed(context.getExecutionException().get());
+            } else if (context.getExecutionException().isPresent() && ThrowableUtil.isAssumptionException(context.getExecutionException().get())) {
+                scenario.getExecutor().aborted(context.getExecutionException().get());
             }
             scenario.finished();
 

jgiven-testng/src/main/java/com/tngtech/jgiven/testng/ScenarioTestListener.java

@@ -1,7 +1,5 @@
 package com.tngtech.jgiven.testng;
 
-import static java.util.Arrays.asList;
-
 import com.tngtech.jgiven.base.ScenarioTestBase;
 import com.tngtech.jgiven.exception.FailIfPassedException;
 import com.tngtech.jgiven.impl.ScenarioBase;
@@ -11,13 +9,16 @@
 import com.tngtech.jgiven.report.impl.CommonReportHelper;
 import com.tngtech.jgiven.report.model.NamedArgument;
 import com.tngtech.jgiven.report.model.ReportModel;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
 import org.testng.ITestContext;
 import org.testng.ITestListener;
 import org.testng.ITestResult;
 
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+
+import static java.util.Arrays.asList;
+
 /**
  * TestNG Test listener to enable JGiven for a test class.
  */
@@ -102,6 +103,11 @@ public void onTestFailure(ITestResult paramITestResult) {
 
     @Override
     public void onTestSkipped(ITestResult testResult) {
+        ScenarioBase scenario = getScenario(testResult);
+        if (scenario != null) {
+            scenario.getExecutor().aborted(testResult.getThrowable());
+            testFinished(testResult);
+        }
         testFinished(testResult);
     }
 

jgiven-tests/src/test/java/com/tngtech/jgiven/testframework/ThenTestFramework.java

@@ -1,17 +1,17 @@
 package com.tngtech.jgiven.testframework;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
 import com.tngtech.jgiven.annotation.ExpectedScenarioState;
 import com.tngtech.jgiven.impl.util.ReflectionUtil;
 import com.tngtech.jgiven.report.model.ExecutionStatus;
 import com.tngtech.jgiven.report.model.ScenarioModel;
 import com.tngtech.jgiven.report.model.ThenReportModel;
 import com.tngtech.jgiven.tests.TestScenarioRepository.TestScenario;
 
+import java.lang.reflect.Method;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
 public class ThenTestFramework<SELF extends ThenTestFramework<?>> extends ThenReportModel<SELF> {
     @ExpectedScenarioState
     protected TestScenario testScenario;
@@ -25,6 +25,8 @@ public SELF the_test_is_ignored() {
         // The standard JUnit executor will report the test as passed and not ignored,
         // we thus only test for not failed here
         the_test_passes();
+        assertThat(reportModel.getScenarios().get(0).getExecutionStatus())
+                .isIn(ExecutionStatus.ABORTED, ExecutionStatus.SCENARIO_PENDING, ExecutionStatus.SOME_STEPS_PENDING);
         return self();
     }