From bf0f84e2401922aefece7e2afa661909518f13e5 Mon Sep 17 00:00:00 2001 From: Alan Liu Date: Wed, 11 Jun 2003 21:04:51 +0000 Subject: [PATCH] ICU-2118 improve method coverage X-SVN-Rev: 12471 --- .../dev/test/calendar/IBMCalendarTest.java | 27 +++++++++++++++++-- .../icu/dev/test/timezone/TimeZoneTest.java | 27 +++++++++++++++++-- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/icu4j/src/com/ibm/icu/dev/test/calendar/IBMCalendarTest.java b/icu4j/src/com/ibm/icu/dev/test/calendar/IBMCalendarTest.java index 0dc3f7f7132..b1d5e66e1c4 100755 --- a/icu4j/src/com/ibm/icu/dev/test/calendar/IBMCalendarTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/calendar/IBMCalendarTest.java @@ -4,8 +4,8 @@ * others. All Rights Reserved. ******************************************************************************* * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/calendar/IBMCalendarTest.java,v $ - * $Date: 2003/06/03 18:49:28 $ - * $Revision: 1.20 $ + * $Date: 2003/06/11 21:04:51 $ + * $Revision: 1.21 $ ******************************************************************************* */ package com.ibm.icu.dev.test.calendar; @@ -634,5 +634,28 @@ public class IBMCalendarTest extends CalendarTest { ccal.roll(Calendar.MONTH, 1); ccal.roll(Calendar.YEAR, 1); ccal.getTime(); + + // ICU 2.6 + Calendar cal = Calendar.getInstance(Locale.US); + logln(cal.toString()); + logln(cal.getDisplayName(Locale.US)); + int weekendOnset=-1; + int weekendCease=-1; + for (int i=Calendar.SUNDAY; i<=Calendar.SATURDAY; ++i) { + if (cal.getDayOfWeekType(i) == Calendar.WEEKEND_ONSET) { + weekendOnset = i; + } + if (cal.getDayOfWeekType(i) == Calendar.WEEKEND_CEASE) { + weekendCease = i; + } + } + // can't call this unless we get a transition day (unusual), + // but make the call anyway for coverage reasons + try { + /*int x=*/ cal.getWeekendTransition(weekendOnset); + /*int x=*/ cal.getWeekendTransition(weekendCease); + } catch (IllegalArgumentException e) {} + /*int x=*/ cal.isWeekend(new Date()); + } } diff --git a/icu4j/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java b/icu4j/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java index 8e5470414e4..5ace3c9ab08 100755 --- a/icu4j/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java +++ b/icu4j/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java @@ -5,8 +5,8 @@ ******************************************************************************* * * $Source: /xsrl/Nsvn/icu/icu4j/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java,v $ - * $Date: 2003/06/03 18:49:31 $ - * $Revision: 1.13 $ + * $Date: 2003/06/11 21:04:51 $ + * $Revision: 1.14 $ * ******************************************************************************* */ @@ -418,6 +418,29 @@ public class TimeZoneTest extends TestFmwk TimeZone.setDefault(saveDefault); // delete defaultzone; // delete zoneclone; + + // ICU 2.6 Coverage + logln(zone.toString()); + logln(zone.getDisplayName()); + SimpleTimeZoneAdapter stza = new SimpleTimeZoneAdapter((SimpleTimeZone) TimeZone.getTimeZone("GMT")); + stza.setID("Foo"); + if (stza.hasSameRules(java.util.TimeZone.getTimeZone("GMT"))) { + errln("FAIL: SimpleTimeZoneAdapter.hasSameRules"); + } + stza.setRawOffset(3000); + offset = stza.getOffset(GregorianCalendar.BC, 2001, Calendar.DECEMBER, + 25, Calendar.TUESDAY, 12*60*60*1000); + if (offset != 3000) { + errln("FAIL: SimpleTimeZoneAdapter.getOffset"); + } + SimpleTimeZoneAdapter dup = (SimpleTimeZoneAdapter) stza.clone(); + if (stza.hashCode() != dup.hashCode()) { + errln("FAIL: SimpleTimeZoneAdapter.hashCode"); + } + if (!stza.equals(dup)) { + errln("FAIL: SimpleTimeZoneAdapter.equals"); + } + logln(stza.toString()); } public void TestRuleAPI()