From 2c6bfa342ac85cd1ec5265b217d7cb33afd91e69 Mon Sep 17 00:00:00 2001 From: J08nY Date: Sun, 7 May 2017 18:06:53 +0200 Subject: Fixed unrolls / unique generator curve generaton - Also added some tests to catch some regressions like this early - Fixed double free in gens, also some funky stuff with gunclone and obj_free in curve_free --- test/common.sh | 9 +++++++++ test/ecgen.sh | 24 ++++++++++++++++++++++++ test/lib/assert.sh | 2 +- 3 files changed, 34 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/common.sh b/test/common.sh index d637e9f..d446f79 100644 --- a/test/common.sh +++ b/test/common.sh @@ -8,4 +8,13 @@ JSON="lib/JSON.sh/JSON.sh" start_test() { echo printf "[*] Test %-20s" "${FUNCNAME[1]}" +} + +strip_num() { + num="$1" + num="${num%\"}" + num="${num#\"}" + num="${num:2}" + num="${num##+(0)}" + echo $num } \ No newline at end of file diff --git a/test/ecgen.sh b/test/ecgen.sh index 6e1dd0a..bfdce03 100755 --- a/test/ecgen.sh +++ b/test/ecgen.sh @@ -35,8 +35,32 @@ function json() { assert_matches "${JSON} -x \\\"order\\\"" "0x3de" "${f2m}" } +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" + assert_raises "${ecgen} --f2m -r -i -u 10" + assert_raises "${ecgen} --fp -r -k 10 10" +} + +function anomalous() { + start_test + assert_raises "${ecgen} --fp --anomalous -r 20" + out=$(${ecgen} --fp -tjson --anomalous -r 20) + p=$(echo $out | ${JSON} -x field\",\"p | cut -f 2) + order=$(echo $out | ${JSON} -x ^0,\"order\" | cut -f 2) + assert "strip_num $p" $(strip_num $order) +} + . ${ASSERT} -v runs csv json +exhaustive +anomalous assert_end ecgen diff --git a/test/lib/assert.sh b/test/lib/assert.sh index b8da4c9..679ed66 160000 --- a/test/lib/assert.sh +++ b/test/lib/assert.sh @@ -1 +1 @@ -Subproject commit b8da4c93c2d0a3d11c385c3d0619330228412e4b +Subproject commit 679ed662f008eaceff2ce78002398ab850a07142 -- cgit v1.3.1