Merge pull request #421 from TypedDevs/fix/find-total-tests

Count data providers when counting total tests

Author: Chemaclass

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Fix typo "to has been called"
 - Add weekly downloads to the docs
 - Fix parallel runner
+- Count data providers when counting total tests
 
 ## [0.20.0](https://github.com/TypedDevs/bashunit/compare/0.19.1...0.20.0) - 2025-06-01
 

src/console_header.sh

@@ -36,15 +36,15 @@ EOF
     if [ "$total_tests" -eq 0 ]; then
       printf "%s\n" "$BASHUNIT_VERSION"
     else
-      printf "%s | Tests: ~%s\n" "$BASHUNIT_VERSION" "$total_tests"
+      printf "%s | Tests: %s\n" "$BASHUNIT_VERSION" "$total_tests"
     fi
     return
   fi
 
   if [ "$total_tests" -eq 0 ]; then
     printf "${_COLOR_BOLD}${_COLOR_PASSED}bashunit${_COLOR_DEFAULT} - %s\n" "$BASHUNIT_VERSION"
   else
-    printf "${_COLOR_BOLD}${_COLOR_PASSED}bashunit${_COLOR_DEFAULT} - %s | Tests: ~%s\n"\
+    printf "${_COLOR_BOLD}${_COLOR_PASSED}bashunit${_COLOR_DEFAULT} - %s | Tests: %s\n"\
       "$BASHUNIT_VERSION"\
       "$total_tests"
   fi

src/helpers.sh

@@ -196,12 +196,49 @@ function helpers::find_total_tests() {
         return
     fi
 
-    local pattern='^\s*function\s+test'
-    if [[ -n "$filter" ]]; then
-        pattern+=".*$filter"
-    fi
-
-    grep -r -E "$pattern" --include="*[tT]est.sh" "${files[@]}" 2>/dev/null | wc -l | xargs
+    local total_count=0
+    local file
+
+    for file in "${files[@]}"; do
+        if [[ ! -f "$file" ]]; then
+            continue
+        fi
+
+        local file_count
+        file_count=$( (
+            # shellcheck source=/dev/null
+            source "$file"
+            local all_fn_names
+            all_fn_names=$(declare -F | awk '{print $3}')
+            local filtered_functions
+            filtered_functions=$(helper::get_functions_to_run "test" "$filter" "$all_fn_names") || true
+
+            local count=0
+            if [[ -n "$filtered_functions" ]]; then
+                # shellcheck disable=SC2206
+                # shellcheck disable=SC2207
+                local functions_to_run=($filtered_functions)
+                for fn_name in "${functions_to_run[@]}"; do
+                    local provider_data=()
+                    while IFS=" " read -r line; do
+                        provider_data+=("$line")
+                    done <<< "$(helper::get_provider_data "$fn_name" "$file")"
+
+                    if [[ "${#provider_data[@]}" -eq 0 ]]; then
+                        count=$((count + 1))
+                    else
+                        count=$((count + ${#provider_data[@]}))
+                    fi
+                done
+            fi
+
+            echo "$count"
+        ) )
+
+        total_count=$((total_count + file_count))
+    done
+
+    echo "$total_count"
 }
 
 function helper::load_test_files() {

tests/unit/fixtures/find_total_tests/provider_test.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# @data_provider provider_lines
+function test_with_provider() {
+  return 0
+}
+
+function provider_lines() {
+  echo "alpha beta"
+  echo "gamma"
+  echo "delta epsilon zeta"
+}

tests/unit/fixtures/find_total_tests/simple_test.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+function test_first() {
+  return 0
+}
+
+function test_second() {
+  return 0
+}

tests/unit/helpers_test.sh

@@ -239,3 +239,43 @@ function test_normalize_test_function_name_with_interpolation() {
 
   assert_same "Returns value '3' and '4' given" "$(helper::normalize_test_function_name "$fn" "$interpolated_fn")"
 }
+
+function helpers_test::find_total_in_subshell() {
+  bash -c 'source "$1"; shift; helpers::find_total_tests "$@"' bash "$BASHUNIT_ROOT_DIR/src/helpers.sh" "$@"
+}
+
+function test_find_total_tests_no_files() {
+  assert_same "0" "$(helpers_test::find_total_in_subshell)"
+}
+
+function test_find_total_tests_simple_file() {
+  local file
+  file="$(current_dir)/fixtures/find_total_tests/simple_test.sh"
+
+  assert_same "2" "$(helpers_test::find_total_in_subshell "" "$file")"
+}
+
+function test_find_total_tests_with_provider() {
+  local file
+  file="$(current_dir)/fixtures/find_total_tests/provider_test.sh"
+
+  assert_same "3" "$(helpers_test::find_total_in_subshell "" "$file")"
+}
+
+function test_find_total_tests_multiple_files() {
+  local file1
+  local file2
+  file1="$(current_dir)/fixtures/find_total_tests/simple_test.sh"
+  file2="$(current_dir)/fixtures/find_total_tests/provider_test.sh"
+
+  assert_same "5" "$(helpers_test::find_total_in_subshell "" "$file1" "$file2")"
+}
+
+function test_find_total_tests_with_filter() {
+  local file1
+  local file2
+  file1="$(current_dir)/fixtures/find_total_tests/simple_test.sh"
+  file2="$(current_dir)/fixtures/find_total_tests/provider_test.sh"
+
+  assert_same "3" "$(helpers_test::find_total_in_subshell "with_provider" "$file1" "$file2")"
+}