Release v2.0.2 (#26)

* Prepare v2.0.2

* Fix #24 - Reset state between assertion calls (#25)

+ Add test dependency: Assertj

* Release v2.0.2

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log for `junit5-system-exit`
 
+### 2.0.2
+- Bugfix: [[#24]](https://github.com/tginsberg/junit5-system-exit/issues/24): Reset state between assertion calls.
+
 ### 2.0.1
 - Bugfix: [[#20]](https://github.com/tginsberg/junit5-system-exit/issues/20): Multiple calls to `System.exit()` do not always report the first exit status code.
 

README.md

@@ -28,7 +28,7 @@ your test task. Please consult the [FAQ](#faq) below if you run into problems.
 #### 1. Copy the following into your `build.gradle` or `build.gradle.kts`.
 
 ```groovy
-testImplementation("com.ginsberg:junit5-system-exit:2.0.1")
+testImplementation("com.ginsberg:junit5-system-exit:2.0.2")
 ```
 
 #### 2. Enable the Java Agent
@@ -73,7 +73,7 @@ test {
 <dependency>
     <groupId>com.ginsberg</groupId>
     <artifactId>junit5-system-exit</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2</version>
     <scope>test</scope>
 </dependency>
 ```

VERSION.txt

@@ -1 +1 @@
-2.0.1
+2.0.2

build.gradle.kts

@@ -71,6 +71,7 @@ dependencies {
         because("Starting in Gradle 9.0, this needs to be an explicitly declared dependency")
     }
 
+    testImplementation("org.assertj:assertj-core:3.26.3")
     testImplementation("org.junit.jupiter:junit-jupiter:$junitVersion")
     testImplementation("org.junit.jupiter:junit-jupiter-params:$junitVersion")
     testImplementation("org.junit.platform:junit-platform-launcher:$junitPlatformLauncherVersion")

src/main/java/com/ginsberg/junit/exit/assertions/SystemExitAssertion.java

@@ -65,6 +65,7 @@ private SystemExitAssertion didNotCallSystemExit() {
     private static SystemExitPreventedException catchSystemExitFrom(final Runnable function) {
         final ExitPreventerStrategy exitPreventerStrategy = new AgentSystemExitHandlerStrategy();
         try {
+            exitPreventerStrategy.resetBetweenTests();
             exitPreventerStrategy.beforeTest();
             function.run();
         } catch (SystemExitPreventedException e) {

src/test/java/com/ginsberg/junit/exit/assertions/SystemExitAssertionTest.java

@@ -5,62 +5,63 @@
 
 import static com.ginsberg.junit.exit.assertions.SystemExitAssertion.assertThatCallsSystemExit;
 import static com.ginsberg.junit.exit.assertions.SystemExitAssertion.assertThatDoesNotCallSystemExit;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 
 class SystemExitAssertionTest {
 
     @Test
     void catchesExit() {
-        assertThatCallsSystemExit(() -> System.exit(42));
+        assertThatCallsSystemExit(() -> System.exit(1));
     }
 
     @Test
     void catchesExitWithCode() {
-        assertThatCallsSystemExit(() -> System.exit(42)).withExitCode(42);
+        assertThatCallsSystemExit(() -> System.exit(2)).withExitCode(2);
     }
 
     @Test
     void catchesExitWithCodeInRange() {
-        assertThatCallsSystemExit(() -> System.exit(42)).withExitCodeInRange(41, 43);
+        assertThatCallsSystemExit(() -> System.exit(3)).withExitCodeInRange(1, 3);
     }
 
     @Test
     void catchesMultipleExits() {
         assertThatCallsSystemExit(() -> {
-            justExit();
-            justExit();
-            justExit();
-        }).withExitCode(42);
+            System.exit(4);
+            System.exit(5);
+            System.exit(6);
+        }).withExitCode(4);
     }
 
     @Test
     void exitCodeDoesNotMatch() {
         try {
-            assertThatCallsSystemExit(() -> System.exit(42)).withExitCode(43);
+            assertThatCallsSystemExit(() -> System.exit(5)).withExitCode(6);
             fail("Should have failed test when System.exit was not called but expected");
         } catch (AssertionFailedError e) {
-            // Expected
+            assertThat(e.getMessage()).startsWith("Wrong exit code found");
         }
     }
 
     @Test
     void exitCodeNotInRangeHigh() {
         try {
-            assertThatCallsSystemExit(() -> System.exit(44)).withExitCodeInRange(41, 43);
+            assertThatCallsSystemExit(() -> System.exit(7)).withExitCodeInRange(1, 6);
             fail("Should have failed test when System.exit was not in range");
         } catch (AssertionFailedError e) {
-            // Expected
+            assertThat(e.getMessage()).startsWith("Exit code expected in range (1 .. 6) but was 7");
         }
     }
 
     @Test
     void exitCodeNotInRangeLow() {
         try {
-            assertThatCallsSystemExit(() -> System.exit(40)).withExitCodeInRange(41,43);
+            assertThatCallsSystemExit(() -> System.exit(8)).withExitCodeInRange(9, 11);
             fail("Should have failed test when System.exit was not in range");
         } catch (AssertionFailedError e) {
-            // Expected
+            assertThat(e.getMessage()).startsWith("Exit code expected in range (9 .. 11) but was 8");
         }
     }
 
@@ -73,11 +74,11 @@ void expectingNoExit() {
     void expectingNoExitWhenExitHappens() {
         try {
             assertThatDoesNotCallSystemExit(() ->
-                System.exit(42)
+                    System.exit(9)
             );
             fail("Should have failed test when System.exit was called but not expected");
         } catch (AssertionFailedError e) {
-            // Expected
+            assertThat(e.getMessage()).startsWith("Unexpected call to System.exit()");
         }
     }
 
@@ -86,35 +87,19 @@ void expectingSystemExitButSomethingElseThrown() {
         try {
             assertThatCallsSystemExit(() -> {
                 throw new IllegalStateException();
-            }).withExitCode(42);
-        } catch(final Exception e) {
+            }).withExitCode(10);
+        } catch (final Exception e) {
             assertEquals(IllegalStateException.class, e.getCause().getClass());
         }
     }
 
     @Test
     void failsWhenNoExit() {
         try {
-            assertThatCallsSystemExit(System::currentTimeMillis).withExitCode(42);
+            assertThatCallsSystemExit(System::currentTimeMillis).withExitCode(11);
             fail("Should have failed test when System.exit was not called but expected");
         } catch (AssertionFailedError e) {
-            // Expected
+            assertThat(e.getMessage()).startsWith("Expected call to System.exit() did not happen");
         }
     }
-
-    @Test
-    void multipleCallsToExit() {
-        assertThatCallsSystemExit(() -> {
-            try {
-                System.exit(42);
-                System.exit(1);
-            } catch (final Exception e) {
-                System.exit(2);
-            }
-        }).withExitCode(42);
-    }
-
-    private void justExit() {
-        System.exit(42);
-    }
 }