zsh/zunit-zsh.zunit
1
0
Fork 0
mirror of https://github.com/zunit-zsh/zunit.git synced 2026-09-10 06:36:15 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #38 from molovo/version-0.4.x

Browse source 
v0.4.3
This commit is contained in:
James Dinsdale 2017-02-15 12:43:59 +00:00 committed by James Dinsdale
parent bec6ecfb28 da7a75b447
commit fbdceffa2e
No known key found for this signature in database
GPG key ID: 3D8EDF4F3967CD54
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
zunit
View file

@ -790,8 +790,9 @@ function _zunit_run_testfile() {
local testbody testname pattern \
setup teardown \
testfile="$1" testdir="$(dirname "$testfile")"
local -a lines
typeset -A tests
local -a lines tests test_names
tests=()
test_names=()
# Update status message
[[ -z $tap ]] && revolver update "Loading tests from $testfile"
@ -800,12 +801,16 @@ function _zunit_run_testfile() {
pattern='^ *@test *([^ ].*) *\{ *(.*)$'
# Loop through each of the lines in the file
local oldIFS=$IFS
IFS=$'\n' lines=($(cat $testfile))
IFS=$oldIFS
for line in $lines[@]; do
# Match current line against pattern
if [[ "$line" =~ $pattern ]]; then
# Get test name from matches
testname=${line[(( ${line[(i)[\']]}+1 )),(( ${line[(I)[\']]}-1 ))]}
testname="${line[(( ${line[(i)[\']]}+1 )),(( ${line[(I)[\']]}-1 ))]}"
test_names=($test_names $testname)
tests[${#test_names}]=''
elif [[ "$line" =~ '^@setup([ ])?\{$' ]]; then
setup=''
parsing_setup=true
@ -818,17 +823,17 @@ function _zunit_run_testfile() {
parsing_teardown=''
else
if [[ -n $testname ]]; then
tests[$testname]+="$line\n"
tests[${#test_names}]+="$line"$'\n'
continue
fi
if [[ -n $parsing_setup ]]; then
setup+="$line\n"
setup+="$line"$'\n'
continue
fi
if [[ -n $parsing_teardown ]]; then
teardown+="$line\n"
teardown+="$line"$'\n'
continue
fi
fi
@ -891,7 +896,13 @@ function _zunit_run_testfile() {
fi
# Loop through each of the tests and execute it
for name body ("${(@kv)tests}") _zunit_execute_test "$name" "$body"
integer i=1
local name body
for name in "${test_names[@]}"; do
body="${tests[$i]}"
_zunit_execute_test "$name" "$body"
i=$(( i + 1 ))
done
(( $+functions[__zunit_test_setup] )) && unfunction __zunit_test_setup
(( $+functions[__zunit_test_teardown] )) && unfunction __zunit_test_teardown
@ -1174,7 +1185,7 @@ function _zunit() {
# If the version option is passed,
# output version information and exit
if [[ -n $version ]]; then
echo '0.4.2'
echo '0.4.3'
exit 0
fi