From 570986cb96605618437a729bd785e83378abe275 Mon Sep 17 00:00:00 2001 From: Scott Russell Date: Mon, 16 Sep 2013 14:29:41 +0000 Subject: [PATCH] ICU-10261 give DateFormat more granular leniency control (fix failing test on non-Windows platform) X-SVN-Rev: 34329 --- icu4c/source/test/intltest/dtfmttst.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/icu4c/source/test/intltest/dtfmttst.cpp b/icu4c/source/test/intltest/dtfmttst.cpp index d364c3c2e40..a31a4fe0bb8 100644 --- a/icu4c/source/test/intltest/dtfmttst.cpp +++ b/icu4c/source/test/intltest/dtfmttst.cpp @@ -4209,11 +4209,11 @@ void DateFormatTest::TestDateFormatLeniency() { const TestDateFormatLeniencyItem items[] = { //locale leniency parse String pattern expected result { "en", true, UnicodeString("2008-07 02"), UnicodeString("yyyy-LLLL dd"), UnicodeString("2008-July 02") }, - { "en", false, UnicodeString("2008-07 02"), UnicodeString("yyyy-LLLL dd"), NULL }, + { "en", false, UnicodeString("2008-07 02"), UnicodeString("yyyy-LLLL dd"), UnicodeString("") }, { "en", true, UnicodeString("2008-Jan 02"), UnicodeString("yyyy-LLL. dd"), UnicodeString("2008-Jan 02") }, - { "en", false, UnicodeString("2008-Jan 02"), UnicodeString("yyyy-LLL. dd"), NULL }, + { "en", false, UnicodeString("2008-Jan 02"), UnicodeString("yyyy-LLL. dd"), UnicodeString("") }, { "en", true, UnicodeString("2008-Jan--02"), UnicodeString("yyyy-MMM' -- 'dd"), UnicodeString("2008-Jan 02") }, - { "en", false, UnicodeString("2008-Jan--02"), UnicodeString("yyyy-MMM' -- 'dd"), NULL }, + { "en", false, UnicodeString("2008-Jan--02"), UnicodeString("yyyy-MMM' -- 'dd"), UnicodeString("") }, // terminator { NULL, true, UnicodeString(""), UnicodeString(""), UnicodeString("") } }; @@ -4235,7 +4235,7 @@ void DateFormatTest::TestDateFormatLeniency() { UDate d = sdmft->parse(itemPtr->parseString, pos); if(pos.getErrorIndex() > -1) - if(itemPtr->expectedResult != NULL) { + if(itemPtr->expectedResult.length() != 0) { errln("error: unexpected error - " + itemPtr->parseString + " - error index " + pos.getErrorIndex() + " - leniency " + itemPtr->leniency); continue; } else -- 2.40.0