Improved unit test

Author: rijnb

CMakeLists.txt

@@ -11,9 +11,19 @@ set(SOURCE_FILES
     mapcodelib/mapcode_fastalpha.h
     mapcodelib/mapcoder.c
     mapcodelib/mapcoder.h
-    unitttest/decode_test.h
-    unitttest/test_territories.c
-    unitttest/unittest.c
+    unittest/decode_test.h
+    unittest/test_territories.c
+    unittest/unittest.c
     utility/mapcode.cpp)
 
-add_executable(mapcode_cpp ${SOURCE_FILES})
+set(SOURCE_FILES_UNITTEST
+        unittest/unittest.c)
+
+set(SOURCE_FILES_UTILITY
+        utility/mapcode.cpp)
+
+add_executable(all ${SOURCE_FILES})
+
+add_executable(unittest ${SOURCE_FILES_UNITTEST})
+
+add_executable(mapcode ${SOURCE_FILES_UTILITY})

unittest/unittest.c

@@ -40,16 +40,16 @@ static void alphabet_tests() {
     printf("%d alphabets\n", MAPCODE_ALPHABETS_TOTAL);
 
     for (i = 0; i < MAPCODE_ALPHABETS_TOTAL; i++) {
-        UWORD enc[64];
-        char dec[64];
+        UWORD enc[69];
+        char dec[69];
 
         // see if convertToAlphabet survives empty string
         nrTests++;
         str = "";
         convertToAlphabet(enc, 64, str, i);
         if (*enc) {
             nrErrors++;
-            printf("*** ERROR *** convertToAlphabet(\"%s\",%d) = \"%s\"\n", str, i, dec);
+            printf("*** ERROR *** empty string: convertToAlphabet(\"%s\",%d) = \"%s\"\n", str, i, dec);
         }
         else {
             // see if empty UTF16 converts to empty string
@@ -62,40 +62,38 @@ static void alphabet_tests() {
         }
 
         // see if alphabets (re)convert as expected
-        str = "OEUoi OIoi#%?-.abcdfghjklmnpqrstvwxyz0123456789ABCDFGHJKLMNPQRSTVWXYZ";
-        expect = "OEUoi OIOI#%?-.ABCDFGHJKLMNPQRSTVWXYZ0123456789ABCDFGHJKLMN";
-        convertToAlphabet(enc, 64, str, i);
-        convertToRoman(dec, 60, enc);
+        str    = "OEUoi OIoi#%?-.abcdfghjklmnpqrstvwxyz0123456789ABCDFGHJKLMNPQRSTVWXYZ";
+        expect = "OEUoi OIOI#%?-.ABCDFGHJKLMNPQRSTVWXYZ0123456789ABCDFGHJKLMNPQRSTVWXYZ";
+        convertToAlphabet(enc, sizeof(enc), str, i);
+        convertToRoman(dec, sizeof(dec), enc);
         nrTests++;
         if (strlen(dec) != 59 || strcmp(dec, expect)) {
             nrErrors++;
-            printf("*** ERROR *** convertToRoman(convertToAlphabet(\"%s\",%d))=\"%s\"\n", str, i, dec);
+            printf("*** ERROR *** all chars: convertToRoman(convertToAlphabet(\"%s\",%d))=\"%s\", expected=\"%s\"\n", str, i, dec, expect);
         }
 
         // see if E/U voweled mapcodes (re)convert as expected
         str = "OMN 112.3EU";
-        convertToAlphabet(enc, 64, str, i);
-        convertToRoman(dec, 64, enc);
+        convertToAlphabet(enc, sizeof(enc), str, i);
+        convertToRoman(dec, sizeof(dec), enc);
         nrTests++;
         if (strcmp(dec, str) != 0) {
             nrErrors++;
-            printf("*** ERROR *** convertToRoman(convertToAlphabet(\"%s\",%d))=\"%s\"\n", str, i, dec);
+            printf("*** ERROR *** vowels EU: convertToRoman(convertToAlphabet(\"%s\",%d))=\"%s\", expected=\"%s\"\n", str, i, dec, expect);
         }
         else {
             nrTests++;
             {
                 str = "  Oio 112.3AU  ";
-                convertToAlphabet(enc, 64, str, i);
-                convertToRoman(dec, 64, enc);
+                convertToAlphabet(enc, sizeof(enc), str, i);
+                convertToRoman(dec, sizeof(dec), enc);
                 nrTests++;
                 if (strcmp(dec, "Oio 112.3AU") != 0) {
                     nrErrors++;
-                    printf("*** ERROR *** convertToRoman(convertToAlphabet(\"%s\",%d))=\"%s\"\n", str, i, dec);
+                    printf("*** ERROR *** vowels AU: convertToRoman(convertToAlphabet(\"%s\",%d))=\"%s\"\n", str, i, dec);
                 }
             }
         }
-
-
     }
 }