ICU 56 update step 1

source/test/intltest/locnmtst.cpp

 /*********************************************************************
  * COPYRIGHT:
  * Copyright (c) 2010-2014, International Business Machines Corporation and
  * others. All Rights Reserved.
  *********************************************************************/
 
 #include "locnmtst.h"
 #include "cstring.h"
 
 /*
@@ skipping 55 matching lines @@
     switch (index) {
 #if !UCONFIG_NO_FORMATTING
         TESTCASE(0, TestCreate);
         TESTCASE(1, TestCreateDialect);
         TESTCASE(2, TestWithKeywordsAndEverything);
         TESTCASE(3, TestUldnOpen);
         TESTCASE(4, TestUldnOpenDialect);
         TESTCASE(5, TestUldnWithKeywordsAndEverything);
         TESTCASE(6, TestUldnComponents);
         TESTCASE(7, TestRootEtc);
-        TESTCASE(8, TestKeywords);
-        TESTCASE(9, TestUntranslatedKeywords);
-        TESTCASE(10, TestPrivateUse);
-        TESTCASE(11, TestUldnDisplayContext);
+        TESTCASE(8, TestCurrencyKeyword);
+        TESTCASE(9, TestUnknownCurrencyKeyword);
+        TESTCASE(10, TestUntranslatedKeywords);
+        TESTCASE(11, TestPrivateUse);
+        TESTCASE(12, TestUldnDisplayContext);
 #endif
         default:
             name = "";
             break;
     }
 }
 
 #if !UCONFIG_NO_FORMATTING
 void LocaleDisplayNamesTest::TestCreate() {
   UnicodeString temp;
@@ skipping 15 matching lines @@
   UnicodeString temp;
   LocaleDisplayNames *ldn = LocaleDisplayNames::createInstance(Locale::getUS());
   const char *locname = "en_Hant_US_VALLEY@calendar=gregorian;collation=phonebook";
   const char *target = "English (Traditional, United States, VALLEY, "
     "Gregorian Calendar, Phonebook Sort Order)";
   ldn->localeDisplayName(locname, temp);
   delete ldn;
   test_assert_equal(target, temp);
 }
 
-void LocaleDisplayNamesTest::TestKeywords() {
+void LocaleDisplayNamesTest::TestCurrencyKeyword() {
+  UnicodeString temp;
+  LocaleDisplayNames *ldn = LocaleDisplayNames::createInstance(Locale::getUS());
+  const char *locname = "ja@currency=JPY";
+  const char *target = "Japanese (Japanese Yen)";
+  ldn->localeDisplayName(locname, temp);
+  delete ldn;
+  test_assert_equal(target, temp);
+}
+
+void LocaleDisplayNamesTest::TestUnknownCurrencyKeyword() {
   UnicodeString temp;
   LocaleDisplayNames *ldn = LocaleDisplayNames::createInstance(Locale::getUS());
   const char *locname = "de@currency=XYZ";
   const char *target = "German (Currency: XYZ)";
   ldn->localeDisplayName(locname, temp);
   delete ldn;
   test_assert_equal(target, temp);
 }
 
 void LocaleDisplayNamesTest::TestUntranslatedKeywords() {
@@ skipping 249 matching lines @@
   ldn->languageDisplayName("root", temp);
   test_assert_equal("root", temp);
 
   ldn->languageDisplayName("en_GB", temp);
   test_assert_equal("en_GB", temp);
 
   delete ldn;
 }
 
 #endif   /*  UCONFIG_NO_FORMATTING */