ICU-511.34.tar.gz

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

diff --git a/icuSources/test/intltest/tsdate.cpp b/icuSources/test/intltest/tsdate.cpp
index c4dd672da147c8802752da1e9f4d069e31a32c20..bdff3d194e45cf0e4d56b7b98abfab7930fa4ebf 100644 (file)
--- a/icuSources/test/intltest/tsdate.cpp
+++ b/icuSources/test/intltest/tsdate.cpp
@@ -1,8 +1,7 @@
-/********************************************************************
- * COPYRIGHT: 
- * Copyright (c) 1997-2001, International Business Machines Corporation and
- * others. All Rights Reserved.
- ********************************************************************/
+/***********************************************************************
+ * Copyright (c) 1997-2009, International Business Machines Corporation
+ * and others. All Rights Reserved.
+ ***********************************************************************/

 
 #include "unicode/utypes.h"
 
 
 #include "unicode/utypes.h"
 


@@ -11,12 +10,16 @@
 #include "unicode/datefmt.h"
 #include "unicode/smpdtfmt.h"
 #include "tsdate.h"
 #include "unicode/datefmt.h"
 #include "unicode/smpdtfmt.h"
 #include "tsdate.h"

+#include "putilimp.h"

 
 #include <float.h>
 #include <stdlib.h>
 
 #include <float.h>
 #include <stdlib.h>

+#include <math.h>

 
 const double IntlTestDateFormat::ONEYEAR = 365.25 * ONEDAY; // Approximate
 
 
 const double IntlTestDateFormat::ONEYEAR = 365.25 * ONEDAY; // Approximate
 

+IntlTestDateFormat::~IntlTestDateFormat() {}
+

 /**
  * This test does round-trip testing (format -> parse -> format -> parse -> etc.) of
  * DateFormat.
 /**
  * This test does round-trip testing (format -> parse -> format -> parse -> etc.) of
  * DateFormat.


@@ -109,7 +112,7 @@ void IntlTestDateFormat::testFormat(/* char* par */)
 {
     if (fFormat == 0)
     {
 {
     if (fFormat == 0)
     {

-        errln("FAIL: DateFormat creation failed");
+        dataerrln("FAIL: DateFormat creation failed");

         return;
     }
 
         return;
     }
 


@@ -150,6 +153,9 @@ void IntlTestDateFormat::tryDate(UDate theDate)
     int32_t dateMatch = 0;
     int32_t stringMatch = 0;
     UBool dump = FALSE;
     int32_t dateMatch = 0;
     int32_t stringMatch = 0;
     UBool dump = FALSE;

+#if defined (U_CAL_DEBUG)
+    dump = TRUE;
+#endif

     int32_t i;
 
     date[0] = theDate;
     int32_t i;
 
     date[0] = theDate;


@@ -208,7 +214,7 @@ void IntlTestDateFormat::tryDate(UDate theDate)
         }
     }
 }
         }
     }
 }

-    
+

 // Return a random double from 0.01 to 1, inclusive
 double IntlTestDateFormat::randDouble()
 {
 // Return a random double from 0.01 to 1, inclusive
 double IntlTestDateFormat::randDouble()
 {


@@ -229,7 +235,7 @@ double IntlTestDateFormat::randDouble()
             d = -d;
         if (d > 0.0)
         {
             d = -d;
         if (d > 0.0)
         {

-            double e = uprv_floor(uprv_log10(d));
+            double e = uprv_floor(log10(d));

             if (e < -2.0)
                 d *= uprv_pow10((int32_t)(-e-2));
             else if (e > -1.0)
             if (e < -2.0)
                 d *= uprv_pow10((int32_t)(-e-2));
             else if (e > -1.0)


@@ -257,7 +263,7 @@ void IntlTestDateFormat::testAvailableLocales(/* char* par */)
         }
         logln(all);
     }
         }
         logln(all);
     }

-    else errln((UnicodeString)"**** FAIL: Zero available locales or null array pointer");
+    else dataerrln((UnicodeString)"**** FAIL: Zero available locales or null array pointer");

 }
 
 void IntlTestDateFormat::monsterTest(/*char *par*/)
 }
 
 void IntlTestDateFormat::monsterTest(/*char *par*/)