| Index: source/test/intltest/dtfmtrtts.cpp
|
| diff --git a/source/test/intltest/dtfmtrtts.cpp b/source/test/intltest/dtfmtrtts.cpp
|
| index 1f1115a449b25befde67cb1ec291ce3aaaea4b9c..b23aaebd90a07731a0cf05072b2978069aaadbd4 100644
|
| --- a/source/test/intltest/dtfmtrtts.cpp
|
| +++ b/source/test/intltest/dtfmtrtts.cpp
|
| @@ -1,6 +1,6 @@
|
| /***********************************************************************
|
| * COPYRIGHT:
|
| - * Copyright (c) 1997-2013, International Business Machines Corporation
|
| + * Copyright (c) 1997-2014, International Business Machines Corporation
|
| * and others. All Rights Reserved.
|
| ***********************************************************************/
|
|
|
| @@ -13,6 +13,7 @@
|
| #include "unicode/gregocal.h"
|
| #include "dtfmtrtts.h"
|
| #include "caltest.h"
|
| +#include "cstring.h"
|
|
|
| #include <stdio.h>
|
| #include <string.h>
|
| @@ -28,8 +29,6 @@
|
| #define INFINITE 0
|
| #endif
|
|
|
| -static const UVersionInfo ICU_452 = {4,5,2,0};
|
| -
|
| // Define this to test just a single locale
|
| //#define TEST_ONE_LOC "cs_CZ"
|
|
|
| @@ -171,7 +170,7 @@ void DateFormatRoundTripTest::TestDateFormatRoundTrip()
|
| #if 1
|
| // installed locales
|
| for (int i=0; i < locCount; ++i) {
|
| - test(avail[i]);
|
| + test(avail[i]);
|
| }
|
| #endif
|
|
|
| @@ -285,6 +284,10 @@ void DateFormatRoundTripTest::test(DateFormat *fmt, const Locale &origLocale, UB
|
|
|
| UBool isGregorian = FALSE;
|
| UErrorCode minStatus = U_ZERO_ERROR;
|
| + if(fmt->getCalendar() == NULL) {
|
| + errln((UnicodeString)"DateFormatRoundTripTest::test, DateFormat getCalendar() returns null for " + origLocale.getName());
|
| + return;
|
| + }
|
| UDate minDate = CalendarTest::minDateOfCalendar(*fmt->getCalendar(), isGregorian, minStatus);
|
| if(U_FAILURE(minStatus)) {
|
| errln((UnicodeString)"Failure getting min date for " + origLocale.getName());
|
|
|