X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=t%2Fcantor.c;h=7362714c09e5ae9823acea24715059dbdfdb1c11;hb=06868ef42497f1cbc480831029f5f69b395dfdd2;hp=e6ce28fb5fae40bb2b4cfa71b32eae085637afb3;hpb=b23bb67f8c88ba23499d1c6e7b444b6561aeb49a;p=hexagon

diff --git a/t/cantor.c b/t/cantor.c
index e6ce28f..7362714 100644
--- a/t/cantor.c
+++ b/t/cantor.c
@@ -2,26 +2,26 @@
 
 #include "hexagon.h"
 
-#include "tap.h"
+#include "ctap.h"
 
 int main(void) {
-	int xy[2];
-	int ijk[3];
 	int hex;
+	struct HL_hex in;
+	struct HL_hex out;
 	int x, y;
 
-	plan_tests(81*4);
+	plan(81*2);
 
 	for (x=-4;x<=4;x++) {
 		for (y=-4;y<=4;y++) {
-			hex = HL_cantor_xy(x,y);
-			HL_cantor_arrays(hex, xy, ijk);
-			ok(x == xy[0], "x check %d %d", x, y);
-			ok(y == xy[1], "y check %d %d", x, y);
-			ok(x == HL_cantor_x(hex), "reverse check x %d %d",hex,x);
-			ok(x == HL_cantor_x(hex), "reverse check y %d %d",hex,y);
+			in.x = x;
+			in.y = y;
+			hex = HL_cantor(in);
+			out = HL_uncantor(hex);
+			is_int(x, out.x, "x check %d %d", x, y);
+			is_int(y, out.y, "y check %d %d", x, y);
 		}
 	}
 
-	return exit_status();
+	return 0;
 }