Clean up

3 files changed, 25 insertions, 19 deletions

diff --git a/test/030_move/move_tests.c b/test/030_move/move_tests.c
index 497ac6c..b940ecb 100644
--- a/test/030_move/move_tests.c
+++ b/test/030_move/move_tests.c
@@ -4,13 +4,21 @@ cube_t applymoves(cube_t, char *);
 
 int main(void) {
         char movestr[STRLENMAX], cubestr[STRLENMAX];
+        int i, n;
+        move_t moves[STRLENMAX];
         cube_t cube;
 
         fgets(movestr, STRLENMAX, stdin);
         fgets(cubestr, STRLENMAX, stdin);
         cube = cube_read("H48", cubestr);
 
-        cube = applymoves(cube, movestr);
+        n = cube_readmoves(movestr, moves);
+
+        if (n == -1)
+                printf("Error reading moves!\n");
+
+        for (i = 0; i < n; i++)
+                cube = cube_move(cube, moves[i]);
 
         if (cube_error(cube)) {
                 printf("Error moving cube\n");
diff --git a/test/060_transform/transform_tests.c b/test/060_transform/transform_tests.c
index 454bc22..1748d6d 100644
--- a/test/060_transform/transform_tests.c
+++ b/test/060_transform/transform_tests.c
@@ -5,12 +5,14 @@ cube_t applytrans(cube_t, char *);
 int main(void) {
         char cubestr[STRLENMAX], transtr[STRLENMAX];
         cube_t cube;
+        trans_t t;
 
         fgets(transtr, STRLENMAX, stdin);
         fgets(cubestr, STRLENMAX, stdin);
         cube = cube_read("H48", cubestr);
 
-        cube = applytrans(cube, transtr);
+        t = cube_readtrans(transtr);
+        cube = cube_transform(cube, t);
 
         if (cube_error(cube)) {
                 printf("Error transforming cube\n");
diff --git a/test/061_inverse_trans/inverse_trans_tests.c b/test/061_inverse_trans/inverse_trans_tests.c
index 7de8f66..725e2f9 100644
--- a/test/061_inverse_trans/inverse_trans_tests.c
+++ b/test/061_inverse_trans/inverse_trans_tests.c
@@ -1,36 +1,32 @@
 #include "../test.h"
 
-uint8_t readtrans(char *);
-uint8_t inverse_trans(uint8_t);
-cube_t applymoves(cube_t, char *);
-cube_t applytrans(cube_t, char *);
-extern char *transstr[];
-
 int main(void) {
-        uint8_t t, tinv;
+        uint8_t t, tinv, tt;
         cube_t cube;
 
         for (t = 0; t < 48; t++) {
                 cube = cube_new();
-                cube = applymoves(cube, "R");
-                cube = applymoves(cube, "U");
-                cube = applymoves(cube, "F");
+                cube = cube_move(cube, R);
+                cube = cube_move(cube, U);
+                cube = cube_move(cube, F);
 
-                cube = applytrans(cube, transstr[t]);
-                tinv = inverse_trans(t);
-                cube = applytrans(cube, transstr[tinv]);
+                tt = cube_readtrans(cube_transstr(t));
+                cube = cube_transform(cube, tt);
+                tinv = cube_inversetrans(t);
+                tt = cube_readtrans(cube_transstr(tinv));
+                cube = cube_transform(cube, tt);
 
                 if (cube_error(cube)) {
                         printf("Error transforming cube\n");
                 } else if (!cube_solvable(cube)) {
                         printf("Transformed cube is not solvable\n");
                 } else {
-                        cube = applymoves(cube, "F'");
-                        cube = applymoves(cube, "U'");
-                        cube = applymoves(cube, "R'");
+                        cube = cube_move(cube, F3);
+                        cube = cube_move(cube, U3);
+                        cube = cube_move(cube, R3);
                         if (!cube_solved(cube))
                                 printf("%s: Error! Got %" PRIu8 "\n",
-                                    transstr[t], tinv);
+                                    cube_transstr(t), tinv);
                 }
         }