Updated tests

Author: rijnb

README.md

@@ -62,7 +62,7 @@ decode Mapcodes.
 
 This produces the following help text:
 
-    MAPCODE (version 2.5.1)
+    MAPCODE (version 2.5.2)
     Copyright (C) 2014-2016 Stichting Mapcode Foundation
 
     Usage:
@@ -138,6 +138,10 @@ footprint, for example for embedded applications.
 
 ## Release Notes
 
+### 2.5.2
+
+* Added locale support. 
+
 ### 2.5.1
 
 * Updated unit test to compile with plain C and added some test cases. 

mapcodelib/mapcode_alphabets.h

@@ -57,7 +57,7 @@ enum Alphabet {
     ALPHABET_ODIA,
     ALPHABET_KANNADA,
     ALPHABET_GUJARATI,
-    _ALPHABET_MAX,
+    _ALPHABET_MAX
 };
 
 #ifdef __cplusplus

mapcodelib/mapcoder.c

@@ -26,6 +26,10 @@
 #include "internal_territory_names_local.h"
 #include "internal_alphabet_recognizer.h"
 
+// We must have a default language
+#define MAPCODE_SUPPORT_LANGUAGE_EN
+#define DEFAULT_TERRITORY_FULL_NAME TERRITORY_FULL_NAME_EN
+
 #include "internal_territory_names_da.h"
 #include "internal_territory_names_de.h"
 #include "internal_territory_names_en.h"
@@ -106,6 +110,19 @@ static const double METERS_PER_DEGREE_LON = EARTH_CIRCUMFERENCE_X / 360.0;
 
 static const int DEBUG_STOP_AT = -1; // to externally test-restrict internal encoding, do not use!
 
+typedef struct {
+    const char *locale;
+    const char **territoryFullNames;
+} LocaleRegistryItem;
+
+static const LocaleRegistryItem LOCALE_REGISTRY[] = {
+        {"DA", TERRITORY_FULL_NAME_DA},
+        {"DE", TERRITORY_FULL_NAME_DE},
+        {"EN", TERRITORY_FULL_NAME_EN},
+        {"FR", TERRITORY_FULL_NAME_FR},
+        {"NL", TERRITORY_FULL_NAME_NL}
+};
+
 // important information about the 8 parents
 static const char *PARENTS_3 = "USA,IND,CAN,AUS,MEX,BRA,RUS,CHN,";
 static const char *PARENTS_2 = "US,IN,CA,AU,MX,BR,RU,CN,";
@@ -3023,19 +3040,6 @@ const TerritoryAlphabets *getAlphabetsForTerritory(enum Territory territory) {
 //
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-typedef struct {
-    const char* locale;
-    const char** territoryFullnames;
-} LocaleRegistryItem;
-
-static const LocaleRegistryItem LOCALE_REGISTRY[] = {
-        { "DA", TERRITORY_FULL_NAME_DA },
-        { "DE", TERRITORY_FULL_NAME_DE },
-        { "EN", TERRITORY_FULL_NAME_EN },
-        { "FR", TERRITORY_FULL_NAME_FR },
-        { "NL", TERRITORY_FULL_NAME_NL }
-};
-
 static int getFullTerritoryName_internal(
         char *territoryName,
         enum Territory territory,
@@ -3046,34 +3050,42 @@ static int getFullTerritoryName_internal(
     const char *s;
     const char *pipePtr;
     const char **namelist = NULL;
-    char localeUpper[3] = "";
 
     ASSERT(territoryName);
 
-    if ((!locale && (strlen(locale) < 2)) || alternative < 0 || territory <= _TERRITORY_MIN || territory >= _TERRITORY_MAX) {
+    if (alternative < 0 || territory <= _TERRITORY_MIN || territory >= _TERRITORY_MAX) {
         *territoryName = 0;
         return 0;
     }
-    localeUpper[0] = locale[0];
-    localeUpper[1] = locale[1];
-    localeUpper[2] = 0;
 
     if (locale == NULL) {
+
+        // Use local names if locale is null.
         namelist = TERRITORY_FULL_NAME_LOCAL;
+    } else if (strlen(locale) < 2) {
+
+        // Locale is invalid.
+        namelist = NULL;
     } else {
+
+        // Try and get correct list.
+        char localeUpper[3] = "";
         int i;
+        localeUpper[0] = locale[0];
+        localeUpper[1] = locale[1];
+        localeUpper[2] = 0;
         namelist = NULL;
         for (i = 0; i < (int) (sizeof(LOCALE_REGISTRY) / sizeof(LOCALE_REGISTRY[0])); ++i) {
-            if (strcmp(LOCALE_REGISTRY[i].locale, localeUpper)) {
-                namelist = LOCALE_REGISTRY[i].territoryFullnames;
+            if (!strcmp(LOCALE_REGISTRY[i].locale, localeUpper)) {
+                namelist = LOCALE_REGISTRY[i].territoryFullNames;
                 break;
             }
         }
     }
 
+    // Use English if locale is invalid.
     if (namelist == NULL || namelist[0] == NULL) {
-        *territoryName = 0;
-        return 0;
+        namelist = DEFAULT_TERRITORY_FULL_NAME;
     }
 
     s = namelist[INDEX_OF_TERRITORY(territory)];

mapcodelib/mapcoder.h

@@ -25,7 +25,7 @@ extern "C" {
 #include "mapcode_alphabets.h"
 
 
-#define MAPCODE_C_VERSION          "2.5.1"
+#define MAPCODE_C_VERSION          "2.5.2"
 #define UWORD                      unsigned short int  // 2-byte unsigned integer.
 #define MAX_NR_OF_MAPCODE_RESULTS  22          // Max. number of results ever returned by encoder (e.g. for 26.904899, 95.138515).
 #define MAX_PROPER_MAPCODE_LEN     11          // Max. number of characters in a proper mapcode (including the dot, excl. precision extension).
@@ -104,7 +104,7 @@ enum MapcodeError {
 
     // all OK.
 
-    ERR_OK = 0,
+    ERR_OK = 0
 };
 
 

test/run_all.sh

@@ -5,7 +5,7 @@ date | tee -a $OUT
 echo "" | tee -a $OUT
 ./run_normal.sh | tee -a $OUT
 ./run_sanitizer.sh | tee -a $OUT
-./run_gcov.h | tee -a $OUT
+./run_gcov.sh | tee -a $OUT
 ./run_gprof.sh | tee -a $OUT
 ./run_valgrind.sh | tee -a $OUT
 ./run_compare.sh | tee -a $OUT

test/unittest.c

@@ -1633,7 +1633,7 @@ static int testGetFullTerritoryNameInLocale(const char *locale, const char *expe
     if (strcmp(expectedName, gotName)) {
         char s[MAX_ISOCODE_LEN + 1];
         foundError();
-        printf("*** ERROR *** getFullTerritoryNameInLocaleEnglish error, expected name '%s', but got '%s' for territory %s, alternative %d\n",
+        printf("*** ERROR *** getFullTerritoryNameInLocale error, expected name '%s', but got '%s' for territory %s, alternative %d\n",
                expectedName, gotName, getTerritoryIsoName(s, territory, 0), alternative);
     }
     ++nrTests;
@@ -1732,18 +1732,25 @@ int testGetFullTerritoryName(void) {
     int i;
     char territoryName[2048]; // large so we can test overflow
     static const char *locales_to_test[] = { 
-        "DA", "DE", "EN", "FR", "NL", 
-        "LOCAL" 
-    };
+        "DA", "DE", "EN", "FR", "NL"};
 
-    nrTests += testGetFullTerritoryNameInLocale("??", "", TERRITORY_VAT, 0);
+    nrTests += testGetFullTerritoryNameInLocale(NULL, "Vatican", TERRITORY_VAT, 0);
+    nrTests += testGetFullTerritoryNameInLocale("", "Vatican", TERRITORY_VAT, 0);
+    nrTests += testGetFullTerritoryNameInLocale("E", "Vatican", TERRITORY_VAT, 0);
+    nrTests += testGetFullTerritoryNameInLocale("EN", "Vatican", TERRITORY_VAT, 0);
+    nrTests += testGetFullTerritoryNameInLocale("??", "Vatican", TERRITORY_VAT, 0);
 
-    for (i = 0; i < (int) (sizeof(locales_to_test) / sizeof(const char *)); i++) {
+    for (i = 0; i < (int) (sizeof(locales_to_test) / sizeof(locales_to_test[0])); i++) {
         const char *locale = locales_to_test[i];
         int nrInLocale = 0;
         nrTests += testGetFullTerritoryNameInLocale(locale, "", _TERRITORY_MIN, 0);
         nrTests += testGetFullTerritoryNameInLocale(locale, "", _TERRITORY_MAX, 0);
-        for (territory = _TERRITORY_MIN + 1; territory < _TERRITORY_MAX; ++territory) {
+//        for (territory = _TERRITORY_MIN + 1; territory < _TERRITORY_MAX; ++territory) {
+        for (territory = TERRITORY_NLD; territory < TERRITORY_EST; ++territory) {
+            char expectedName[MAX_TERRITORY_FULLNAME_LEN + 1];
+            getFullTerritoryNameInLocale(expectedName, territory, 0, 0);
+            nrTests += testGetFullTerritoryNameInLocale(locale, expectedName, territory, 0);
+            nrTests += testGetFullTerritoryNameInLocale("", expectedName, territory, 0);
             nrTests += testGetFullTerritoryNameInLocale(locale, "", territory, -1);
             nrTests += testGetFullTerritoryNameInLocale(locale, "", territory, 999);
             for (alternative = 0;; alternative++) {
@@ -1765,7 +1772,6 @@ int testGetFullTerritoryName(void) {
                 }
             }
         }
-        fprintf(stderr,"  %d names in locale %s\n", nrInLocale, locale); //TODO @@@
     }
 
 #ifdef MAPCODE_SUPPORT_LANGUAGE_LOCAL

utility/mapcode.cpp

@@ -45,7 +45,10 @@
 #include <ctype.h>
 #include <time.h>
 #include "../mapcodelib/mapcoder.h"
-#include "../mapcodelib/internal_territory_names_english.h"
+
+#define MAPCODE_SUPPORT_LANGUAGE_EN
+
+#include "../mapcodelib/internal_territory_names_en.h"
 #include "../mapcodelib/internal_data.h"
 #include "../mapcodelib/internal_iso3166_data.h"
 
@@ -558,7 +561,7 @@ int main(const int argc, const char **argv) {
             printf(",");
 
             // Use internal knowledge of TERRITORY_FULL_NAME to show aliases of full territory name.
-            char *names = strdup(TERRITORY_FULL_NAME[INDEX_OF_TERRITORY(ccode)]);
+            char *names = strdup(TERRITORY_FULL_NAME_EN[INDEX_OF_TERRITORY(ccode)]);
             char *s = names;
             while (s) {
                 if (s != names) {