organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-07 22:44:49 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-20589 Fix EraRulesTest#testAPIs failure on 1 May 2019

Browse source
This commit is contained in:
Victor Chang 2019-05-03 13:27:26 +01:00 • committed by Yoshito Umaoka
parent 3d9914be47
commit 6ff43608d2
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
icu4c/source/test/intltest/erarulestest.cpp
View file

@ -8,6 +8,7 @@
#include "unicode/calendar.h"
#include "unicode/localpointer.h"
#include "unicode/unistr.h"
#include "unicode/timezone.h"
#include "erarules.h"
#include "erarulestest.h"
@ -73,7 +74,7 @@ void EraRulesTest::testAPIs() {
+ calId);
}
LocalPointer<Calendar> cal(Calendar::createInstance("en", status));
LocalPointer<Calendar> cal(Calendar::createInstance(*TimeZone::getGMT(), "en", status));
if (U_FAILURE(status)) {
errln("Failed to create a Calendar instance.");
continue;

3
icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/EraRulesTest.java
View file

@ -12,6 +12,7 @@ import com.ibm.icu.impl.EraRules;
import com.ibm.icu.util.Calendar;
import com.ibm.icu.util.JapaneseCalendar;
import com.ibm.icu.util.ULocale;
import com.ibm.icu.util.TimeZone;
/**
* Tests for EraRules class
@ -44,7 +45,7 @@ public class EraRulesTest extends TestFmwk {
+ calId);
}
Calendar cal = Calendar.getInstance(new ULocale("en"));
Calendar cal = Calendar.getInstance(TimeZone.GMT_ZONE, new ULocale("en"));
int currentIdx = rules1.getCurrentEraIndex();
int currentYear = cal.get(Calendar.YEAR);
int idx = rules1.getEraIndex(currentYear, cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DATE));