public/zsh-syntax-highlighting
1
0
Fork 0
mirror of https://github.com/zsh-users/zsh-syntax-highlighting.git synced 2025-01-30 09:47:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: Escape region_highlight and expected_region_highlight in TAP output.

Browse Source 
Required for TAP compliance in case the output ever contains '#' or '\n'.
This commit is contained in:
Daniel Shahaf 2018-12-29 12:15:34 +00:00
parent 580ccaebb8
commit 06893a3873
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/test-highlighting.zsh
View File

@ -93,6 +93,13 @@ typeset_p() {
done done
} }
# Escape # as ♯ and newline as ↵ they are illegal in the 'description' part of TAP output
# The string to escape is «"$@"»; the result is returned in $REPLY.
tap_escape() {
local s="$@"
REPLY="${${s//'#'/♯}//$'\n'/↵}"
}
# Runs a highlighting test # Runs a highlighting test
# $1: data file # $1: data file
run_test_internal() { run_test_internal() {
@ -104,7 +111,7 @@ run_test_internal() {
echo "# ${1:t:r}" echo "# ${1:t:r}"
# Load the data and prepare checking it. # Load the data and prepare checking it.
local BUFFER CURSOR MARK PENDING PREBUFFER REGION_ACTIVE WIDGET skip_test unsorted=0 local BUFFER CURSOR MARK PENDING PREBUFFER REGION_ACTIVE WIDGET REPLY skip_test unsorted=0
local expected_mismatch local expected_mismatch
local -a expected_region_highlight region_highlight local -a expected_region_highlight region_highlight
. "$srcdir"/"$1" . "$srcdir"/"$1"
@ -140,8 +147,8 @@ run_test_internal() {
fi fi
local -a highlight_zone; highlight_zone=( ${(z)region_highlight[i]} ) local -a highlight_zone; highlight_zone=( ${(z)region_highlight[i]} )
integer start=$(( highlight_zone[1] + 1 )) end=$highlight_zone[2] integer start=$(( highlight_zone[1] + 1 )) end=$highlight_zone[2]
# Escape # as ♯ and newline as ↵ they are illegal in the 'description' part of TAP output local desc="[$start,$end] «${BUFFER[$start,$end]}»"
local desc="[$start,$end] «${${BUFFER[$start,$end]//'#'/♯}//$'\n'/↵}»" tap_escape $desc; desc=$REPLY
if if
[[ $start != $exp_start ]] || [[ $start != $exp_start ]] ||
[[ $end != $exp_end ]] || [[ $end != $exp_end ]] ||
@ -162,7 +169,11 @@ run_test_internal() {
if (( $#expected_region_highlight == $#region_highlight )); then if (( $#expected_region_highlight == $#region_highlight )); then
print -r -- "ok $i - cardinality check" "${expected_mismatch:+"# TODO ${(qqq)expected_mismatch}"}" print -r -- "ok $i - cardinality check" "${expected_mismatch:+"# TODO ${(qqq)expected_mismatch}"}"
else else
print -r -- "not ok $i - have $#expected_region_highlight expectations and $#region_highlight region_highlight entries: «$(typeset_p expected_region_highlight)» «$(typeset_p region_highlight)»" "${expected_mismatch:+"# TODO ${(qqq)expected_mismatch}"}" local details
details+="have $#expected_region_highlight expectations and $#region_highlight region_highlight entries: "
details+="«$(typeset_p expected_region_highlight)» «$(typeset_p region_highlight)»"
tap_escape $details; details=$REPLY
print -r -- "not ok $i - $details" "${expected_mismatch:+"# TODO ${(qqq)expected_mismatch}"}"
fi fi
} }