Merge pull request #544 from TypedDevs/feat/536-subsequent-assert-not-evaluated-after-fail

Subsequent assert not evaluated after fail

Author: Chemaclass

CHANGELOG.md

@@ -5,6 +5,8 @@
 ### Added
 - Add `--strict` flag to enable strict shell mode (`set -euo pipefail`) for tests (fixes #540)
 - Add `BASHUNIT_STRICT_MODE` configuration option (default: `false`)
+- Add `-R, --run-all` flag to run all assertions even when one fails (fixes #536)
+- Add `BASHUNIT_STOP_ON_ASSERTION_FAILURE` configuration option (default: `true`)
 
 ### Changed
 - Build script now outputs to `bin/` by default

docs/command-line.md

@@ -52,6 +52,7 @@ bashunit test tests/ --parallel --simple
 | `-p, --parallel` | Run tests in parallel (default) |
 | `--no-parallel` | Run tests sequentially |
 | `-r, --report-html <file>` | Write HTML report |
+| `-R, --run-all` | Run all assertions (don't stop on first failure) |
 | `-s, --simple` | Simple output (dots) |
 | `--detailed` | Detailed output (default) |
 | `-S, --stop-on-failure` | Stop on first failure |

docs/configuration.md

@@ -86,9 +86,29 @@ Force to stop the runner right after encountering one failing test. `false` by d
 Similar as using `-S|--stop-on-failure` option on the [command line](/command-line#stop-on-failure).
 
 ::: tip Assertion behavior
-When an assertion fails within a test, subsequent assertions in the same test are automatically skipped. This matches popular testing libraries default behavior and prevents misleading failures caused by earlier assertion failures.
+By default, when an assertion fails within a test, subsequent assertions in the same test are skipped. Use `-R, --run-all` or set `BASHUNIT_STOP_ON_ASSERTION_FAILURE=false` to run all assertions even when one fails.
 
-The `--stop-on-failure` flag is separate – it stops the entire test runner after a failing **test**, while assertion-level stopping happens automatically within each test.
+The `--stop-on-failure` flag is separate – it stops the entire test runner after a failing **test**, while assertion-level stopping happens within each test.
+:::
+
+## Stop on assertion failure
+
+> `BASHUNIT_STOP_ON_ASSERTION_FAILURE=true|false`
+
+Controls whether to stop at the first failed assertion within a test. `true` by default.
+
+When enabled (default), subsequent assertions in the same test are skipped after a failure.
+When disabled, all assertions in the test run, showing all failures at once.
+
+Similar as using `-R|--run-all` option on the [command line](/command-line).
+
+::: code-group
+```bash [Run all assertions]
+BASHUNIT_STOP_ON_ASSERTION_FAILURE=false
+```
+```bash [Stop on first failure (default)]
+BASHUNIT_STOP_ON_ASSERTION_FAILURE=true
+```
 :::
 
 ## Show header

src/assert.sh

@@ -6,8 +6,13 @@ function bashunit::assert::mark_failed() {
   bashunit::state::mark_assertion_failed_in_test
 }
 
+# Guard clause to skip assertion if one already failed in test (when stop-on-assertion is enabled)
+function bashunit::assert::should_skip() {
+  bashunit::env::is_stop_on_assertion_failure_enabled && (( _BASHUNIT_ASSERTION_FAILED_IN_TEST ))
+}
+
 function bashunit::fail() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local message="${1:-${FUNCNAME[1]}}"
 
@@ -20,7 +25,7 @@ function bashunit::fail() {
 }
 
 function assert_true() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local actual="$1"
 
@@ -42,7 +47,7 @@ function assert_true() {
 }
 
 function assert_false() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local actual="$1"
 
@@ -89,7 +94,7 @@ function bashunit::handle_bool_assertion_failure() {
 }
 
 function assert_same() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected="$1"
   local actual="$2"
@@ -108,7 +113,7 @@ function assert_same() {
 }
 
 function assert_equals() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected="$1"
   local actual="$2"
@@ -132,7 +137,7 @@ function assert_equals() {
 }
 
 function assert_not_equals() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected="$1"
   local actual="$2"
@@ -156,7 +161,7 @@ function assert_not_equals() {
 }
 
 function assert_empty() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected="$1"
 
@@ -174,7 +179,7 @@ function assert_empty() {
 }
 
 function assert_not_empty() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected="$1"
 
@@ -192,7 +197,7 @@ function assert_not_empty() {
 }
 
 function assert_not_same() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected="$1"
   local actual="$2"
@@ -211,7 +216,7 @@ function assert_not_same() {
 }
 
 function assert_contains() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected="$1"
   local actual_arr=("${@:2}")
@@ -232,7 +237,7 @@ function assert_contains() {
 }
 
 function assert_contains_ignore_case() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected="$1"
   local actual="$2"
@@ -255,7 +260,7 @@ function assert_contains_ignore_case() {
 }
 
 function assert_not_contains() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected="$1"
   local actual_arr=("${@:2}")
@@ -276,7 +281,7 @@ function assert_not_contains() {
 }
 
 function assert_matches() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected="$1"
   local actual_arr=("${@:2}")
@@ -297,7 +302,7 @@ function assert_matches() {
 }
 
 function assert_not_matches() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected="$1"
   local actual_arr=("${@:2}")
@@ -318,7 +323,7 @@ function assert_not_matches() {
 }
 
 function assert_exec() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local cmd="$1"
   shift
@@ -404,7 +409,7 @@ function assert_exec() {
 
 function assert_exit_code() {
   local actual_exit_code=${3-"$?"}  # Capture $? before guard check
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected_exit_code="$1"
 
@@ -423,7 +428,7 @@ function assert_exit_code() {
 
 function assert_successful_code() {
   local actual_exit_code=${3-"$?"}  # Capture $? before guard check
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected_exit_code=0
 
@@ -443,7 +448,7 @@ function assert_successful_code() {
 
 function assert_unsuccessful_code() {
   local actual_exit_code=${3-"$?"}  # Capture $? before guard check
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   if [[ "$actual_exit_code" -eq 0 ]]; then
     local test_fn
@@ -460,7 +465,7 @@ function assert_unsuccessful_code() {
 
 function assert_general_error() {
   local actual_exit_code=${3-"$?"}  # Capture $? before guard check
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected_exit_code=1
 
@@ -480,7 +485,7 @@ function assert_general_error() {
 
 function assert_command_not_found() {
   local actual_exit_code=${3-"$?"}  # Capture $? before guard check
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected_exit_code=127
 
@@ -499,7 +504,7 @@ function assert_command_not_found() {
 }
 
 function assert_string_starts_with() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected="$1"
   local actual_arr=("${@:2}")
@@ -520,7 +525,7 @@ function assert_string_starts_with() {
 }
 
 function assert_string_not_starts_with() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected="$1"
   local actual="$2"
@@ -539,7 +544,7 @@ function assert_string_not_starts_with() {
 }
 
 function assert_string_ends_with() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected="$1"
   local actual_arr=("${@:2}")
@@ -560,7 +565,7 @@ function assert_string_ends_with() {
 }
 
 function assert_string_not_ends_with() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected="$1"
   local actual_arr=("${@:2}")
@@ -581,7 +586,7 @@ function assert_string_not_ends_with() {
 }
 
 function assert_less_than() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected="$1"
   local actual="$2"
@@ -600,7 +605,7 @@ function assert_less_than() {
 }
 
 function assert_less_or_equal_than() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected="$1"
   local actual="$2"
@@ -619,7 +624,7 @@ function assert_less_or_equal_than() {
 }
 
 function assert_greater_than() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected="$1"
   local actual="$2"
@@ -638,7 +643,7 @@ function assert_greater_than() {
 }
 
 function assert_greater_or_equal_than() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected="$1"
   local actual="$2"
@@ -657,7 +662,7 @@ function assert_greater_or_equal_than() {
 }
 
 function assert_line_count() {
-  (( _BASHUNIT_ASSERTION_FAILED_IN_TEST )) && return 0
+  bashunit::assert::should_skip && return 0
 
   local expected="$1"
   local input_arr=("${@:2}")

src/assert_arrays.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
 function assert_array_contains() {
+  bashunit::assert::should_skip && return 0
+
   local expected="$1"
   local test_fn
   test_fn="$(bashunit::helper::find_test_function_name)"
@@ -11,7 +13,7 @@ function assert_array_contains() {
   local actual=("${@}")
 
   if ! [[ "${actual[*]}" == *"$expected"* ]]; then
-    bashunit::state::add_assertions_failed
+    bashunit::assert::mark_failed
     bashunit::console_results::print_failed_test "${label}" "${actual[*]}" "to contain" "${expected}"
     return
   fi
@@ -20,6 +22,8 @@ function assert_array_contains() {
 }
 
 function assert_array_not_contains() {
+  bashunit::assert::should_skip && return 0
+
   local expected="$1"
   local test_fn
   test_fn="$(bashunit::helper::find_test_function_name)"
@@ -29,7 +33,7 @@ function assert_array_not_contains() {
   local actual=("$@")
 
   if [[ "${actual[*]}" == *"$expected"* ]]; then
-    bashunit::state::add_assertions_failed
+    bashunit::assert::mark_failed
     bashunit::console_results::print_failed_test "${label}" "${actual[*]}" "to not contain" "${expected}"
     return
   fi