Skip to content

Commit 21891f8

Browse files
committed
refactor: extract ID generation into a helper function
1 parent 6fa112d commit 21891f8

2 files changed

Lines changed: 13 additions & 8 deletions

File tree

src/helpers.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,3 +328,14 @@ function helper::get_function_line_number() {
328328

329329
echo "$line_number"
330330
}
331+
332+
function helper::generate_id() {
333+
local basename="$1"
334+
local sanitized_basename
335+
sanitized_basename="$(helper::normalize_variable_name "$basename")"
336+
if env::is_parallel_run_enabled; then
337+
echo "${sanitized_basename}_$$_$(random_str 6)"
338+
else
339+
echo "${sanitized_basename}_$$"
340+
fi
341+
}

src/runner.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -232,17 +232,11 @@ function runner::run_test() {
232232
local fn_name="$1"
233233
shift
234234

235+
internal_log "Running test" "$fn_name" "$*"
235236
# Export a unique test identifier so that test doubles can
236237
# create temporary files scoped per test run. This prevents
237238
# race conditions when running tests in parallel.
238-
local sanitized_fn_name
239-
sanitized_fn_name="$(helper::normalize_variable_name "$fn_name")"
240-
internal_log "Running test" "$fn_name" "$*"
241-
if env::is_parallel_run_enabled; then
242-
export BASHUNIT_CURRENT_TEST_ID="${sanitized_fn_name}_$$_$(random_str 6)"
243-
else
244-
export BASHUNIT_CURRENT_TEST_ID="${sanitized_fn_name}_$$"
245-
fi
239+
export BASHUNIT_CURRENT_TEST_ID="$(helper::generate_id "$fn_name")"
246240

247241
state::reset_test_title
248242

0 commit comments

Comments
 (0)