flo/scm_breeze
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

assert(Not)?Includes: check for failure of _includes

Browse Source 
Call _includes and then check its return value.

shunit2 uses the exit code to test, not a string of 0 or 1 as was done
previously.
This commit is contained in:
Tom "Ravi" Hale
2018-08-27 18:21:03 +07:00
parent ed63b41182
commit 5a8c2fec12
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/support/test_helper.sh
View File

@@ -50,16 +50,22 @@ function token_quote {
# Asserts # Asserts
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Return 0 (shell's true) if "$1" contains string "$2"
_includes() { _includes() {
if [ -n "$3" ]; then regex="$3"; else regex=''; fi if [ -n "$3" ]; then regex="$3"; else regex=''; fi
if echo "$1" | grep -q$regex "$2"; then echo 0; else echo 1; fi echo "$1" | grep -q"$regex" "$2" # exit status of quiet grep is returned
} }
# assert $1 contains $2 # assert $1 contains $2
assertIncludes() { assertIncludes() {
assertTrue "'$1' should have contained '$2'" $(_includes "$@") _includes "$@"
local grep_exit=$?
assertTrue "'$1' should have contained '$2'" '[[ $grep_exit == 0 ]]'
} }
# assert $1 does not contain $2 # assert $1 does not contain $2
assertNotIncludes() { assertNotIncludes() {
assertFalse "'$1' should not have contained '$2'" $(_includes "$@") _includes "$@"
local grep_return=$?
assertTrue "'$1' should not have contained '$2'" '[[ ! $grep_exit = 0 ]]'
} }