From bd3c0f2c2b052b9e2af890f45eda5cb2ca3d5dba Mon Sep 17 00:00:00 2001 From: George Rhoten Date: Tue, 20 Feb 2001 17:33:05 +0000 Subject: [PATCH] ICU-760 Remove the version check X-SVN-Rev: 3688 --- icu4c/source/test/intltest/numfmtst.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/icu4c/source/test/intltest/numfmtst.cpp b/icu4c/source/test/intltest/numfmtst.cpp index b5c97dede6f..07eeedeee92 100644 --- a/icu4c/source/test/intltest/numfmtst.cpp +++ b/icu4c/source/test/intltest/numfmtst.cpp @@ -764,6 +764,7 @@ void NumberFormatTest::TestPad(void) { expect(new DecimalFormat("##0.0####*_ g-m/s^2", US, status), 1.0/3, "0.33333__ g-m/s^2", status); + // Test padding before a sign const char *formatStr = "*x#,###,###,##0.0#;*x(###,###,##0.0#)"; expect(new DecimalFormat(formatStr, US, status), int32_t(-10), "xxxxxxxxxx(10.0)", status); @@ -782,7 +783,6 @@ void NumberFormatTest::TestPad(void) { expect(new DecimalFormat(formatStr, US, status), -1252045600.37,"(1,252,045,600.37)", status); - expect(new DecimalFormat(formatStr, US, status), int32_t(10), "xxxxxxxxxxxx10.0", status); expect(new DecimalFormat(formatStr, US, status), @@ -800,13 +800,8 @@ void NumberFormatTest::TestPad(void) { expect(new DecimalFormat(formatStr, US, status), 10252045600.37,"10,252,045,600.37", status); -// Use jitterbug 760 for checking in these fixes. - UnicodeString icuVersionCurr(U_ICU_VERSION); - UnicodeString icuVersion("1.7"); -if (icuVersionCurr == icuVersion) { - logln("Not testing TestPad() at this time, fix in a later release"); -} -else { + + // Test padding between a sign and a number const char *formatStr2 = "#,###,###,##0.0#*x;(###,###,##0.0#*x)"; expect(new DecimalFormat(formatStr2, US, status), int32_t(-10), "(10.0xxxxxxxxxx)", status); @@ -825,7 +820,6 @@ else { expect(new DecimalFormat(formatStr2, US, status), -1252045600.37,"(1,252,045,600.37)", status); - expect(new DecimalFormat(formatStr2, US, status), int32_t(10), "10.0xxxxxxxxxxxx", status); expect(new DecimalFormat(formatStr2, US, status), @@ -842,7 +836,6 @@ else { 112045600.37, "112,045,600.37xx", status); expect(new DecimalFormat(formatStr2, US, status), 10252045600.37,"10,252,045,600.37", status); -} //testing the setPadCharacter(UnicodeString) and getPadCharacterString() DecimalFormat fmt("#", US, status);