]> granicus.if.org Git - icu/commitdiff
ICU-11632 fix compilation error in calregts.cpp
authorAndy Heninger <andy.heninger@gmail.com>
Wed, 6 Sep 2017 18:38:22 +0000 (18:38 +0000)
committerAndy Heninger <andy.heninger@gmail.com>
Wed, 6 Sep 2017 18:38:22 +0000 (18:38 +0000)
X-SVN-Rev: 40371

icu4c/source/test/intltest/calregts.cpp

index 8896b61c509a663fc09007345b9682ca156eb9f7..17fc81425c4305a882141a57814601acc253a404 100644 (file)
@@ -2945,46 +2945,46 @@ void CalendarRegressionTest::TestT9452(void) {
         logln(UnicodeString("-1 day: ") + dstr);
         assertEquals("Subtract 1 day", UnicodeString("2011-12-29T00:00:00-10:00"), dstr);
     }
-
-    /**
-         * @bug ticket 11632
-         */
-          void CalendarRegressionTest::TestT11632(void) {
-             UErrorCode status = U_ZERO_ERROR;
-             GregorianCalendar cal(TimeZone::createTimeZone("Pacific/Apia"), status);
-             if(U_FAILURE(status)) {
-                 dataerrln("Error creating Calendar: %s", u_errorName(status));
-                 return;
-             }
-             failure(status, "Calendar::createInstance(status)");
-             cal.clear();
-             failure(status, "clear calendar");
-             cal.set(UCAL_HOUR, 597);
-             failure(status, "set hour value in calendar");
-             SimpleDateFormat sdf(UnicodeString("y-MM-dd'T'HH:mm:ss"), status);
-             failure(status, "initializing SimpleDateFormat");
-             sdf.setCalendar(cal);
-             UnicodeString dstr;
-             UDate d = cal.getTime(status);
-             if (!failure(status, "getTime for date")) {
-                 sdf.format(d, dstr);
-                 std::string utf8;
-                 dstr.toUTF8String(utf8);
-                 assertEquals("correct datetime displayed for hour value", UnicodeString("1970-01-25T21:00:00"), dstr);
-                 cal.clear();
-                 failure(status, "clear calendar");
-                 cal.set(UCAL_HOUR, 300);
-               failure(status, "set hour value in calendar");
-                 sdf.setCalendar(cal);
-                 d = cal.getTime(status);
-                 if (!failure(status, "getTime for initial date")) {
-                     dstr.remove();
-                     sdf.format(d, dstr);
-                     dstr.toUTF8String(utf8);
-                     assertEquals("correct datetime displayed for hour value", UnicodeString("1970-01-13T12:00:00"), dstr);
-                 }
-             }
-    } 
 }
 
+/**
+ * @bug ticket 11632
+ */
+void CalendarRegressionTest::TestT11632(void) {
+    UErrorCode status = U_ZERO_ERROR;
+    GregorianCalendar cal(TimeZone::createTimeZone("Pacific/Apia"), status);
+    if(U_FAILURE(status)) {
+        dataerrln("Error creating Calendar: %s", u_errorName(status));
+        return;
+    }
+    failure(status, "Calendar::createInstance(status)");
+    cal.clear();
+    failure(status, "clear calendar");
+    cal.set(UCAL_HOUR, 597);
+    failure(status, "set hour value in calendar");
+    SimpleDateFormat sdf(UnicodeString("y-MM-dd'T'HH:mm:ss"), status);
+    failure(status, "initializing SimpleDateFormat");
+    sdf.setCalendar(cal);
+    UnicodeString dstr;
+    UDate d = cal.getTime(status);
+    if (!failure(status, "getTime for date")) {
+        sdf.format(d, dstr);
+        std::string utf8;
+        dstr.toUTF8String(utf8);
+        assertEquals("correct datetime displayed for hour value", UnicodeString("1970-01-25T21:00:00"), dstr);
+        cal.clear();
+        failure(status, "clear calendar");
+        cal.set(UCAL_HOUR, 300);
+        failure(status, "set hour value in calendar");
+        sdf.setCalendar(cal);
+        d = cal.getTime(status);
+        if (!failure(status, "getTime for initial date")) {
+            dstr.remove();
+            sdf.format(d, dstr);
+            dstr.toUTF8String(utf8);
+            assertEquals("correct datetime displayed for hour value", UnicodeString("1970-01-13T12:00:00"), dstr);
+        }
+    }
+} 
+
 #endif /* #if !UCONFIG_NO_FORMATTING */