ICU 56 update step 1

source/test/intltest/compactdecimalformattest.cpp

 /*
 *******************************************************************************
-* Copyright (C) 1997-2014, International Business Machines Corporation and    *
+* Copyright (C) 1997-2015, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 *
 * File COMPACTDECIMALFORMATTEST.CPP
 *
 ********************************************************************************
 */
 #include <stdio.h>
 #include <stdlib.h>
 
@@ skipping 79 matching lines @@
   {-1.23456789E10, "-12 \\u043C\\u0438\\u043B\\u0438\\u0458\\u0430\\u0440\\u0434\\u0438"},
   {-2.08901234E10, "-21 \\u043C\\u0438\\u043B\\u0438\\u0458\\u0430\\u0440\\u0434\\u0430"},
   {-2.18901234E10, "-22 \\u043C\\u0438\\u043B\\u0438\\u0458\\u0430\\u0440\\u0434\\u0435"},
   {-1.23456789E11, "-120 \\u043C\\u0438\\u043B\\u0438\\u0458\\u0430\\u0440\\u0434\\u0438"},
   {-1.23456789E12, "-1,2 \\u0442\\u0440\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"},
   {-1.23456789E13, "-12 \\u0442\\u0440\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"},
   {-1.23456789E14, "-120 \\u0442\\u0440\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"},
   {-1.23456789E15, "-1200 \\u0442\\u0440\\u0438\\u043B\\u0438\\u043E\\u043D\\u0430"}};
 
 static ExpectedResult kJapaneseShort[] = {
-  {1234.0, "1.2\\u5343"},
+  {1234.0, "1200"},
   {12345.0, "1.2\\u4E07"},
   {123456.0, "12\\u4E07"},
   {1234567.0, "120\\u4E07"},
   {12345678.0, "1200\\u4E07"},
   {123456789.0, "1.2\\u5104"},
   {1.23456789E9, "12\\u5104"},
   {1.23456789E10, "120\\u5104"},
   {1.23456789E11, "1200\\u5104"},
   {1.23456789E12, "1.2\\u5146"},
   {1.23456789E13, "12\\u5146"},
@@ skipping 24 matching lines @@
   {127123456.0, "130\\u00a0mil."},
   {1.27123456E9, "1,3\\u00a0mld."},
   {1.27123456E10, "13\\u00a0mld."},
   {1.27123456E11, "130\\u00a0mld."},
   {1.27123456E12, "1,3\\u00a0bil."},
   {1.27123456E13, "13\\u00a0bil."},
   {1.27123456E14, "130\\u00a0bil."}};
 
 static ExpectedResult kSkLong[] = {
   {1000.0, "1 tis\\u00edc"},
-  {1572.0, "1,6 tis\\u00edc"},
-  {5184.0, "5,2 tis\\u00edc"}};
+  {1572.0, "1,6 tis\\u00edca"},
+  {5184.0, "5,2 tis\\u00edca"}};
 
 static ExpectedResult kSwahiliShortNegative[] = {
   {-1234.0, "elfu\\u00a0-1.2"},
   {-12345.0, "elfu\\u00a0-12"},
   {-123456.0, "elfu\\u00a0-120"},
   {-1234567.0, "M-1.2"},
   {-12345678.0, "M-12"},
   {-123456789.0, "M-120"},
   {-1.23456789E9, "B-1.2"},
   {-1.23456789E10, "B-12"},
@@ skipping 18 matching lines @@
     void TestSerbianLong();
     void TestSerbianLongNegative();
     void TestJapaneseShort();
     void TestSwahiliShort();
     void TestCsShort();
     void TestSkLong();
     void TestSwahiliShortNegative();
     void TestArabicLong();
     void TestFieldPosition();
     void TestSignificantDigits();
+    void TestAPIVariants();
     void CheckLocale(
         const Locale& locale, UNumberCompactStyle style,
         const ExpectedResult* expectedResult, int32_t expectedResultLength);
     void CheckExpectedResult(
         const CompactDecimalFormat* cdf, const ExpectedResult* expectedResult,
         const char* description);
     CompactDecimalFormat* createCDFInstance(const Locale& locale, UNumberCompactStyle style, UErrorCode& status);
     static const char *StyleStr(UNumberCompactStyle style);
 };
 
 void CompactDecimalFormatTest::runIndexedTest(
     int32_t index, UBool exec, const char *&name, char *) {
   if (exec) {
     logln("TestSuite CompactDecimalFormatTest: ");
   }
   TESTCASE_AUTO_BEGIN;
   TESTCASE_AUTO(TestEnglishShort);
   TESTCASE_AUTO(TestSerbianShort);
   TESTCASE_AUTO(TestSerbianLong);
   TESTCASE_AUTO(TestSerbianLongNegative);
   TESTCASE_AUTO(TestJapaneseShort);
   TESTCASE_AUTO(TestSwahiliShort);
   TESTCASE_AUTO(TestCsShort);
   TESTCASE_AUTO(TestSkLong);
   TESTCASE_AUTO(TestSwahiliShortNegative);
   TESTCASE_AUTO(TestArabicLong);
   TESTCASE_AUTO(TestFieldPosition);
   TESTCASE_AUTO(TestSignificantDigits);
+  TESTCASE_AUTO(TestAPIVariants);
   TESTCASE_AUTO_END;
 }
 
 void CompactDecimalFormatTest::TestEnglishShort() {
   CheckLocale("en", UNUM_SHORT, kEnglishShort, UPRV_LENGTHOF(kEnglishShort));
 }
 
 void CompactDecimalFormatTest::TestSerbianShort() {
   CheckLocale("sr", UNUM_SHORT, kSerbianShort, UPRV_LENGTHOF(kSerbianShort));
 }
@@ skipping 61 matching lines @@
   }
   UnicodeString actual;
   cdf->format(123456.0, actual);
   // We expect 3 significant digits by default
   UnicodeString expected("123K", -1, US_INV);
   if (actual != expected) {
     errln(UnicodeString("Fail: Expected: ") + expected + UnicodeString(" Got: ") + actual);
   }
 }
 
+void CompactDecimalFormatTest::TestAPIVariants() {
+  UErrorCode status = U_ZERO_ERROR;
+  LocalPointer<CompactDecimalFormat> cdf(CompactDecimalFormat::createInstance("en", UNUM_SHORT, status));
+  if (U_FAILURE(status)) {
+    dataerrln("Unable to create format object - %s", u_errorName(status));
+    return;
+  }
+  UnicodeString actual;
+  FieldPosition pos;
+  FieldPositionIterator posIter;
+  UnicodeString expected("123K", -1, US_INV);
+  pos.setField(UNUM_INTEGER_FIELD);
+  
+  actual.remove();
+  pos.setBeginIndex(0);
+  pos.setEndIndex(0);
+  cdf->format((double)123456.0, actual, pos);
+  if (actual != expected || pos.getEndIndex() != 3) {
+    errln(UnicodeString("Fail format(double,UnicodeString&,FieldPosition&): Expected: \"") + expected + "\", pos 3; " +
+                                                                           "Got: \"" + actual + "\", pos " + pos.getEndIndex());
+  }
+  
+  actual.remove();
+  pos.setBeginIndex(0);
+  pos.setEndIndex(0);
+  status = U_ZERO_ERROR;
+  cdf->format((double)123456.0, actual, pos, status);
+  if (actual != expected || pos.getEndIndex() != 3 || status != U_ZERO_ERROR) {
+    errln(UnicodeString("Fail format(double,UnicodeString&,FieldPosition&,UErrorCode&): Expected: \"") + expected + "\", pos 3, status U_ZERO_ERROR; " +
+                                                              "Got: \"" + actual + "\", pos " + pos.getEndIndex() + ", status " + u_errorName(status));
+  }
+  
+  actual.remove();
+  status = U_ZERO_ERROR;
+  cdf->format((double)123456.0, actual, &posIter, status);
+  if (status != U_UNSUPPORTED_ERROR) {
+    errln(UnicodeString("Fail format(double,UnicodeString&,FieldPositionIterator*,UErrorCode&): Expected status U_UNSUPPORTED_ERROR;") +
+                                                              "Got status " + u_errorName(status));
+  }
+
+  actual.remove();
+  pos.setBeginIndex(0);
+  pos.setEndIndex(0);
+  cdf->format((int32_t)123456, actual, pos);
+  if (actual != expected || pos.getEndIndex() != 3) {
+    errln(UnicodeString("Fail format(int32_t,UnicodeString&,FieldPosition&): Expected: \"") + expected + "\", pos 3; " +
+                                                                           "Got: \"" + actual + "\", pos " + pos.getEndIndex());
+  }
+  
+  actual.remove();
+  pos.setBeginIndex(0);
+  pos.setEndIndex(0);
+  status = U_ZERO_ERROR;
+  cdf->format((int32_t)123456, actual, pos, status);
+  if (actual != expected || pos.getEndIndex() != 3 || status != U_ZERO_ERROR) {
+    errln(UnicodeString("Fail format(int32_t,UnicodeString&,FieldPosition&,UErrorCode&): Expected: \"") + expected + "\", pos 3, status U_ZERO_ERROR; " +
+                                                              "Got: \"" + actual + "\", pos " + pos.getEndIndex() + ", status " + u_errorName(status));
+  }
+  
+  actual.remove();
+  status = U_ZERO_ERROR;
+  cdf->format((int32_t)123456, actual, &posIter, status);
+  if (status != U_UNSUPPORTED_ERROR) {
+    errln(UnicodeString("Fail format(int32_t,UnicodeString&,FieldPositionIterator*,UErrorCode&): Expected status U_UNSUPPORTED_ERROR;") +
+                                                              "Got status " + u_errorName(status));
+  }
+
+  actual.remove();
+  pos.setBeginIndex(0);
+  pos.setEndIndex(0);
+  cdf->format((int64_t)123456, actual, pos);
+  if (actual != expected || pos.getEndIndex() != 3) {
+    errln(UnicodeString("Fail format(int64_t,UnicodeString&,FieldPosition&): Expected: \"") + expected + "\", pos 3; " +
+                                                                           "Got: \"" + actual + "\", pos " + pos.getEndIndex());
+  }
+  
+  actual.remove();
+  pos.setBeginIndex(0);
+  pos.setEndIndex(0);
+  status = U_ZERO_ERROR;
+  cdf->format((int64_t)123456, actual, pos, status);
+  if (actual != expected || pos.getEndIndex() != 3 || status != U_ZERO_ERROR) {
+    errln(UnicodeString("Fail format(int64_t,UnicodeString&,FieldPosition&,UErrorCode&): Expected: \"") + expected + "\", pos 3, status U_ZERO_ERROR; " +
+                                                              "Got: \"" + actual + "\", pos " + pos.getEndIndex() + ", status " + u_errorName(status));
+  }
+  
+  actual.remove();
+  status = U_ZERO_ERROR;
+  cdf->format((int64_t)123456, actual, &posIter, status);
+  if (status != U_UNSUPPORTED_ERROR) {
+    errln(UnicodeString("Fail format(int64_t,UnicodeString&,FieldPositionIterator*,UErrorCode&): Expected status U_UNSUPPORTED_ERROR;") +
+                                                              "Got status " + u_errorName(status));
+  }
+
+}
+
 void CompactDecimalFormatTest::CheckLocale(const Locale& locale, UNumberCompactStyle style, const ExpectedResult* expectedResults, int32_t expectedResultLength) {
   UErrorCode status = U_ZERO_ERROR;
   LocalPointer<CompactDecimalFormat> cdf(createCDFInstance(locale, style, status));
   if (U_FAILURE(status)) {
     dataerrln("Unable to create format object - %s", u_errorName(status));
     return;
   }
   char description[256];
   sprintf(description,"%s - %s", locale.getName(), StyleStr(style));
   for (int32_t i = 0; i < expectedResultLength; i++) {
@@ skipping 31 matching lines @@
     return kShortStr;
   }
   return kLongStr;
 }
 
 extern IntlTest *createCompactDecimalFormatTest() {
   return new CompactDecimalFormatTest();
 }
 
 #endif