X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/b75a7d8f3b4adbae880cab104ce2c6a50eee4db2..73c04bcfe1096173b00431f0cdc742894b15eef0:/icuSources/test/intltest/tfsmalls.cpp diff --git a/icuSources/test/intltest/tfsmalls.cpp b/icuSources/test/intltest/tfsmalls.cpp index a109fd01..6cc69a01 100644 --- a/icuSources/test/intltest/tfsmalls.cpp +++ b/icuSources/test/intltest/tfsmalls.cpp @@ -1,9 +1,9 @@ -/******************************************************************** +/*********************************************************************** * COPYRIGHT: - * Copyright (c) 1997-2001, International Business Machines Corporation and - * others. All Rights Reserved. - ********************************************************************/ + * Copyright (c) 1997-2005, International Business Machines Corporation + * and others. All Rights Reserved. + ***********************************************************************/ #include "unicode/utypes.h" @@ -19,6 +19,7 @@ #include "unicode/fieldpos.h" #include "unicode/fmtable.h" +#define LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0])) /*static UBool chkstatus( UErrorCode &status, char* msg = NULL ) { @@ -31,7 +32,7 @@ void test_ParsePosition( void ) { ParsePosition* pp1 = new ParsePosition(); if (pp1 && (pp1->getIndex() == 0)) { - it_out << "PP constructor() tested." << endl; + it_logln("PP constructor() tested."); }else{ it_errln("*** PP getIndex or constructor() result"); } @@ -42,13 +43,13 @@ void test_ParsePosition( void ) int32_t to = 5; ParsePosition pp2( to ); if (pp2.getIndex() == 5) { - it_out << "PP getIndex and constructor(int32_t) tested." << endl; + it_logln("PP getIndex and constructor(int32_t) tested."); }else{ it_errln("*** PP getIndex or constructor(int32_t) result"); } pp2.setIndex( 3 ); if (pp2.getIndex() == 3) { - it_out << "PP setIndex tested." << endl; + it_logln("PP setIndex tested."); }else{ it_errln("*** PP getIndex or setIndex result"); } @@ -59,7 +60,7 @@ void test_ParsePosition( void ) pp3 = 5; ParsePosition pp4( pp3 ); if ((pp2 != pp3) && (pp3 == pp4)) { - it_out << "PP copy contructor, operator== and operator != tested." << endl; + it_logln("PP copy contructor, operator== and operator != tested."); }else{ it_errln("*** PP operator== or operator != result"); } @@ -67,7 +68,7 @@ void test_ParsePosition( void ) ParsePosition pp5; pp5 = pp4; if ((pp4 == pp5) && (!(pp4 != pp5))) { - it_out << "PP operator= tested." << endl; + it_logln("PP operator= tested."); }else{ it_errln("*** PP operator= operator== or operator != result"); } @@ -87,6 +88,10 @@ void test_FieldPosition_example( void ) UErrorCode status = U_ZERO_ERROR; DecimalFormat* fmt = (DecimalFormat*) NumberFormat::createInstance(status); + if (U_FAILURE(status)) { + it_dataerrln("NumberFormat::createInstance() error"); + return; + } fmt->setDecimalSeparatorAlwaysShown(TRUE); const int32_t tempLen = 20; @@ -102,11 +107,11 @@ void test_FieldPosition_example( void ) int32_t tempOffset = (tempLen <= (tempLen - pos.getEndIndex())) ? tempLen : (tempLen - pos.getEndIndex()); temp[tempOffset] = '\0'; - it_out << "FP " << temp << res << endl; + it_logln(UnicodeString("FP ") + UnicodeString(temp) + res); } delete fmt; - it_out << endl; + it_logln(""); } @@ -116,7 +121,7 @@ void test_FieldPosition( void ) FieldPosition fp( 7 ); if (fp.getField() == 7) { - it_out << "FP constructor(int32_t) and getField tested." << endl; + it_logln("FP constructor(int32_t) and getField tested."); }else{ it_errln("*** FP constructor(int32_t) or getField"); } @@ -137,27 +142,28 @@ void test_FieldPosition( void ) if (fp.getEndIndex() != i+7) err3 = TRUE; } if (!err1) { - it_out << "FP setField and getField tested." << endl; + it_logln("FP setField and getField tested."); }else{ it_errln("*** FP setField or getField"); } if (!err2) { - it_out << "FP setBeginIndex and getBeginIndex tested." << endl; + it_logln("FP setBeginIndex and getBeginIndex tested."); }else{ it_errln("*** FP setBeginIndex or getBeginIndex"); } if (!err3) { - it_out << "FP setEndIndex and getEndIndex tested." << endl; + it_logln("FP setEndIndex and getEndIndex tested."); }else{ it_errln("*** FP setEndIndex or getEndIndex"); } - it_out << endl; + it_logln(""); } void test_Formattable( void ) { + UErrorCode status = U_ZERO_ERROR; Formattable* ftp = new Formattable(); if (!ftp || !(ftp->getType() == Formattable::kLong) || !(ftp->getLong() == 0)) { it_errln("*** Formattable constructor or getType or getLong"); @@ -167,39 +173,76 @@ void test_Formattable( void ) Formattable fta, ftb; fta.setLong(1); ftb.setLong(2); if ((fta != ftb) || !(fta == ftb)) { - it_out << "FT setLong, operator== and operator!= tested." << endl; + it_logln("FT setLong, operator== and operator!= tested."); + status = U_ZERO_ERROR; + fta.getLong(&status); + if ( status == U_INVALID_FORMAT_ERROR){ + it_errln("*** FT getLong(UErrorCode* status) failed on real Long"); + } else { + it_logln("FT getLong(UErrorCode* status) tested."); + } }else{ it_errln("*** Formattable setLong or operator== or !="); } fta = ftb; if ((fta == ftb) || !(fta != ftb)) { - it_out << "FT operator= tested." << endl; + it_logln("FT operator= tested."); }else{ it_errln("*** FT operator= or operator== or operator!="); } fta.setDouble( 3.0 ); if ((fta.getType() == Formattable::kDouble) && (fta.getDouble() == 3.0)) { - it_out << "FT set- and getDouble tested." << endl; + it_logln("FT set- and getDouble tested."); }else{ it_errln("*** FT set- or getDouble"); } - + + fta.getDate(status = U_ZERO_ERROR); + if (status != U_INVALID_FORMAT_ERROR){ + it_errln("*** FT getDate with status should fail on non-Date"); + } fta.setDate( 4.0 ); if ((fta.getType() == Formattable::kDate) && (fta.getDate() == 4.0)) { - it_out << "FT set- and getDate tested." << endl; + it_logln("FT set- and getDate tested."); + status = U_ZERO_ERROR; + fta.getDate(status); + if ( status == U_INVALID_FORMAT_ERROR){ + it_errln("*** FT getDate with status failed on real Date"); + } else { + it_logln("FT getDate with status tested."); + } }else{ it_errln("*** FT set- or getDate"); } + status = U_ZERO_ERROR; + fta.getLong(&status); + if (status != U_INVALID_FORMAT_ERROR){ + it_errln("*** FT getLong(UErrorCode* status) should fail on non-Long"); + } + fta.setString("abc"); + const Formattable ftc(fta); UnicodeString res; - if ((fta.getType() == Formattable::kString) && (fta.getString(res) == "abc")) { - it_out << "FT set- and getString tested." << endl; - }else{ - it_errln("*** FT set- or getString"); - } + { + UBool t; + t = (fta.getType() == Formattable::kString) + && (fta.getString(res) == "abc") + && (fta.getString() == "abc"); + res = fta.getString(status = U_ZERO_ERROR); + t = t && (status != U_INVALID_FORMAT_ERROR && res == "abc"); + res = ftc.getString(status = U_ZERO_ERROR); + t = t && (status != U_INVALID_FORMAT_ERROR && res == "abc"); + ftc.getString(res,status = U_ZERO_ERROR); + t = t && (status != U_INVALID_FORMAT_ERROR && res == "abc"); + if (t) { + it_logln("FT set- and getString tested."); + }else{ + it_errln("*** FT set- or getString"); + } + } UnicodeString ucs = "unicode-string"; UnicodeString* ucs_ptr = new UnicodeString("pointed-to-unicode-string"); @@ -212,7 +255,7 @@ void test_Formattable( void ) ucs, ucs_ptr }; - const int32_t ft_cnt = (int32_t)(sizeof(ftarray) / sizeof(Formattable)); + const int32_t ft_cnt = LENGTHOF(ftarray); Formattable ft_arr( ftarray, ft_cnt ); UnicodeString temp; if ((ft_arr[0].getType() == Formattable::kDate) && (ft_arr[0].getDate() == 1.0) @@ -220,28 +263,54 @@ void test_Formattable( void ) && (ft_arr[2].getType() == Formattable::kLong) && (ft_arr[2].getLong() == (int32_t)3) && (ft_arr[3].getType() == Formattable::kString) && (ft_arr[3].getString(temp) == ucs) && (ft_arr[4].getType() == Formattable::kString) && (ft_arr[4].getString(temp) == *ucs_ptr) ) { - it_out << "FT constr. for date, double, long, ustring, ustring* and array tested" << endl; + it_logln("FT constr. for date, double, long, ustring, ustring* and array tested"); }else{ it_errln("*** FT constr. for date, double, long, ustring, ustring* or array"); } - int32_t res_cnt; + int32_t i, res_cnt; const Formattable* res_array = ft_arr.getArray( res_cnt ); if (res_cnt == ft_cnt) { UBool same = TRUE; - for (int32_t i = 0; i < res_cnt; i++ ) { + for (i = 0; i < res_cnt; i++ ) { if (res_array[i] != ftarray[i]) { same = FALSE; } } if (same) { - it_out << "FT getArray tested" << endl; + it_logln("FT getArray tested"); + res_array = ft_arr.getArray( res_cnt, status = U_ZERO_ERROR); + if (status == U_INVALID_FORMAT_ERROR){ + it_errln("*** FT getArray with status failed on real array"); + } else { + it_logln("FT getArray with status tested on real array"); + } }else{ it_errln("*** FT getArray comparison"); } }else{ - it_out << res_cnt << " " << ft_cnt << endl; - it_errln("*** FT getArray count"); + it_errln(UnicodeString("*** FT getArray count res_cnt=") + res_cnt + UnicodeString("ft_cnt=") + ft_cnt); + } + + res_array = fta.getArray(res_cnt, status = U_ZERO_ERROR); + if (status == U_INVALID_FORMAT_ERROR){ + if (res_cnt == 0 && res_array == NULL){ + it_logln("FT getArray with status tested on non array"); + } else { + it_errln("*** FT getArray with status return values are not consistent"); + } + } else { + it_errln("*** FT getArray with status should fail on non-array"); + } + + + Formattable *pf; + for(i = 0; i < ft_cnt; ++i) { + pf = ftarray[i].clone(); + if(pf == (ftarray + i) || *pf != ftarray[i]) { + it_errln("Formattable.clone() failed for item %d" + i); + } + delete pf; } const Formattable ftarr1[] = { Formattable( (int32_t)1 ), Formattable( (int32_t)2 ) }; @@ -252,18 +321,18 @@ void test_Formattable( void ) ft_arr.setArray( ftarr1, ftarr1_cnt ); if ((ft_arr[0].getType() == Formattable::kLong) && (ft_arr[0].getLong() == (int32_t)1)) { - it_out << "FT setArray tested" << endl; + it_logln("FT setArray tested"); }else{ it_errln("*** FT setArray"); } Formattable* ft_dynarr = new Formattable[ftarr2_cnt]; - for (int32_t i = 0; i < ftarr2_cnt; i++ ) { + for (i = 0; i < ftarr2_cnt; i++ ) { ft_dynarr[i] = ftarr2[i]; } if ((ft_dynarr[0].getType() == Formattable::kLong) && (ft_dynarr[0].getLong() == (int32_t)3) && (ft_dynarr[1].getType() == Formattable::kLong) && (ft_dynarr[1].getLong() == (int32_t)4)) { - it_out << "FT operator= and array operations tested" << endl; + it_logln("FT operator= and array operations tested"); }else{ it_errln("*** FT operator= or array operations"); } @@ -271,7 +340,7 @@ void test_Formattable( void ) ft_arr.adoptArray( ft_dynarr, ftarr2_cnt ); if ((ft_arr[0].getType() == Formattable::kLong) && (ft_arr[0].getLong() == (int32_t)3) && (ft_arr[1].getType() == Formattable::kLong) && (ft_arr[1].getLong() == (int32_t)4)) { - it_out << "FT adoptArray tested" << endl; + it_logln("FT adoptArray tested"); }else{ it_errln("*** FT adoptArray or operator[]"); } @@ -283,14 +352,13 @@ void test_Formattable( void ) fta.adoptString( ucs_dyn ); if ((fta.getType() == Formattable::kString) && (fta.getString(tmp2) == "ttt")) { - it_out << "FT adoptString tested" << endl; + it_logln("FT adoptString tested"); }else{ it_errln("*** FT adoptString or getString"); } fta.setLong(0); // calls 'dispose' and deletes adopted string ! - it_out << endl; - + it_logln(); } void TestFormatSmallClasses::runIndexedTest( int32_t index, UBool exec, const char* &name, char* /*par*/ )