ICU-511.27.tar.gz

[apple/icu.git] / icuSources / test / intltest / calcasts.cpp

diff --git a/icuSources/test/intltest/calcasts.cpp b/icuSources/test/intltest/calcasts.cpp
index 83cb6b123e73c96f794fe89c9eddd1ceae5bdad2..aa10d7def6b17d53ee3d4afaef75162bb46a8c42 100644 (file)
--- a/icuSources/test/intltest/calcasts.cpp
+++ b/icuSources/test/intltest/calcasts.cpp
@@ -1,6 +1,6 @@
 /********************************************************************
  * COPYRIGHT: 
 /********************************************************************
  * COPYRIGHT: 

- * Copyright (c) 2003-2008, International Business Machines Corporation 
+ * Copyright (c) 2003-2013, International Business Machines Corporation 

  * and others. All Rights Reserved.
  ********************************************************************
  * Calendar Case Test is a type of CalendarTest which compares the 
  * and others. All Rights Reserved.
  ********************************************************************
  * Calendar Case Test is a type of CalendarTest which compares the 


@@ -164,14 +164,14 @@ void CalendarCaseTest::IslamicCivil()
 
     UErrorCode status = U_ZERO_ERROR;
     Calendar *c = Calendar::createInstance("ar@calendar=islamic-civil", status);
 
     UErrorCode status = U_ZERO_ERROR;
     Calendar *c = Calendar::createInstance("ar@calendar=islamic-civil", status);

+    if (failure(status, "Calendar::createInstance", TRUE)) return;

     c->setLenient(TRUE);
     doTestCases(tests, c);
 
     static const UChar expectedUChars[] = {
     c->setLenient(TRUE);
     doTestCases(tests, c);
 
     static const UChar expectedUChars[] = {

-        0x0627, 0x0644, 0x062e, 0x0645, 0x064a, 0x0633, 0x060c, 0x0020, 0x0662, 0x0662,
-        0x0020, 0x0634, 0x0648, 0x0627, 0x0644, 0x060c, 0x0020, 0x0661, 0x0663, 0x0668,
-        0x0669, 0
-    };
+        0x0627, 0x0644, 0x062e, 0x0645, 0x064a, 0x0633, 0x060c, 0x0020, 0x0662, 0x0662, 0x0020,
+        0x0634, 0x0648, 0x0627, 0x0644,  0x060c, 0x0020, 0x0661, 0x0663, 0x0668, 0x0669, 0x0020, 0x0647, 0x0640, 0
+     };

     UnicodeString result;
     DateFormat *fmt = DateFormat::createDateInstance(DateFormat::kFull, Locale("ar_JO@calendar=islamic-civil"));
     if (fmt == NULL) {
     UnicodeString result;
     DateFormat *fmt = DateFormat::createDateInstance(DateFormat::kFull, Locale("ar_JO@calendar=islamic-civil"));
     if (fmt == NULL) {


@@ -295,6 +295,7 @@ void CalendarCaseTest::Hebrew() {
 
     UErrorCode status = U_ZERO_ERROR;
     Calendar *c = Calendar::createInstance("he_HE@calendar=hebrew", status);
 
     UErrorCode status = U_ZERO_ERROR;
     Calendar *c = Calendar::createInstance("he_HE@calendar=hebrew", status);

+    if (failure(status, "Calendar::createInstance", TRUE)) return;

     c->setLenient(TRUE);
     doTestCases(tests, c);
 
     c->setLenient(TRUE);
     doTestCases(tests, c);
 


@@ -380,6 +381,7 @@ void CalendarCaseTest::Indian() {
 
     UErrorCode status = U_ZERO_ERROR;
     Calendar *c = Calendar::createInstance("hi_IN@calendar=indian", status);
 
     UErrorCode status = U_ZERO_ERROR;
     Calendar *c = Calendar::createInstance("hi_IN@calendar=indian", status);

+    if (failure(status, "Calendar::createInstance", TRUE)) return;

     c->setLenient(TRUE);
     doTestCases(tests, c);
 
     c->setLenient(TRUE);
     doTestCases(tests, c);
 


@@ -423,6 +425,8 @@ void CalendarCaseTest::Coptic() {
 
     UErrorCode status = U_ZERO_ERROR;
     Calendar *c = Calendar::createInstance("cop_EG@calendar=coptic", status);
 
     UErrorCode status = U_ZERO_ERROR;
     Calendar *c = Calendar::createInstance("cop_EG@calendar=coptic", status);

+    if (failure(status, "Calendar::createInstance", TRUE)) return;
+

     c->setLenient(TRUE);
     doTestCases(tests, c);
 
     c->setLenient(TRUE);
     doTestCases(tests, c);
 


@@ -470,6 +474,7 @@ void CalendarCaseTest::Ethiopic() {
 
     UErrorCode status = U_ZERO_ERROR;
     Calendar *c = Calendar::createInstance("am_ET@calendar=ethiopic", status);
 
     UErrorCode status = U_ZERO_ERROR;
     Calendar *c = Calendar::createInstance("am_ET@calendar=ethiopic", status);

+    if (failure(status, "Calendar::createInstance", TRUE)) return;

     c->setLenient(TRUE);
     doTestCases(tests, c);
 
     c->setLenient(TRUE);
     doTestCases(tests, c);
 


@@ -485,6 +490,7 @@ void CalendarCaseTest::Ethiopic() {
         }
     }
     c = Calendar::createInstance("am_ET@calendar=ethiopic-amete-alem", status);
         }
     }
     c = Calendar::createInstance("am_ET@calendar=ethiopic-amete-alem", status);

+    if (failure(status, "Calendar::createInstance", TRUE)) return;

     c->setLenient(TRUE);
     doTestCases(tests, c);
 
     c->setLenient(TRUE);
     doTestCases(tests, c);