ICU 56 update step 1

source/test/intltest/tzfmttst.cpp

 /*
 *******************************************************************************
-* Copyright (C) 2007-2014, International Business Machines Corporation and    *
+* Copyright (C) 2007-2015, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 */
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
 
 #include "tzfmttst.h"
 
 #include "simplethread.h"
@@ skipping 657 matching lines @@
     data.index = 0;
     data.testCounts = testCounts;
     data.times = times;
     data.locales = LOCALES;
     data.nLocales = nLocales;
     data.quick = quick;
     data.START_TIME = START_TIME;
     data.END_TIME = END_TIME;
     data.numDone = 0;
 
-#if (ICU_USE_THREADS==0)
-    TestTimeRoundTripThread fakeThread(*this, data, 0);
-    fakeThread.run();
-#else
-    TestTimeRoundTripThread **threads = new TestTimeRoundTripThread*[threadCount];
+    TestTimeRoundTripThread **threads = new TestTimeRoundTripThread*[nThreads];
     int32_t i;
     for (i = 0; i < nThreads; i++) {
         threads[i] = new TestTimeRoundTripThread(*this, data, i);
         if (threads[i]->start() != 0) {
             errln("Error starting thread %d", i);
         }
     }
 
-    UBool done = false;
-    while (true) {
-        umtx_lock(NULL);
-        if (data.numDone == nLocales) {
-            done = true;
-        }
-        umtx_unlock(NULL);
-        if (done)
-            break;
-        SimpleThread::sleep(1000);
+    for (i = 0; i < nThreads; i++) {
+        threads[i]->join();
+    }
+    if (data.numDone != nLocales) {
+        errln("%s:%d data.numDone = %d, nLocales = %d", __FILE__, __LINE__, data.numDone, nLocales);
     }
 
     for (i = 0; i < nThreads; i++) {
         delete threads[i];
     }
     delete [] threads;
 
-#endif
     UDate total = 0;
     logln("### Elapsed time by patterns ###");
     for (int32_t i = 0; i < NUM_PATTERNS; i++) {
         logln(UnicodeString("") + data.times[i] + "ms (" + PATTERNS[i] + ")");
         total += data.times[i];
     }
     logln((UnicodeString) "Total: " + total + "ms");
     logln((UnicodeString) "Iteration: " + data.testCounts);
 
     delete cal;
@@ skipping 231 matching lines @@
     };
 
     const int32_t MIN_OFFSET_UNIT[] = {
         60000, 60000, 60000, 1000, 1000,
         60000, 60000, 60000, 1000, 1000,
         1000,
     };
 
     // Formatting
     UErrorCode status = U_ZERO_ERROR;
-    LocalPointer<SimpleDateFormat> sdf(new SimpleDateFormat(status));
+    LocalPointer<SimpleDateFormat> sdf(new SimpleDateFormat(status), status);
     if (U_FAILURE(status)) {
         dataerrln("Fail new SimpleDateFormat: %s", u_errorName(status));
         return;
     }
     UDate d = Calendar::getNow();
 
     for (uint32_t i = 0; i < sizeof(OFFSET)/sizeof(OFFSET[0]); i++) {
         SimpleTimeZone* tz = new SimpleTimeZone(OFFSET[i], UnicodeString("Zone Offset:") + OFFSET[i] + "ms");
         sdf->adoptTimeZone(tz);
         for (int32_t j = 0; PATTERN[j] != 0; j++) {
@@ skipping 252 matching lines @@
         assertEquals(UnicodeString("Format result for ") + DATA[i].tzid + " (Test Case " + i + ")", expected, out);
         if (DATA[i].timeType != timeType) {
             dataerrln(UnicodeString("Formatted time zone type (Test Case ") + i + "), returned="
                 + timeType + ", expected=" + DATA[i].timeType);
         }
     }
 }
 
 
 #endif /* #if !UCONFIG_NO_FORMATTING */