diff options
| -rw-r--r-- | test/common.sh | 11 | ||||
| -rwxr-xr-x | test/ecgen.sh | 15 | ||||
| -rwxr-xr-x | test/econvert.sh | 2 |
3 files changed, 26 insertions, 2 deletions
diff --git a/test/common.sh b/test/common.sh index 1be6f62..04f520e 100644 --- a/test/common.sh +++ b/test/common.sh @@ -11,6 +11,17 @@ econvert="../econvert" ASSERT="lib/assert.sh/assert.sh" JSON="lib/JSON.sh/JSON.sh" + +start_suite() { + echo + echo -n "######################################################################" +} + +end_suite() { + echo "######################################################################" + echo +} + start_test() { echo printf "[*] Test %-20s" "${FUNCNAME[1]}" diff --git a/test/ecgen.sh b/test/ecgen.sh index 6bc63b3..4b4ce73 100755 --- a/test/ecgen.sh +++ b/test/ecgen.sh @@ -47,8 +47,6 @@ function exhaustive() { start_test assert_raises "${ecgen} --fp -r 10" assert_raises "${ecgen} --f2m -r 10" - assert_raises "${ecgen} --fp -r -i 10" - assert_raises "${ecgen} --f2m -r -i 10" assert_raises "${ecgen} --fp -r -p 10" assert_raises "${ecgen} --f2m -r -u 10" assert_raises "${ecgen} --fp -r -i -u 10" @@ -68,6 +66,8 @@ function exhaustive() { assert_raises "${ecgen} --f2m -r --points=nonprime 10" assert_raises "${ecgen} --f2m -r --points=all 10" assert_raises "${ecgen} --f2m -r --points=none 10" + + assert_raises "${ecgen} --fp -r -c 5 10" } function anomalous() { @@ -79,10 +79,21 @@ function anomalous() { assert "strip_num $p" $(strip_num $order) } +function invalid() { + start_test + assert_raises "${ecgen} --fp -r -i 10" + assert_raises "${ecgen} --f2m -r -i 10" + assert_raises "${ecgen} --fp --threads=2 -r -i -u 10" + assert_raises "${ecgen} --f2m --threads=2 -r -i -u 10" +} + . ${ASSERT} -v +start_suite runs csv json exhaustive anomalous +invalid assert_end ecgen +end_suite
\ No newline at end of file diff --git a/test/econvert.sh b/test/econvert.sh index 81fbcdc..6bed3d4 100755 --- a/test/econvert.sh +++ b/test/econvert.sh @@ -15,5 +15,7 @@ function runs() { } . ${ASSERT} -v +start_suite runs assert_end econvert +end_suite
\ No newline at end of file |