Skip to content

Commit fd60e4d

Browse files
committed
fix: satisfy shellcheck for array assertion
1 parent 6adc2ed commit fd60e4d

2 files changed

Lines changed: 25 additions & 25 deletions

File tree

src/assert_arrays.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ function assert_arrays_equal() {
66
local label
77
label="$(bashunit::assert::label)"
88

9-
local -a expected
10-
local -a actual
9+
local -a expected_values
10+
local -a actual_values
1111
local found_separator=false
1212
local argument
1313

@@ -18,9 +18,9 @@ function assert_arrays_equal() {
1818
fi
1919

2020
if [ "$found_separator" = true ]; then
21-
actual[${#actual[@]}]="$argument"
21+
actual_values[${#actual_values[@]}]="$argument"
2222
else
23-
expected[${#expected[@]}]="$argument"
23+
expected_values[${#expected_values[@]}]="$argument"
2424
fi
2525
done
2626

@@ -30,20 +30,20 @@ function assert_arrays_equal() {
3030
return
3131
fi
3232

33-
if [ "${#expected[@]}" -ne "${#actual[@]}" ]; then
33+
if [ "${#expected_values[@]}" -ne "${#actual_values[@]}" ]; then
3434
bashunit::assert::mark_failed
3535
bashunit::console_results::print_failed_test \
36-
"$label" "${expected[*]}" "but got " "${actual[*]}" \
37-
"Expected length" "${#expected[@]}, actual length ${#actual[@]}"
36+
"$label" "${expected_values[*]}" "but got " "${actual_values[*]}" \
37+
"Expected length" "${#expected_values[@]}, actual length ${#actual_values[@]}"
3838
return
3939
fi
4040

4141
local index
42-
for ((index = 0; index < ${#expected[@]}; index++)); do
43-
if [ "${expected[$index]}" != "${actual[$index]}" ]; then
42+
for ((index = 0; index < ${#expected_values[@]}; index++)); do
43+
if [ "${expected_values[$index]}" != "${actual_values[$index]}" ]; then
4444
bashunit::assert::mark_failed
4545
bashunit::console_results::print_failed_test \
46-
"$label" "${expected[*]}" "but got " "${actual[*]}" \
46+
"$label" "${expected_values[*]}" "but got " "${actual_values[*]}" \
4747
"Different index" "$index"
4848
return
4949
fi

tests/unit/assert_advanced_test.sh

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -119,38 +119,38 @@ function test_unsuccessful_assert_array_not_contains() {
119119
}
120120

121121
function test_successful_assert_arrays_equal() {
122-
local expected
123-
expected=(Ubuntu 123 Linux\ Mint)
124-
local actual
125-
actual=(Ubuntu 123 Linux\ Mint)
122+
local expected_values
123+
expected_values=(Ubuntu 123 Linux\ Mint)
124+
local actual_values
125+
actual_values=(Ubuntu 123 Linux\ Mint)
126126

127-
assert_empty "$(assert_arrays_equal "${expected[@]}" -- "${actual[@]}")"
127+
assert_empty "$(assert_arrays_equal "${expected_values[@]}" -- "${actual_values[@]}")"
128128
}
129129

130130
function test_unsuccessful_assert_arrays_equal_with_different_lengths() {
131-
local expected
132-
expected=(Ubuntu 123 Linux\ Mint)
133-
local actual
134-
actual=(Ubuntu 123)
131+
local expected_values
132+
expected_values=(Ubuntu 123 Linux\ Mint)
133+
local actual_values
134+
actual_values=(Ubuntu 123)
135135

136136
assert_same \
137137
"$(bashunit::console_results::print_failed_test \
138138
"Unsuccessful assert arrays equal with different lengths" \
139139
"Ubuntu 123 Linux Mint" "but got " "Ubuntu 123" "Expected length" "3, actual length 2")" \
140-
"$(assert_arrays_equal "${expected[@]}" -- "${actual[@]}")"
140+
"$(assert_arrays_equal "${expected_values[@]}" -- "${actual_values[@]}")"
141141
}
142142

143143
function test_unsuccessful_assert_arrays_equal_with_different_elements() {
144-
local expected
145-
expected=(Ubuntu 123 Linux\ Mint)
146-
local actual
147-
actual=(Ubuntu 321 Linux\ Mint)
144+
local expected_values
145+
expected_values=(Ubuntu 123 Linux\ Mint)
146+
local actual_values
147+
actual_values=(Ubuntu 321 Linux\ Mint)
148148

149149
assert_same \
150150
"$(bashunit::console_results::print_failed_test \
151151
"Unsuccessful assert arrays equal with different elements" \
152152
"Ubuntu 123 Linux Mint" "but got " "Ubuntu 321 Linux Mint" "Different index" "1")" \
153-
"$(assert_arrays_equal "${expected[@]}" -- "${actual[@]}")"
153+
"$(assert_arrays_equal "${expected_values[@]}" -- "${actual_values[@]}")"
154154
}
155155

156156
function test_successful_assert_line_count_empty_str() {

0 commit comments

Comments
 (0)