Skip to content

Add trim and quote modes to help detecting space issues in line asserts #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Pierstoval wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Add trim and quote modes to help detecting space issues in line asserts #93

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions src/assert_line.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ __assert_line() {
local -i is_match_line=0
local -i is_mode_partial=0
local -i is_mode_regexp=0
local -i is_mode_trim=0
local -i is_mode_quotes=0

if [[ "${caller}" == "assert_line" ]]; then
: "${lines?}"
Expand Down Expand Up @@ -201,7 +203,8 @@ Did you mean to call \`assert_line\` or \`assert_stderr_line\`?" \
shift 2
;;
-p|--partial) is_mode_partial=1; shift ;;
-e|--regexp) is_mode_regexp=1; shift ;;
-t|--trim) is_mode_trim=1; shift ;;
-q|--quotes) is_mode_quotes=1; shift ;;
--) shift; break ;;
*) break ;;
esac
Expand All @@ -224,30 +227,32 @@ Did you mean to call \`assert_line\` or \`assert_stderr_line\`?" \
# Matching.
if (( is_match_line )); then
# Specific line.
local -r line_content=${stream_lines[$idx]}

if (( is_mode_regexp )); then
if ! [[ ${stream_lines[$idx]} =~ $expected ]]; then
if ! [[ ${line_content} =~ $expected ]]; then
batslib_print_kv_single 6 \
'index' "$idx" \
'regexp' "$expected" \
'line' "${stream_lines[$idx]}" \
'line' "${line_content}" \
| batslib_decorate 'regular expression does not match line' \
| fail
fi
elif (( is_mode_partial )); then
if [[ ${stream_lines[$idx]} != *"$expected"* ]]; then
if [[ ${line_content} != *"$expected"* ]]; then
batslib_print_kv_single 9 \
'index' "$idx" \
'substring' "$expected" \
'line' "${stream_lines[$idx]}" \
'line' "${line_content}" \
| batslib_decorate 'line does not contain substring' \
| fail
fi
else
if [[ ${stream_lines[$idx]} != "$expected" ]]; then
if [[ ${line_content} != "$expected" ]]; then
batslib_print_kv_single 8 \
'index' "$idx" \
'expected' "$expected" \
'actual' "${stream_lines[$idx]}" \
'actual' "${line_content}" \
| batslib_decorate 'line differs' \
| fail
fi
Expand All @@ -257,7 +262,7 @@ Did you mean to call \`assert_line\` or \`assert_stderr_line\`?" \
if (( is_mode_regexp )); then
local -i idx
for (( idx = 0; idx < ${#stream_lines[@]}; ++idx )); do
[[ ${stream_lines[$idx]} =~ $expected ]] && return 0
[[ ${line_content} =~ $expected ]] && return 0
done
{ local -ar single=( 'regexp' "$expected" )
local -ar may_be_multi=( "${stream_type}" "${!stream_type}" )
Expand All @@ -270,7 +275,7 @@ Did you mean to call \`assert_line\` or \`assert_stderr_line\`?" \
elif (( is_mode_partial )); then
local -i idx
for (( idx = 0; idx < ${#stream_lines[@]}; ++idx )); do
[[ ${stream_lines[$idx]} == *"$expected"* ]] && return 0
[[ ${line_content} == *"$expected"* ]] && return 0
done
{ local -ar single=( 'substring' "$expected" )
local -ar may_be_multi=( "${stream_type}" "${!stream_type}" )
Expand All @@ -283,7 +288,7 @@ Did you mean to call \`assert_line\` or \`assert_stderr_line\`?" \
else
local -i idx
for (( idx = 0; idx < ${#stream_lines[@]}; ++idx )); do
[[ ${stream_lines[$idx]} == "$expected" ]] && return 0
[[ ${line_content} == "$expected" ]] && return 0
done
{ local -ar single=( 'line' "$expected" )
local -ar may_be_multi=( "${stream_type}" "${!stream_type}" )
Expand Down