refactor: interpolated_fn for data providers

Author: Chemaclass

src/helpers.sh

@@ -8,21 +8,20 @@ declare -r BASHUNIT_GIT_REPO="https://github.com/TypedDevs/bashunit"
 # @return string Eg: "Some logic camelCase"
 #
 function helper::normalize_test_function_name() {
-  local original_function_name="${1-}"
+  local original_fn_name="${1-}"
+  local interpolated_fn_name="${2-}"
 
-  if [[ -n "${BASHUNIT_CURRENT_FUNCTION_NAME-}" &&
-        "$original_function_name" == "$BASHUNIT_CURRENT_FUNCTION_NAME" &&
-        -n "${BASHUNIT_INTERPOLATED_FUNCTION_NAME-}" ]]; then
-    original_function_name="$BASHUNIT_INTERPOLATED_FUNCTION_NAME"
+  if [[ -n "${interpolated_fn_name-}" ]]; then
+    original_fn_name="$interpolated_fn_name"
   fi
 
   local result
 
   # Remove the first "test_" prefix, if present
-  result="${original_function_name#test_}"
+  result="${original_fn_name#test_}"
   # If no "test_" was removed (e.g., "testFoo"), remove the "test" prefix
-  if [[ "$result" == "$original_function_name" ]]; then
-    result="${original_function_name#test}"
+  if [[ "$result" == "$original_fn_name" ]]; then
+    result="${original_fn_name#test}"
   fi
   # Replace underscores with spaces
   result="${result//_/ }"

src/runner.sh

@@ -136,7 +136,7 @@ function runner::run_test() {
   local function_name="$1"
   shift
   export BASHUNIT_CURRENT_FUNCTION_NAME="$function_name"
-  export BASHUNIT_INTERPOLATED_FUNCTION_NAME="$(helper::interpolate_function_name "$function_name" "$@")"
+  local interpolated_function_name="$(helper::interpolate_function_name "$function_name" "$@")"
   local current_assertions_failed="$(state::get_assertions_failed)"
   local current_assertions_snapshot="$(state::get_assertions_snapshot)"
   local current_assertions_incomplete="$(state::get_assertions_incomplete)"
@@ -265,7 +265,7 @@ function runner::run_test() {
     return
   fi
 
-  local label="$(helper::normalize_test_function_name "$function_name")"
+  local label="$(helper::normalize_test_function_name "$function_name" "$interpolated_function_name")"
 
   console_results::print_successful_test "${label}" "$duration" "$@"
   state::add_tests_passed

tests/unit/helpers_test.sh

@@ -228,13 +228,14 @@ function test_to_run_with_filter_matching_string_in_function_name() {
 function test_interpolate_function_name() {
   local result
   result="$(helper::interpolate_function_name "test_name_::1::_foo" "bar")"
+
   assert_same "test_name_'bar'_foo" "$result"
 }
 
 function test_normalize_test_function_name_with_interpolation() {
-  local fn="test_returns_value_::1::_given"
-  export BASHUNIT_CURRENT_FUNCTION_NAME="$fn"
+  local fn="test_returns_value_::1::_and_::2::_given"
   # shellcheck disable=SC2155
-  export BASHUNIT_INTERPOLATED_FUNCTION_NAME="$(helper::interpolate_function_name "$fn" "3")"
-  assert_same "Returns value '3' given" "$(helper::normalize_test_function_name "$fn")"
+  local interpolated_fn="$(helper::interpolate_function_name "$fn" "3" "4")"
+
+  assert_same "Returns value '3' and '4' given" "$(helper::normalize_test_function_name "$fn" "$interpolated_fn")"
 }