From 2fad79165cf5f1d5c260a81def392576708d0b4d Mon Sep 17 00:00:00 2001
From: George Rhoten <grhoten@users.noreply.github.com>
Date: Sun, 22 Jun 2003 13:11:20 +0000
Subject: [PATCH] ICU-2801 Use locmap.c on all platforms instead of locale data
 for LCID mappings.

X-SVN-Rev: 12541
---
 icu4c/source/test/cintltst/cloctst.c | 31 +++++++++-------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/icu4c/source/test/cintltst/cloctst.c b/icu4c/source/test/cintltst/cloctst.c
index baa1da1c6f..36cb7a9405 100644
--- a/icu4c/source/test/cintltst/cloctst.c
+++ b/icu4c/source/test/cintltst/cloctst.c
@@ -26,13 +26,10 @@
 #include "cintltst.h"
 #include "cstring.h"
 #include "unicode/ures.h"
+#include "locmap.h"
 
 #define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0]))
 
-#ifdef WIN32
-#include "locmap.h"
-#endif
-
 static void TestNullDefault(void);
 static void VerifyTranslation(void);
 void PrintDataTable();
@@ -408,7 +405,6 @@ setUpDataTable();
         if (strcmp(temp2, rawData2[LCID][i]) != 0) {
             log_err("LCID mismatch: %s versus %s\n", temp2 , rawData2[LCID][i]);
         }
-
     }
 
  free(expected);
@@ -1081,6 +1077,14 @@ static void TestObsoleteNames(void)
         }
     }
 
+    if (uloc_getLCID("iw_IL") != uloc_getLCID("he_IL")) {
+        log_err("he,iw LCID mismatch: %X versus %X\n", uloc_getLCID("iw_IL"), uloc_getLCID("he_IL"));
+    }
+
+    if (uloc_getLCID("iw") != uloc_getLCID("he")) {
+        log_err("he,iw LCID mismatch: %X versus %X\n", uloc_getLCID("iw"), uloc_getLCID("he"));
+    }
+
 #if 0
 
     i = uloc_getLanguage("kok",NULL,0,&icu_err);
@@ -1475,8 +1479,6 @@ TestKeyInRootRecursive(UResourceBundle *root, const char *rootName,
 }
 
 
-#ifdef WIN32
-
 static void
 testLCID(UResourceBundle *currentBundle,
          const char *localeName)
@@ -1487,17 +1489,8 @@ testLCID(UResourceBundle *currentBundle,
     char lcidStringC[64] = {0};
     int32_t lcidStringLen = 0;
     const UChar *lcidString = NULL;
-    UResourceBundle *localeID = ures_getByKey(currentBundle, "LocaleID", NULL, &status);
-
-    expectedLCID = ures_getInt(localeID, &status);
-    ures_close(localeID);
-
-    if (U_FAILURE(status)) {
-        log_err("ERROR:   %s does not have a LocaleID (%s)\n",
-            localeName, u_errorName(status));
-        return;
-    }
 
+    expectedLCID = uloc_getLCID(localeName);
     lcid = uprv_convertToLCID(localeName, &status);
     if (U_FAILURE(status)) {
         if (expectedLCID == 0) {
@@ -1543,8 +1536,6 @@ testLCID(UResourceBundle *currentBundle,
     }
 }
 
-#endif
-
 static void
 TestLocaleStructure(void) {
     UResourceBundle *root, *completeLoc, *currentLocale, *subtable, *completeSubtable;
@@ -1621,9 +1612,7 @@ TestLocaleStructure(void) {
         subtable = ures_getByKey(currentLocale, "Currencies", NULL, &errorCode);
         TestKeyInRootRecursive(completeSubtable, "en", subtable, currLoc);
 
-#ifdef WIN32
         testLCID(currentLocale, currLoc);
-#endif
 
         ures_close(completeSubtable);
         ures_close(subtable);