diff options
Diffstat (limited to 'test/src')
| -rw-r--r-- | test/src/Makefile | 7 | ||||
| -rw-r--r-- | test/src/exhaustive/test_ansi.c | 1 | ||||
| -rw-r--r-- | test/src/gen/test_gp.c | 175 | ||||
| -rw-r--r-- | test/src/math/test_subgroups.c | 1 | ||||
| -rw-r--r-- | test/src/test/memory.h | 2 | ||||
| -rw-r--r-- | test/src/util/test_bits.c | 1 |
6 files changed, 120 insertions, 67 deletions
diff --git a/test/src/Makefile b/test/src/Makefile index 33e4bdf..5005303 100644 --- a/test/src/Makefile +++ b/test/src/Makefile @@ -17,6 +17,7 @@ INCLUDES = -I. -I../../src -I../../lib -I../lib/criterion/include LIBS = -lrt -lpari -lpthread -lparson -lsha1 -lcriterion TEST_SRC = $(wildcard *.c) $(wildcard */*.c) +TEST_HDR = $(wildcard */*.h) TEST_OBJ = $(patsubst %.c,%.o, $(TEST_SRC)) TESTS = $(patsubst %.c,%, $(TEST_SRC)) @@ -41,4 +42,8 @@ clean: clean-cov: find . -type f -name '*.gcda' -exec rm {} + find . -type f -name '*.gcno' -exec rm {} + - find . -type f -name '*.gcov' -exec rm {} +
\ No newline at end of file + find . -type f -name '*.gcov' -exec rm {} + + +format: + clang-format -i $(TEST_SRC) + clang-format -i $(TEST_HDR)
\ No newline at end of file diff --git a/test/src/exhaustive/test_ansi.c b/test/src/exhaustive/test_ansi.c index 370cf7e..94c89eb 100644 --- a/test/src/exhaustive/test_ansi.c +++ b/test/src/exhaustive/test_ansi.c @@ -5,7 +5,6 @@ #include <criterion/criterion.h> #include <criterion/parameterized.h> -#include <misc/config.h> #include "exhaustive/ansi.h" #include "gen/field.h" #include "gen/seed.h" diff --git a/test/src/gen/test_gp.c b/test/src/gen/test_gp.c index 8ec5e2c..9e3e1a9 100644 --- a/test/src/gen/test_gp.c +++ b/test/src/gen/test_gp.c @@ -3,7 +3,6 @@ * Copyright (C) 2017 J08nY */ #include <criterion/criterion.h> -#include <misc/types.h> #include "gen/gp.h" #include "test/default.h" #include "util/bits.h" @@ -15,10 +14,10 @@ Test(gp, test_gp_gen_seed) { arg_t arg = {.args = "() -> { return(Vecsmall([1,0])); }", .nargs = 1}; int ret = gp_gen(&curve, &arg, OFFSET_SEED); - cr_assert_eq(ret, 1,); - cr_assert_not_null(curve.seed,); - cr_assert_not_null(curve.seed->seed,); - cr_assert(bits_eq(curve.seed->seed, bits_from_bin("10")),); + cr_assert_eq(ret, 1, ); + cr_assert_not_null(curve.seed, ); + cr_assert_not_null(curve.seed->seed, ); + cr_assert(bits_eq(curve.seed->seed, bits_from_bin("10")), ); } Test(gp, test_gp_gen_field) { @@ -26,17 +25,18 @@ Test(gp, test_gp_gen_field) { arg_t arg = {.args = "(seed) -> { return(19); }", .nargs = 1}; int ret = gp_gen(&curve, &arg, OFFSET_FIELD); - cr_assert_eq(ret, 1,); - cr_assert(gequal(curve.field, stoi(19)),); + cr_assert_eq(ret, 1, ); + cr_assert(gequal(curve.field, stoi(19)), ); } Test(gp, test_gp_gen_a) { curve_t curve = {.field = stoi(19)}; - arg_t arg = {.args = "(seed, field) -> { return(Mod(3,field)); }", .nargs = 1}; + arg_t arg = {.args = "(seed, field) -> { return(Mod(3,field)); }", + .nargs = 1}; int ret = gp_gen(&curve, &arg, OFFSET_A); - cr_assert_eq(ret, 1,); - cr_assert(gequal(curve.a, mkintmodu(3, 19)),); + cr_assert_eq(ret, 1, ); + cr_assert(gequal(curve.a, mkintmodu(3, 19)), ); } Test(gp, test_gp_gen_b) { @@ -44,155 +44,206 @@ Test(gp, test_gp_gen_b) { arg_t arg = {.args = "(seed, field, a) -> { return(a * 2); }", .nargs = 1}; int ret = gp_gen(&curve, &arg, OFFSET_B); - cr_assert_eq(ret, 1,); - cr_assert(gequal(curve.b, mkintmodu(6, 19)),); + cr_assert_eq(ret, 1, ); + cr_assert(gequal(curve.b, mkintmodu(6, 19)), ); } Test(gp, test_gp_gen_curve) { - curve_t curve = {.field = stoi(19), .a = mkintmodu(3, 19), .b = mkintmodu(6, 19)}; - arg_t arg = {.args = "(seed, field, a, b) -> { return(ellinit([a,b], field)); }", .nargs = 1}; + curve_t curve = { + .field = stoi(19), .a = mkintmodu(3, 19), .b = mkintmodu(6, 19)}; + arg_t arg = { + .args = "(seed, field, a, b) -> { return(ellinit([a,b], field)); }", + .nargs = 1}; int ret = gp_gen(&curve, &arg, OFFSET_CURVE); - cr_assert_eq(ret, 1,); - cr_assert(gequal(curve.curve, ellinit(mkvec2(curve.a, curve.b), curve.field, 0)),); + cr_assert_eq(ret, 1, ); + cr_assert(gequal(curve.curve, + ellinit(mkvec2(curve.a, curve.b), curve.field, 0)), ); } Test(gp, test_gp_gen_order) { - curve_t curve = {.field = stoi(19), .a = mkintmodu(3, 19), .b = mkintmodu(6, 19), - .curve = ellinit(mkvec2(stoi(3), stoi(6)), stoi(19), 0)}; - arg_t arg = {.args = "(seed, field, a, b, curve) -> { return(ellsea(curve)); }", .nargs = 1}; + curve_t curve = {.field = stoi(19), + .a = mkintmodu(3, 19), + .b = mkintmodu(6, 19), + .curve = ellinit(mkvec2(stoi(3), stoi(6)), stoi(19), 0)}; + arg_t arg = { + .args = "(seed, field, a, b, curve) -> { return(ellsea(curve)); }", + .nargs = 1}; int ret = gp_gen(&curve, &arg, OFFSET_ORDER); - cr_assert_eq(ret, 1,); - cr_assert(gequal(ellsea(curve.curve, 0), curve.order),); + cr_assert_eq(ret, 1, ); + cr_assert(gequal(ellsea(curve.curve, 0), curve.order), ); } Test(gp, test_gp_gen_generators) { - curve_t curve = {.field = stoi(19), .a = mkintmodu(3, 19), .b = mkintmodu(6, 19), - .curve = ellinit(mkvec2(stoi(3), stoi(6)), stoi(19), 0), .order = stoi(16) - }; - arg_t arg = {.args = "(seed, field, a, b, curve, order) -> { return(ellgenerators(curve)); }", .nargs = 1}; + curve_t curve = {.field = stoi(19), + .a = mkintmodu(3, 19), + .b = mkintmodu(6, 19), + .curve = ellinit(mkvec2(stoi(3), stoi(6)), stoi(19), 0), + .order = stoi(16)}; + arg_t arg = {.args = + "(seed, field, a, b, curve, order) -> { " + "return(ellgenerators(curve)); }", + .nargs = 1}; int ret = gp_gen(&curve, &arg, OFFSET_GENERATORS); - cr_assert_eq(ret, 1,); + cr_assert_eq(ret, 1, ); GEN ellgens = ellgenerators(curve.curve); long len = glength(ellgens); - cr_assert_eq(len, curve.ngens,); + cr_assert_eq(len, curve.ngens, ); for (long i = 1; i <= len; ++i) { - cr_assert(gequal(gel(ellgens, i), curve.generators[i - 1]->point),); + cr_assert(gequal(gel(ellgens, i), curve.generators[i - 1]->point), ); } } Test(gp, test_gp_gen_points) { - curve_t curve = {.field = stoi(19), .a = mkintmodu(3, 19), .b = mkintmodu(6, 19), - .curve = ellinit(mkvec2(stoi(3), stoi(6)), stoi(19), 0), .order = stoi(16), + curve_t curve = { + .field = stoi(19), + .a = mkintmodu(3, 19), + .b = mkintmodu(6, 19), + .curve = ellinit(mkvec2(stoi(3), stoi(6)), stoi(19), 0), + .order = stoi(16), }; - point_t gen = {.point = mkvec2(mkintmodu(4,19), mkintmodu(14,19))}; + point_t gen = {.point = mkvec2(mkintmodu(4, 19), mkintmodu(14, 19))}; point_t *generators[1] = {&gen}; curve.generators = generators; curve.ngens = 1; - arg_t arg = {.args = "(seed, field, a, b, curve, order, gens) -> { return([ellmul(curve,gens[1],2)]); }", .nargs = 1}; + arg_t arg = {.args = + "(seed, field, a, b, curve, order, gens) -> { " + "return([ellmul(curve,gens[1],2)]); }", + .nargs = 1}; int ret = gp_gen(&curve, &arg, OFFSET_POINTS); - cr_assert_eq(ret, 1,); - cr_assert_eq(curve.npoints, 1,); - cr_assert(gequal(curve.points[0]->point, ellmul(curve.curve, gen.point, stoi(2))),); + cr_assert_eq(ret, 1, ); + cr_assert_eq(curve.npoints, 1, ); + cr_assert(gequal(curve.points[0]->point, + ellmul(curve.curve, gen.point, stoi(2))), ); } Test(gp, test_gp_check_seed) { seed_t seed = {.seed = bits_from_hex("ff")}; curve_t curve = {.seed = &seed}; - arg_t arg = {.args="(seed) -> { return(1);}"}; + arg_t arg = {.args = "(seed) -> { return(1);}"}; int ret = gp_check(&curve, &arg, OFFSET_SEED); - cr_assert_eq(ret, 1,); + cr_assert_eq(ret, 1, ); } Test(gp, test_gp_check_field) { seed_t seed = {.seed = bits_from_hex("ff")}; curve_t curve = {.seed = &seed, .field = stoi(19)}; - arg_t arg = {.args="(seed, field) -> { if(field == 19, return(1));}"}; + arg_t arg = {.args = "(seed, field) -> { if(field == 19, return(1));}"}; int ret = gp_check(&curve, &arg, OFFSET_FIELD); - cr_assert_eq(ret, 1,); + cr_assert_eq(ret, 1, ); } Test(gp, test_gp_check_a) { seed_t seed = {.seed = bits_from_hex("ff")}; curve_t curve = {.seed = &seed, .field = stoi(19), .a = mkintmodu(3, 19)}; - arg_t arg = {.args="(seed, field, a) -> { if(a == Mod(3,19), return(1));}"}; + arg_t arg = {.args = + "(seed, field, a) -> { if(a == Mod(3,19), return(1));}"}; int ret = gp_check(&curve, &arg, OFFSET_A); - cr_assert_eq(ret, 1,); + cr_assert_eq(ret, 1, ); } Test(gp, test_gp_check_b) { seed_t seed = {.seed = bits_from_hex("ff")}; - curve_t curve = {.seed = &seed, .field = stoi(19), .a = mkintmodu(3, 19), .b = mkintmodu(5, 19)}; + curve_t curve = {.seed = &seed, + .field = stoi(19), + .a = mkintmodu(3, 19), + .b = mkintmodu(5, 19)}; - arg_t arg = {.args="(seed, field, a, b) -> { if(b == Mod(5,19), return(1));}"}; + arg_t arg = { + .args = "(seed, field, a, b) -> { if(b == Mod(5,19), return(1));}"}; int ret = gp_check(&curve, &arg, OFFSET_B); - cr_assert_eq(ret, 1,); + cr_assert_eq(ret, 1, ); } Test(gp, test_gp_check_curve) { seed_t seed = {.seed = bits_from_hex("ff")}; - curve_t curve = {.seed = &seed, .field = stoi(19), .a = mkintmodu(3, 19), .b = mkintmodu(5, 19), - .curve = ellinit(mkvec2(stoi(3), stoi(5)), stoi(19), 0)}; + curve_t curve = {.seed = &seed, + .field = stoi(19), + .a = mkintmodu(3, 19), + .b = mkintmodu(5, 19), + .curve = ellinit(mkvec2(stoi(3), stoi(5)), stoi(19), 0)}; - arg_t arg = {.args="(seed, field, a, b, curve) -> { if(curve == ellinit([3, 5], 19), return(1));}"}; + arg_t arg = {.args = + "(seed, field, a, b, curve) -> { if(curve == ellinit([3, " + "5], 19), return(1));}"}; int ret = gp_check(&curve, &arg, OFFSET_CURVE); - cr_assert_eq(ret, 1,); + cr_assert_eq(ret, 1, ); } Test(gp, test_gp_check_order) { seed_t seed = {.seed = bits_from_hex("ff")}; - curve_t curve = {.seed = &seed, .field = stoi(19), .a = mkintmodu(3, 19), .b = mkintmodu(5, 19), - .curve = ellinit(mkvec2(stoi(3), stoi(5)), stoi(19), 0), .order = stoi(16)}; + curve_t curve = {.seed = &seed, + .field = stoi(19), + .a = mkintmodu(3, 19), + .b = mkintmodu(5, 19), + .curve = ellinit(mkvec2(stoi(3), stoi(5)), stoi(19), 0), + .order = stoi(16)}; - arg_t arg = {.args="(seed, field, a, b, curve, order) -> { if(order == 16, return(1));}"}; + arg_t arg = {.args = + "(seed, field, a, b, curve, order) -> { if(order == 16, " + "return(1));}"}; int ret = gp_check(&curve, &arg, OFFSET_ORDER); - cr_assert_eq(ret, 1,); + cr_assert_eq(ret, 1, ); } Test(gp, test_gp_check_generators) { seed_t seed = {.seed = bits_from_hex("ff")}; - curve_t curve = {.seed = &seed, .field = stoi(19), .a = mkintmodu(3, 19), .b = mkintmodu(6, 19), - .curve = ellinit(mkvec2(stoi(3), stoi(6)), stoi(19), 0), .order = stoi(16), + curve_t curve = { + .seed = &seed, + .field = stoi(19), + .a = mkintmodu(3, 19), + .b = mkintmodu(6, 19), + .curve = ellinit(mkvec2(stoi(3), stoi(6)), stoi(19), 0), + .order = stoi(16), }; - point_t gen = {.point = mkvec2(mkintmodu(4,19), mkintmodu(14,19))}; + point_t gen = {.point = mkvec2(mkintmodu(4, 19), mkintmodu(14, 19))}; point_t *generators[1] = {&gen}; curve.generators = generators; curve.ngens = 1; - arg_t arg = {.args="(seed, field, a, b, curve, order, gens) -> { if(gens == ellgenerators(curve), return(1));}"}; + arg_t arg = {.args = + "(seed, field, a, b, curve, order, gens) -> { if(gens == " + "ellgenerators(curve), return(1));}"}; int ret = gp_check(&curve, &arg, OFFSET_GENERATORS); - cr_assert_eq(ret, 1,); + cr_assert_eq(ret, 1, ); } Test(gp, test_gp_check_points) { seed_t seed = {.seed = bits_from_hex("ff")}; - curve_t curve = {.seed = &seed, .field = stoi(19), .a = mkintmodu(3, 19), .b = mkintmodu(6, 19), - .curve = ellinit(mkvec2(stoi(3), stoi(6)), stoi(19), 0), .order = stoi(16), + curve_t curve = { + .seed = &seed, + .field = stoi(19), + .a = mkintmodu(3, 19), + .b = mkintmodu(6, 19), + .curve = ellinit(mkvec2(stoi(3), stoi(6)), stoi(19), 0), + .order = stoi(16), }; - point_t gen = {.point = mkvec2(mkintmodu(4,19), mkintmodu(14,19))}; + point_t gen = {.point = mkvec2(mkintmodu(4, 19), mkintmodu(14, 19))}; point_t *generators[1] = {&gen}; curve.generators = generators; curve.ngens = 1; curve.points = generators; curve.npoints = 1; - arg_t arg = {.args="(seed, field, a, b, curve, order, gens, points) -> { if(points == ellgenerators(curve), return(1));}"}; + arg_t arg = {.args = + "(seed, field, a, b, curve, order, gens, points) -> { " + "if(points == ellgenerators(curve), return(1));}"}; int ret = gp_check(&curve, &arg, OFFSET_POINTS); - cr_assert_eq(ret, 1,); + cr_assert_eq(ret, 1, ); }
\ No newline at end of file diff --git a/test/src/math/test_subgroups.c b/test/src/math/test_subgroups.c index a4de20e..f944a4f 100644 --- a/test/src/math/test_subgroups.c +++ b/test/src/math/test_subgroups.c @@ -3,7 +3,6 @@ * Copyright (C) 2017 J08nY */ #include <criterion/criterion.h> -#include <misc/config.h> #include "gen/point.h" #include "math/subgroups.h" #include "test/default.h" diff --git a/test/src/test/memory.h b/test/src/test/memory.h index f155789..630aeb5 100644 --- a/test/src/test/memory.h +++ b/test/src/test/memory.h @@ -13,4 +13,4 @@ void *cr_memdup(const void *str, size_t len); void *cr_simple_calloc(size_t size); -#endif //ECGEN_TEST_MEMORY_H +#endif // ECGEN_TEST_MEMORY_H diff --git a/test/src/util/test_bits.c b/test/src/util/test_bits.c index 752cd59..70060c9 100644 --- a/test/src/util/test_bits.c +++ b/test/src/util/test_bits.c @@ -5,7 +5,6 @@ #include <criterion/criterion.h> #include <criterion/parameterized.h> -#include <misc/types.h> #include "test/default.h" #include "test/memory.h" #include "util/bits.h" |
