Implement seed parsing for ANSI X9.62 algo. Refactor IO test layers.

2 files changed, 32 insertions, 47 deletions

diff --git a/test/src/io/test_cli.c b/test/src/io/test_cli.c
index c90bbfa..1c7a208 100644
--- a/test/src/io/test_cli.c
+++ b/test/src/io/test_cli.c
@@ -3,26 +3,25 @@
  * Copyright (C) 2017 J08nY
  */
 
-#include "test/utils.h"
-#include "io/cli.h"
-#include "io/config.h"
 #include <criterion/criterion.h>
 #include <unistd.h>
+#include "io/cli.h"
+#include "io/config.h"
+#include "test/default.h"
 
 static struct argp test_argp = {cli_options, cli_parse, cli_args_doc,
-								cli_doc, 0, cli_filter};
+                                cli_doc,     0,         cli_filter};
 
 TestSuite(cli, .init = default_setup, .fini = default_teardown);
 
-
 Test(cli, test_memory) {
 	int argc = 4;
 	char *argv[] = {"ecgen", "--memory=2k", "--fp", "1"};
 	config_t cfg;
 	memset(&cfg, 0, sizeof(cfg));
 	int ret = argp_parse(&test_argp, argc, argv, 0, 0, &cfg);
-	cr_assert_eq(ret, 0,);
-	cr_assert_eq(cfg.memory, 2000,);
+	cr_assert_eq(ret, 0, );
+	cr_assert_eq(cfg.memory, 2000, );
 }
 
 Test(cli, test_thread_memory) {
@@ -31,8 +30,8 @@ Test(cli, test_thread_memory) {
 	config_t cfg;
 	memset(&cfg, 0, sizeof(cfg));
 	int ret = argp_parse(&test_argp, argc, argv, 0, 0, &cfg);
-	cr_assert_eq(ret, 0,);
-	cr_assert_eq(cfg.thread_memory, 2000,);
+	cr_assert_eq(ret, 0, );
+	cr_assert_eq(cfg.thread_memory, 2000, );
 }
 
 Test(cli, test_threads) {
@@ -41,8 +40,8 @@ Test(cli, test_threads) {
 	config_t cfg;
 	memset(&cfg, 0, sizeof(cfg));
 	int ret = argp_parse(&test_argp, argc, argv, 0, 0, &cfg);
-	cr_assert_eq(ret, 0,);
-	cr_assert_eq(cfg.threads, 2,);
+	cr_assert_eq(ret, 0, );
+	cr_assert_eq(cfg.threads, 2, );
 }
 
 Test(cli, test_auto_threads) {
@@ -51,6 +50,6 @@ Test(cli, test_auto_threads) {
 	config_t cfg;
 	memset(&cfg, 0, sizeof(cfg));
 	int ret = argp_parse(&test_argp, argc, argv, 0, 0, &cfg);
-	cr_assert_eq(ret, 0,);
-	cr_assert_eq(cfg.threads, sysconf(_SC_NPROCESSORS_ONLN),);
+	cr_assert_eq(ret, 0, );
+	cr_assert_eq(cfg.threads, sysconf(_SC_NPROCESSORS_ONLN), );
 }
\ No newline at end of file
diff --git a/test/src/io/test_input.c b/test/src/io/test_input.c
index de4ac0f..d32d71c 100644
--- a/test/src/io/test_input.c
+++ b/test/src/io/test_input.c
@@ -3,92 +3,78 @@
  * Copyright (C) 2017 J08nY
  */
 
-#include "test/utils.h"
-#include "io/input.h"
-#include "io/output.h"
 #include <criterion/criterion.h>
+#include "io/input.h"
+#include "test/default.h"
+#include "test/input.h"
+#include "test/output.h"
 
-static FILE *write_in;
-
-void input_setup() {
+void input_suite_setup(void) {
 	default_setup();
-	config_t cfg;
-	memset(&cfg, 0, sizeof(cfg));
-
-	cfg.output = "/dev/null";
-	input_init(&cfg);
-	output_init(&cfg);
-
-	int in_fd[2];
-	pipe(in_fd);
-
-	write_in = fdopen(in_fd[1], "w");
-	setlinebuf(write_in);
-	in = fdopen(in_fd[0], "r");
-	err = fopen("/dev/null", "w");
+	input_setup();
+	output_setup();
 }
 
-void input_teardown() {
+void input_suite_teardown(void) {
 	default_teardown();
-	input_quit();
-	output_quit();
-	fclose(write_in);
+	input_teardown();
+	output_teardown();
 }
 
-TestSuite(input, .init = input_setup, .fini = input_teardown);
+TestSuite(input, .init = input_suite_setup, .fini = input_suite_teardown);
 
 Test(input, test_prime) {
 	fprintf(write_in, "5\n");
 	GEN p = input_prime(NULL, 10);
-	cr_assert(gequal(p, stoi(5)),);
+	cr_assert(gequal(p, stoi(5)), );
 }
 
 Test(input, test_prime_nan) {
 	fprintf(write_in, "....\n");
 	GEN p = input_prime(NULL, 10);
-	cr_assert(gequal(p, gen_m1),);
+	cr_assert(gequal(p, gen_m1), );
 }
 
 Test(input, test_prime_nonprime) {
 	fprintf(write_in, "6\n");
 	GEN p = input_prime(NULL, 10);
-	cr_assert(gequal(p, gen_m1),);
+	cr_assert(gequal(p, gen_m1), );
 }
 
 Test(input, test_prime_newline) {
 	fprintf(write_in, "\n");
 	GEN p = input_prime(NULL, 10);
-	cr_assert(gequal(p, gen_m1),);
+	cr_assert(gequal(p, gen_m1), );
 }
 
 Test(input, test_int) {
 	fprintf(write_in, "256\n");
 	GEN i = input_int(NULL, 10);
-	cr_assert(gequal(i, stoi(256)),);
+	cr_assert(gequal(i, stoi(256)), );
 }
 
 Test(input, test_int_too_big) {
 	fprintf(write_in, "256\n");
 	GEN i = input_int(NULL, 4);
-	cr_assert(gequal(i, gen_m1),);
+	cr_assert(gequal(i, gen_m1), );
 }
 
 Test(input, test_int_newline) {
 	fprintf(write_in, "\n");
 	GEN i = input_int(NULL, 4);
-	cr_assert(gequal(i, gen_m1),);
+	cr_assert(gequal(i, gen_m1), );
 }
 
 Test(input, test_str) {
 	fprintf(write_in, "something\n");
 	GEN s = input_string(NULL);
 	GEN expected = strtoGENstr("something");
-	cr_assert(gequal(s, expected),);
+	cr_assert(gequal(s, expected), );
 }
 
 Test(input, test_str_newline) {
 	fprintf(write_in, "\n");
 	GEN s = input_string(NULL);
 	GEN expected = strtoGENstr("");
-	cr_assert(gequal(s, expected),);
+	cr_assert(gequal(s, expected), );
 }