35 files changed, 36 insertions, 7 deletions

diff --git a/test/020_io_B32_read_write/00_garbage.in b/test/020_io_H48_read_write/00_garbage.in
index 9ac203a..9ac203a 100644
--- a/test/020_io_B32_read_write/00_garbage.in
+++ b/test/020_io_H48_read_write/00_garbage.in
diff --git a/test/020_io_B32_read_write/00_garbage.out b/test/020_io_H48_read_write/00_garbage.out
index 5b9114e..5b9114e 100644
--- a/test/020_io_B32_read_write/00_garbage.out
+++ b/test/020_io_H48_read_write/00_garbage.out
diff --git a/test/021_io_H48_read_write/01_solved_oneline.in b/test/020_io_H48_read_write/01_solved_oneline.in
index dff224d..dff224d 100644
--- a/test/021_io_H48_read_write/01_solved_oneline.in
+++ b/test/020_io_H48_read_write/01_solved_oneline.in
diff --git a/test/021_io_H48_read_write/01_solved_oneline.out b/test/020_io_H48_read_write/01_solved_oneline.out
index dff224d..dff224d 100644
--- a/test/021_io_H48_read_write/01_solved_oneline.out
+++ b/test/020_io_H48_read_write/01_solved_oneline.out
diff --git a/test/021_io_H48_read_write/02_solved_oneline_whitespace.in b/test/020_io_H48_read_write/02_solved_oneline_whitespace.in
index 5d10368..5d10368 100644
--- a/test/021_io_H48_read_write/02_solved_oneline_whitespace.in
+++ b/test/020_io_H48_read_write/02_solved_oneline_whitespace.in
diff --git a/test/021_io_H48_read_write/02_solved_oneline_whitespace.out b/test/020_io_H48_read_write/02_solved_oneline_whitespace.out
index dff224d..dff224d 100644
--- a/test/021_io_H48_read_write/02_solved_oneline_whitespace.out
+++ b/test/020_io_H48_read_write/02_solved_oneline_whitespace.out
diff --git a/test/021_io_H48_read_write/03_solved_multiline.in b/test/020_io_H48_read_write/03_solved_multiline.in
index 9f9652b..9f9652b 100644
--- a/test/021_io_H48_read_write/03_solved_multiline.in
+++ b/test/020_io_H48_read_write/03_solved_multiline.in
diff --git a/test/021_io_H48_read_write/03_solved_multiline.out b/test/020_io_H48_read_write/03_solved_multiline.out
index dff224d..dff224d 100644
--- a/test/021_io_H48_read_write/03_solved_multiline.out
+++ b/test/020_io_H48_read_write/03_solved_multiline.out
diff --git a/test/021_io_H48_read_write/04_unsolvable_ep.in b/test/020_io_H48_read_write/04_unsolvable_ep.in
index 8483962..8483962 100644
--- a/test/021_io_H48_read_write/04_unsolvable_ep.in
+++ b/test/020_io_H48_read_write/04_unsolvable_ep.in
diff --git a/test/021_io_H48_read_write/04_unsolvable_ep.out b/test/020_io_H48_read_write/04_unsolvable_ep.out
index e35c6e4..e35c6e4 100644
--- a/test/021_io_H48_read_write/04_unsolvable_ep.out
+++ b/test/020_io_H48_read_write/04_unsolvable_ep.out
diff --git a/test/021_io_H48_read_write/05_unsolvable_eo.in b/test/020_io_H48_read_write/05_unsolvable_eo.in
index a92089d..a92089d 100644
--- a/test/021_io_H48_read_write/05_unsolvable_eo.in
+++ b/test/020_io_H48_read_write/05_unsolvable_eo.in
diff --git a/test/021_io_H48_read_write/05_unsolvable_eo.out b/test/020_io_H48_read_write/05_unsolvable_eo.out
index e35c6e4..e35c6e4 100644
--- a/test/021_io_H48_read_write/05_unsolvable_eo.out
+++ b/test/020_io_H48_read_write/05_unsolvable_eo.out
diff --git a/test/021_io_H48_read_write/06_unsolvable_cp.in b/test/020_io_H48_read_write/06_unsolvable_cp.in
index 2085dd5..2085dd5 100644
--- a/test/021_io_H48_read_write/06_unsolvable_cp.in
+++ b/test/020_io_H48_read_write/06_unsolvable_cp.in
diff --git a/test/021_io_H48_read_write/06_unsolvable_cp.out b/test/020_io_H48_read_write/06_unsolvable_cp.out
index e35c6e4..e35c6e4 100644
--- a/test/021_io_H48_read_write/06_unsolvable_cp.out
+++ b/test/020_io_H48_read_write/06_unsolvable_cp.out
diff --git a/test/021_io_H48_read_write/07_unsolvable_co.in b/test/020_io_H48_read_write/07_unsolvable_co.in
index abd74e2..abd74e2 100644
--- a/test/021_io_H48_read_write/07_unsolvable_co.in
+++ b/test/020_io_H48_read_write/07_unsolvable_co.in
diff --git a/test/021_io_H48_read_write/07_unsolvable_co.out b/test/020_io_H48_read_write/07_unsolvable_co.out
index e35c6e4..e35c6e4 100644
--- a/test/021_io_H48_read_write/07_unsolvable_co.out
+++ b/test/020_io_H48_read_write/07_unsolvable_co.out
diff --git a/test/021_io_H48_read_write/08_unsolved.in b/test/020_io_H48_read_write/08_unsolved.in
index c992ce7..c992ce7 100644
--- a/test/021_io_H48_read_write/08_unsolved.in
+++ b/test/020_io_H48_read_write/08_unsolved.in
diff --git a/test/021_io_H48_read_write/08_unsolved.out b/test/020_io_H48_read_write/08_unsolved.out
index 8c132cf..8c132cf 100644
--- a/test/021_io_H48_read_write/08_unsolved.out
+++ b/test/020_io_H48_read_write/08_unsolved.out
diff --git a/test/021_io_H48_read_write/io_H48_tests.c b/test/020_io_H48_read_write/io_H48_tests.c
index 705356c..705356c 100644
--- a/test/021_io_H48_read_write/io_H48_tests.c
+++ b/test/020_io_H48_read_write/io_H48_tests.c
diff --git a/test/021_io_B32_write/00_solved.in b/test/021_io_B32_write/00_solved.in
new file mode 100644
index 0000000..dff224d
--- /dev/null
+++ b/test/021_io_B32_write/00_solved.in
@@ -0,0 +1 @@
+UF0 UB0 DB0 DF0 UR0 UL0 DL0 DR0 FR0 FL0 BL0 BR0 UFR0 UBL0 DFL0 DBR0 UFL0 UBR0 DFR0 DBL0
diff --git a/test/020_io_B32_read_write/01_solved.in b/test/021_io_B32_write/00_solved.out
index e1df94b..e1df94b 100644
--- a/test/020_io_B32_read_write/01_solved.in
+++ b/test/021_io_B32_write/00_solved.out
diff --git a/test/021_io_B32_write/01_F.in b/test/021_io_B32_write/01_F.in
new file mode 100644
index 0000000..e805af8
--- /dev/null
+++ b/test/021_io_B32_write/01_F.in
@@ -0,0 +1 @@
+FL1 UB0 DB0 FR1 UR0 UL0 DL0 DR0 UF1 DF1 BL0 BR0 UFL1 UBL0 DFR1 DBR0 DFL2 UBR0 UFR2 DBL0
diff --git a/test/020_io_B32_read_write/02_F.in b/test/021_io_B32_write/01_F.out
index 1677251..1677251 100644
--- a/test/020_io_B32_read_write/02_F.in
+++ b/test/021_io_B32_write/01_F.out
diff --git a/test/021_io_B32_write/02_scrambled.in b/test/021_io_B32_write/02_scrambled.in
new file mode 100644
index 0000000..6a05bbc
--- /dev/null
+++ b/test/021_io_B32_write/02_scrambled.in
@@ -0,0 +1 @@
+FL0 DB0 UB1 FR0 UR0 DF0 UF0 BR1 UL1 BL1 DL0 DR0 DFR1 UFR1 UBR1 UFL2 DBR2 DFL0 DBL2 UBL0
diff --git a/test/020_io_B32_read_write/03_scrambled.in b/test/021_io_B32_write/02_scrambled.out
index ed442fe..ed442fe 100644
--- a/test/020_io_B32_read_write/03_scrambled.in
+++ b/test/021_io_B32_write/02_scrambled.out
diff --git a/test/020_io_B32_read_write/io_B32_tests.c b/test/021_io_B32_write/io_B32_read_tests.c
index 1953453..3ff81b1 100644
--- a/test/020_io_B32_read_write/io_B32_tests.c
+++ b/test/021_io_B32_write/io_B32_read_tests.c
@@ -1,12 +1,15 @@
 #include "../test.h"
 
 int main(void) {
-        char str[STRLENMAX];
+        char str[STRLENMAX], *aux;
         cube_t cube;
 
-        fgets(str, STRLENMAX, stdin);
+        aux = str;
+        while (fgets(aux, STRLENMAX, stdin) != NULL)
+                while (*aux != '\n')
+                        aux++;
 
-        cube = readcube("B32", str);
+        cube = readcube("H48", str);
 
         if (iserror(cube)) {
                 printf("Error reading cube\n");
diff --git a/test/021_io_H48_read_write/00_garbage.in b/test/021_io_H48_read_write/00_garbage.in
deleted file mode 100644
index 9ac203a..0000000
--- a/test/021_io_H48_read_write/00_garbage.in
+++ /dev/null
@@ -1,3 +0,0 @@
-FUF0 UBBBR2 k4
-hello
-garbage
diff --git a/test/021_io_H48_read_write/00_garbage.out b/test/021_io_H48_read_write/00_garbage.out
deleted file mode 100644
index 5b9114e..0000000
--- a/test/021_io_H48_read_write/00_garbage.out
+++ /dev/null
@@ -1 +0,0 @@
-Error reading cube
diff --git a/test/020_io_B32_read_write/01_solved.out b/test/022_io_B32_read/00_solved.in
index e1df94b..e1df94b 100644
--- a/test/020_io_B32_read_write/01_solved.out
+++ b/test/022_io_B32_read/00_solved.in
diff --git a/test/022_io_B32_read/00_solved.out b/test/022_io_B32_read/00_solved.out
new file mode 100644
index 0000000..dff224d
--- /dev/null
+++ b/test/022_io_B32_read/00_solved.out
@@ -0,0 +1 @@
+UF0 UB0 DB0 DF0 UR0 UL0 DL0 DR0 FR0 FL0 BL0 BR0 UFR0 UBL0 DFL0 DBR0 UFL0 UBR0 DFR0 DBL0
diff --git a/test/020_io_B32_read_write/02_F.out b/test/022_io_B32_read/01_F.in
index 1677251..1677251 100644
--- a/test/020_io_B32_read_write/02_F.out
+++ b/test/022_io_B32_read/01_F.in
diff --git a/test/022_io_B32_read/01_F.out b/test/022_io_B32_read/01_F.out
new file mode 100644
index 0000000..e805af8
--- /dev/null
+++ b/test/022_io_B32_read/01_F.out
@@ -0,0 +1 @@
+FL1 UB0 DB0 FR1 UR0 UL0 DL0 DR0 UF1 DF1 BL0 BR0 UFL1 UBL0 DFR1 DBR0 DFL2 UBR0 UFR2 DBL0
diff --git a/test/020_io_B32_read_write/03_scrambled.out b/test/022_io_B32_read/02_scrambled.in
index ed442fe..ed442fe 100644
--- a/test/020_io_B32_read_write/03_scrambled.out
+++ b/test/022_io_B32_read/02_scrambled.in
diff --git a/test/022_io_B32_read/02_scrambled.out b/test/022_io_B32_read/02_scrambled.out
new file mode 100644
index 0000000..6a05bbc
--- /dev/null
+++ b/test/022_io_B32_read/02_scrambled.out
@@ -0,0 +1 @@
+FL0 DB0 UB1 FR0 UR0 DF0 UF0 BR1 UL1 BL1 DL0 DR0 DFR1 UFR1 UBR1 UFL2 DBR2 DFL0 DBL2 UBL0
diff --git a/test/022_io_B32_read/io_B32_read_tests.c b/test/022_io_B32_read/io_B32_read_tests.c
new file mode 100644
index 0000000..cf987f7
--- /dev/null
+++ b/test/022_io_B32_read/io_B32_read_tests.c
@@ -0,0 +1,24 @@
+#include "../test.h"
+
+int main(void) {
+        char str[STRLENMAX], *aux;
+        cube_t cube;
+
+        aux = str;
+        while (fgets(aux, STRLENMAX, stdin) != NULL)
+                while (*aux != '\n')
+                        aux++;
+
+        cube = readcube("B32", str);
+
+        if (iserror(cube)) {
+                printf("Error reading cube\n");
+        } else if (!issolvable(cube)) {
+                printf("Cube is not solvable\n");
+        } else {
+                writecube("H48", cube, str);
+                printf("%s\n", str);
+        }
+
+        return 0;
+}