13 Commits

Author SHA1 Message Date
de104f7cd5 Bump version to 1.0.2 2014-09-08 20:43:24 +01:00
58e1b8dfa7 Remove useless empty line 2014-09-08 20:43:05 +01:00
e8388b911b Update Makefile 2014-09-08 20:40:23 +01:00
d9e3e14c76 Merge pull request #2 from BrandonOCasey/master
Removed echo -e for portability issues
2014-09-08 17:05:06 +01:00
Brandon Casey
f46506d00e changed printf to use %s and changed newlines in the command string to semi colons 2014-09-08 11:07:11 -04:00
Brandon Casey
59a69b883f removing echo -e for portability issues 2014-09-04 11:49:24 -04:00
1f6dc46f3f Tweak .travis.yml 2014-05-26 13:45:45 +01:00
332cfb8d28 Whitespace tweak 2014-05-26 13:45:21 +01:00
f3e0f666cb Use test-runner.sh instead of homegrown test.sh 2014-05-26 13:45:21 +01:00
47ce28bba6 Fix travis build 2014-04-09 13:48:21 +01:00
6e8e9fcfcf Merge pull request #1 from macie/patch-1
timing support
2014-04-09 13:42:45 +01:00
Maciej Żok
0ea845751e timing support 2014-04-09 14:38:06 +02:00
3b02e60207 Fix typo in readme 2014-03-22 15:37:37 +00:00
24 changed files with 46 additions and 51 deletions

1
.gitignore vendored
View File

@@ -1 +1,2 @@
test/assert.sh test/assert.sh
test-runner.sh

View File

@@ -1,2 +1,4 @@
language: node_js language: c
script: INVARIANT=1 make test before_install:
- sudo apt-get install bc
script: make test

View File

@@ -1,12 +1,38 @@
test: prepare test: bootstrap
./test.sh ./test-runner.sh
prepare: bootstrap: test-runner.sh test/assert.sh
test -f "test/assert.sh" || ( \ clean: remove_test-runner.sh remove_assert.sh
echo "fetching assert.sh..." && \ update: update_test-runner.sh update_assert.sh
curl -s -L -o test/assert.sh \
https://raw.github.com/lehmannro/assert.sh/v1.0.2/assert.sh \ test/assert.sh:
) echo "fetching assert.sh..." && \
curl -s -L -o test/assert.sh \
https://raw.github.com/lehmannro/assert.sh/v1.0.2/assert.sh
remove_assert.sh:
( \
test -f "test/assert.sh" && rm "test/assert.sh" && \
echo "removed test/assert.sh" \
) || exit 0
update_assert.sh: remove_assert.sh test/assert.sh
test-runner.sh:
echo "fetching test-runner.sh..." && \
curl -s -L -o test-runner.sh \
https://github.com/jimeh/test-runner.sh/raw/master/test-runner.sh && \
chmod +x test-runner.sh
remove_test-runner.sh:
( \
test -f "test-runner.sh" && rm "test-runner.sh" && \
echo "removed test-runner.sh" \
) || exit 0
update_test-runner.sh: remove_test-runner.sh test-runner.sh
.SILENT: .SILENT:
.PHONY: test prepare .PHONY: test bootstrap clean update \
remove_test-runner.sh update_test-runner.sh \
remove_assert.sh update_assert.sh

View File

@@ -74,7 +74,7 @@ stub_called_exactly_times uname 2 # returns 0 (success)
restore uname restore uname
``` ```
Asserting stub has been called with specific attributes: Asserting stub has been called with specific arguments:
```bash ```bash
source "stub.sh" source "stub.sh"
@@ -91,7 +91,7 @@ stub_called_with uname -r # returns 0 (success)
restore uname restore uname
``` ```
Asserting stub has been called X number of times with specific attributes: Asserting stub has been called X number of times with specific arguments:
```bash ```bash
source "stub.sh" source "stub.sh"

View File

@@ -1,5 +1,6 @@
# !/usr/bin/env bash # !/usr/bin/env bash
# stub.sh 1.0.1 - stubbing helpers for simplifying bash script tests. #
# stub.sh 1.0.2 - stubbing helpers for simplifying bash script tests.
# https://github.com/jimeh/stub.sh # https://github.com/jimeh/stub.sh
# #
# (The MIT License) # (The MIT License)
@@ -98,7 +99,7 @@ stub_and_eval() {
fi fi
# Create the stub. # Create the stub.
eval "$(echo -e "${cmd}() {\n __stub_call \"${cmd}\" \$@\n $2\n}")" eval "$( printf "%s" "${cmd}() { __stub_call \"${cmd}\" \$@; $2;}")"
} }
@@ -415,5 +416,4 @@ __stub_clean() {
eval "unset STUB_${index}_CALLS" eval "unset STUB_${index}_CALLS"
STUB_INDEX=(${STUB_INDEX[@]/${cmd}=*/}) STUB_INDEX=(${STUB_INDEX[@]/${cmd}=*/})
fi fi
} }

34
test.sh
View File

@@ -1,34 +0,0 @@
#! /usr/bin/env bash
resolve_link() {
$(type -p greadlink readlink | head -1) $1
}
abs_dirname() {
local cwd="$(pwd)"
local path="$1"
while [ -n "$path" ]; do
cd "${path%/*}"
local name="${path##*/}"
path="$(resolve_link "$name" || true)"
done
pwd
cd "$cwd"
}
testdir="$(abs_dirname "$0")/test"
testfiles="$(find "$testdir" -name "*-test.sh")"
RET=0
for testfile in $testfiles; do
echo ""
echo "running: ${testfile/#$(dirname "$testdir")\//}"
cd "$(dirname "$testfile")"
"$testfile"
if [ "$?" != "0" ]; then RET=1; fi
done
echo ""
exit $RET