Add the custom CM method, finally working.

1 files changed, 15 insertions, 15 deletions

diff --git a/test/src/cm/test_custom.c b/test/src/cm/test_custom.c
index dd331e6..c94657d 100644
--- a/test/src/cm/test_custom.c
+++ b/test/src/cm/test_custom.c
@@ -5,36 +5,36 @@
 
 #include <criterion/criterion.h>
 #include "cm/custom.h"
-#include "misc/config.h"
+#include "obj/curve.h"
 #include "test/default.h"
 #include "test/input.h"
+#include "test/output.h"
 #include "util/random.h"
 
 void custom_setup() {
 	default_setup();
 	input_setup();
+	output_setup();
 	random_init();
 }
 
-void custom_teardown() { input_teardown(); }
+void custom_teardown() {
+	default_teardown();
+	input_teardown();
+	output_teardown();
+}
 
 TestSuite(custom, .init = custom_setup, .fini = custom_teardown);
 
 Test(custom, test_curve_one) {
-	cr_skip("Doesnt work yet.");
-	cfg->bits = 128;
-	cfg->cm_order = "263473633827487324648193013259296339349";
-	cfg->random = false;
-
-	fprintf(write_in, "191345683451069598953886857691544477637\n");
-	custom_curve();
-}
-
-Test(custom, test_curve_other) {
-	cr_skip("Doesnt work yet.");
 	cfg->bits = 128;
 	cfg->cm_order = "263473633827487324648193013259296339349";
-	cfg->random = true;
+	GEN order = strtoi(cfg->cm_order);
+	cfg->random = RANDOM_ALL;
 
-	custom_curve();
+	curve_t *curve = custom_curve();
+	cr_assert_not_null(curve, );
+	cr_assert(equalii(curve->order, order), );
+	cr_assert(equalii(ellcard(curve->curve, NULL), order), );
+	curve_free(&curve);
 }
\ No newline at end of file