Menu
▾
▴
[Objectlabkit-svn] SF.net SVN: objectlabkit: [72] trunk/datecalc-joda/src
|
From: <be...@us...> - 2006-09-01 14:35:32
|
Revision: 72
http://svn.sourceforge.net/objectlabkit/?rev=72&view=rev
Author: benoitx
Date: 2006-09-01 07:34:19 -0700 (Fri, 01 Sep 2006)
Log Message:
-----------
Added test for Combination of Calendar with both LocalDate and YearMonthDay thanks to my extraordinarily simplified testing mechanism.
TODO: children of abstract test classes should use a delegate mechanism instead of CPC.
Modified Paths:
--------------
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/HolidayHandlerYearMonthDayWrapper.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractBackwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractDateTestCase.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractModifiedPreceedingDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingDateCalculatorTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPrecedingDateCalculatorTest.java
Added Paths:
-----------
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractDateCalculatorCombinationTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateDateCalculatorCombinationTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculatorCombinationTest.java
Removed Paths:
-------------
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateCalculatorCombinationTest.java
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/HolidayHandlerYearMonthDayWrapper.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/HolidayHandlerYearMonthDayWrapper.java 2006-09-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/HolidayHandlerYearMonthDayWrapper.java 2006-09-01 14:34:19 UTC (rev 72)
@@ -36,7 +36,8 @@
private DateCalculator<YearMonthDay> calculator;
- public HolidayHandlerYearMonthDayWrapper(final HolidayHandler<YearMonthDay> delegate, final DateCalculator<YearMonthDay> calculator) {
+ public HolidayHandlerYearMonthDayWrapper(final HolidayHandler<YearMonthDay> delegate,
+ final DateCalculator<YearMonthDay> calculator) {
this.delegate = delegate;
this.calculator = calculator;
}
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java 2006-09-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java 2006-09-01 14:34:19 UTC (rev 72)
@@ -68,7 +68,10 @@
* is the date a non-working day according to the WorkingWeek?
*/
public boolean isWeekend(final YearMonthDay date) {
- return delegate.isWeekend(date.toLocalDate());
+ if (date != null) {
+ return delegate.isWeekend(date.toLocalDate());
+ }
+ return false;
}
public DateCalculator<YearMonthDay> moveByDays(final int days) {
Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractBackwardDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractBackwardDateCalculatorTest.java 2006-09-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractBackwardDateCalculatorTest.java 2006-09-01 14:34:19 UTC (rev 72)
@@ -200,14 +200,14 @@
Assert.assertEquals("Holidays", holidays, cal.getNonWorkingDays());
Assert.assertEquals("Holidays size", 3, cal.getNonWorkingDays().size());
-// cal.setStartDate(newDate("2006-08-24"));
-// checkDate("Move 1 BD", cal.moveByBusinessDays(1), "2006-08-25");
+ // cal.setStartDate(newDate("2006-08-24"));
+ // checkDate("Move 1 BD", cal.moveByBusinessDays(1), "2006-08-25");
cal.setStartDate(newDate("2006-08-24"));
try {
cal.moveByBusinessDays(7);
fail("Should have thrown exception");
- } catch(IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
// ok
}
// checkDate("Add 1 week", cal.moveByDays(7), "2006-08-31");
Added: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractDateCalculatorCombinationTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractDateCalculatorCombinationTest.java (rev 0)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractDateCalculatorCombinationTest.java 2006-09-01 14:34:19 UTC (rev 72)
@@ -0,0 +1,122 @@
+package net.objectlab.kit.datecalc.joda;
+
+import junit.framework.Assert;
+import net.objectlab.kit.datecalc.common.DateCalculator;
+import net.objectlab.kit.datecalc.common.HolidayHandlerType;
+
+public abstract class AbstractDateCalculatorCombinationTest<E> extends AbstractDateTestCase<E> {
+
+ public void testInvalidCombinationDiffHandler() {
+ final DateCalculator<E> cal1 = newDateCalculator("bla", HolidayHandlerType.BACKWARD);
+ final DateCalculator<E> cal2 = newDateCalculator("bla2", HolidayHandlerType.FORWARD);
+
+ try {
+ cal1.combine(cal2);
+ Assert.fail("should not have allowed 2 different handler types to be combined");
+ } catch (final IllegalArgumentException e) {
+ // ok
+ }
+ }
+
+ public void testInvalidCombinationNullNotNullHandler() {
+ final DateCalculator<E> cal1 = newDateCalculator("bla", null);
+ final DateCalculator<E> cal2 = newDateCalculator("bla2", HolidayHandlerType.FORWARD);
+
+ try {
+ cal1.combine(cal2);
+ Assert.fail("should not have allowed 2 different handler types to be combined");
+ } catch (final IllegalArgumentException e) {
+ // ok
+ }
+ }
+
+ public void testInvalidCombinationNotNullNullHandler() {
+ final DateCalculator<E> cal1 = newDateCalculator("bla", HolidayHandlerType.FORWARD);
+ final DateCalculator<E> cal2 = newDateCalculator("bla2", null);
+
+ try {
+ cal1.combine(cal2);
+ Assert.fail("should not have allowed 2 different handler types to be combined");
+ } catch (final IllegalArgumentException e) {
+ // ok
+ }
+ }
+
+ public void testValidCombinationOneEmptySet() {
+ registerHolidays("UK", createUKHolidays());
+ final DateCalculator<E> cal1 = newDateCalculator("bla", HolidayHandlerType.FORWARD);
+
+ final E localDate = newDate("2006-08-08");
+ cal1.setStartDate(localDate);
+ final DateCalculator<E> cal2 = newDateCalculator("UK", HolidayHandlerType.FORWARD);
+
+ final DateCalculator<E> combo = cal1.combine(cal2);
+ Assert.assertEquals("Combo name", "bla/UK", combo.getName());
+ Assert.assertEquals("Combo type", HolidayHandlerType.FORWARD, combo.getHolidayHandlerType());
+ Assert.assertEquals("start", localDate, combo.getStartDate());
+ Assert.assertEquals("currentDate", localDate, combo.getCurrentBusinessDate());
+ Assert.assertEquals("Holidays", 4, combo.getNonWorkingDays().size());
+ }
+
+ public void testValidCombination() {
+ registerHolidays("UK", createUKHolidays());
+ registerHolidays("UK", createUKHolidays());
+ final DateCalculator<E> cal1 = newDateCalculator("UK", HolidayHandlerType.FORWARD);
+ final E localDate = newDate("2006-08-08");
+ cal1.setStartDate(localDate);
+ final DateCalculator<E> cal2 = newDateCalculator("UK", HolidayHandlerType.FORWARD);
+
+ final DateCalculator<E> combo = cal1.combine(cal2);
+ Assert.assertEquals("Combo name", "UK/UK", combo.getName());
+ Assert.assertEquals("Combo type", HolidayHandlerType.FORWARD, combo.getHolidayHandlerType());
+ Assert.assertEquals("start", localDate, combo.getStartDate());
+ Assert.assertEquals("currentDate", localDate, combo.getCurrentBusinessDate());
+ Assert.assertEquals("Holidays", 4, combo.getNonWorkingDays().size());
+ }
+
+ public void testValidCombination2Sets() {
+ registerHolidays("UK", createUKHolidays());
+ registerHolidays("US", createUSHolidays());
+ final DateCalculator<E> cal1 = newDateCalculator("US", HolidayHandlerType.FORWARD);
+ final E localDate = newDate("2006-08-08");
+ cal1.setStartDate(localDate);
+ final DateCalculator<E> cal2 = newDateCalculator("UK", HolidayHandlerType.FORWARD);
+
+ final DateCalculator<E> combo = cal1.combine(cal2);
+ Assert.assertEquals("Combo name", "US/UK", combo.getName());
+ Assert.assertEquals("Combo type", HolidayHandlerType.FORWARD, combo.getHolidayHandlerType());
+ Assert.assertEquals("start", localDate, combo.getStartDate());
+ Assert.assertEquals("currentDate", localDate, combo.getCurrentBusinessDate());
+ Assert.assertEquals("Holidays", 6, combo.getNonWorkingDays().size());
+ }
+
+ public void testNullCombination() {
+ registerHolidays("US", createUSHolidays());
+ final DateCalculator<E> cal1 = newDateCalculator("US", HolidayHandlerType.FORWARD);
+ final E localDate = newDate("2006-08-08");
+ cal1.setStartDate(localDate);
+
+ final DateCalculator<E> combo = cal1.combine(null);
+ Assert.assertSame("same", combo, cal1);
+ Assert.assertEquals("Combo name", "US", combo.getName());
+ Assert.assertEquals("Combo type", HolidayHandlerType.FORWARD, combo.getHolidayHandlerType());
+ Assert.assertEquals("start", localDate, combo.getStartDate());
+ Assert.assertEquals("currentDate", localDate, combo.getCurrentBusinessDate());
+ Assert.assertEquals("Holidays", 3, combo.getNonWorkingDays().size());
+ }
+
+ public void testSameCombination() {
+ registerHolidays("US", createUSHolidays());
+ final DateCalculator<E> cal1 = newDateCalculator("US", HolidayHandlerType.FORWARD);
+ final E localDate = newDate("2006-08-08");
+ cal1.setStartDate(localDate);
+
+ final DateCalculator<E> combo = cal1.combine(cal1);
+ Assert.assertSame("same", combo, cal1);
+ Assert.assertEquals("Combo name", "US", combo.getName());
+ Assert.assertEquals("Combo type", HolidayHandlerType.FORWARD, combo.getHolidayHandlerType());
+ Assert.assertEquals("start", localDate, combo.getStartDate());
+ Assert.assertEquals("currentDate", localDate, combo.getCurrentBusinessDate());
+ Assert.assertEquals("Holidays", 3, combo.getNonWorkingDays().size());
+ }
+}
Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractDateTestCase.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractDateTestCase.java 2006-09-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractDateTestCase.java 2006-09-01 14:34:19 UTC (rev 72)
@@ -16,4 +16,10 @@
}
protected abstract Set<E> newHolidaysSet();
+
+ protected abstract Set<E> createUKHolidays();
+
+ protected abstract Set<E> createUSHolidays();
+
+ protected abstract void registerHolidays(final String name, Set<E> holidays);
}
Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractModifiedPreceedingDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractModifiedPreceedingDateCalculatorTest.java 2006-09-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/AbstractModifiedPreceedingDateCalculatorTest.java 2006-09-01 14:34:19 UTC (rev 72)
@@ -189,10 +189,9 @@
checkDate("23/12 + 1", cal.moveByDays(1), "2006-12-22");
}
-
/**
* @todo How to handle moveByBusDays if it moves backwards...
- *
+ *
*/
public void testMoveByBusinessDays() {
final DateCalculator<E> cal = newDateCalculator("bla", HolidayHandlerType.MODIFIED_PRECEEDING);
@@ -202,19 +201,20 @@
Assert.assertEquals("Holidays", holidays, cal.getNonWorkingDays());
Assert.assertEquals("Holidays size", 3, cal.getNonWorkingDays().size());
-// cal.setStartDate(newDate("2006-08-24"));
-// checkDate("Move 1 BD", cal.moveByBusinessDays(1), "2006-08-25");
+ // cal.setStartDate(newDate("2006-08-24"));
+ // checkDate("Move 1 BD", cal.moveByBusinessDays(1), "2006-08-25");
cal.setStartDate(newDate("2006-08-24"));
try {
cal.moveByBusinessDays(7);
fail("Should have thrown exception");
- } catch(IllegalArgumentException e) {
+ } catch (final IllegalArgumentException e) {
// ok
}
-// checkDate("Add 1 week", cal.moveByDays(7), "2006-08-31");
-// cal.setStartDate(newDate("2006-08-24"));
-// checkDate("Move by 1W with 1 bank holiday", cal.moveByBusinessDays(7), "2006-09-05");
+ // checkDate("Add 1 week", cal.moveByDays(7), "2006-08-31");
+ // cal.setStartDate(newDate("2006-08-24"));
+ // checkDate("Move by 1W with 1 bank holiday",
+ // cal.moveByBusinessDays(7), "2006-09-05");
}
Deleted: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateCalculatorCombinationTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateCalculatorCombinationTest.java 2006-09-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateCalculatorCombinationTest.java 2006-09-01 14:34:19 UTC (rev 72)
@@ -1,137 +0,0 @@
-package net.objectlab.kit.datecalc.joda;
-
-import junit.framework.Assert;
-import net.objectlab.kit.datecalc.common.DateCalculator;
-import net.objectlab.kit.datecalc.common.HolidayHandlerType;
-
-import org.joda.time.LocalDate;
-
-public class DateCalculatorCombinationTest extends AbstractDateCalculatorTest {
-
- public void testInvalidCombinationDiffHandler() {
- final DateCalculator<LocalDate> cal1 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla",
- HolidayHandlerType.BACKWARD);
- final DateCalculator<LocalDate> cal2 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla2",
- HolidayHandlerType.FORWARD);
-
- try {
- cal1.combine(cal2);
- Assert.fail("should not have allowed 2 different handler types to be combined");
- } catch (final IllegalArgumentException e) {
- // ok
- }
- }
-
- public void testInvalidCombinationNullNotNullHandler() {
- final DateCalculator<LocalDate> cal1 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla",
- null);
- final DateCalculator<LocalDate> cal2 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla2",
- HolidayHandlerType.FORWARD);
-
- try {
- cal1.combine(cal2);
- Assert.fail("should not have allowed 2 different handler types to be combined");
- } catch (final IllegalArgumentException e) {
- // ok
- }
- }
-
- public void testInvalidCombinationNotNullNullHandler() {
- final DateCalculator<LocalDate> cal1 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla",
- HolidayHandlerType.FORWARD);
- final DateCalculator<LocalDate> cal2 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla2",
- null);
-
- try {
- cal1.combine(cal2);
- Assert.fail("should not have allowed 2 different handler types to be combined");
- } catch (final IllegalArgumentException e) {
- // ok
- }
- }
-
- public void testValidCombinationOneEmptySet() {
- DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays("UK", createUKHolidays());
- final DateCalculator<LocalDate> cal1 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla",
- HolidayHandlerType.FORWARD);
- final LocalDate localDate = new LocalDate("2006-08-08");
- cal1.setStartDate(localDate);
- final DateCalculator<LocalDate> cal2 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("UK",
- HolidayHandlerType.FORWARD);
-
- final DateCalculator<LocalDate> combo = cal1.combine(cal2);
- Assert.assertEquals("Combo name", "bla/UK", combo.getName());
- Assert.assertEquals("Combo type", HolidayHandlerType.FORWARD, combo.getHolidayHandlerType());
- Assert.assertEquals("start", localDate, combo.getStartDate());
- Assert.assertEquals("currentDate", localDate, combo.getCurrentBusinessDate());
- Assert.assertEquals("Holidays", 4, combo.getNonWorkingDays().size());
- }
-
- public void testValidCombination() {
- DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays("UK", createUKHolidays());
- DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays("UK", createUKHolidays());
- final DateCalculator<LocalDate> cal1 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("UK",
- HolidayHandlerType.FORWARD);
- final LocalDate localDate = new LocalDate("2006-08-08");
- cal1.setStartDate(localDate);
- final DateCalculator<LocalDate> cal2 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("UK",
- HolidayHandlerType.FORWARD);
-
- final DateCalculator<LocalDate> combo = cal1.combine(cal2);
- Assert.assertEquals("Combo name", "UK/UK", combo.getName());
- Assert.assertEquals("Combo type", HolidayHandlerType.FORWARD, combo.getHolidayHandlerType());
- Assert.assertEquals("start", localDate, combo.getStartDate());
- Assert.assertEquals("currentDate", localDate, combo.getCurrentBusinessDate());
- Assert.assertEquals("Holidays", 4, combo.getNonWorkingDays().size());
- }
-
- public void testValidCombination2Sets() {
- DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays("UK", createUKHolidays());
- DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays("US", createUSHolidays());
- final DateCalculator<LocalDate> cal1 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("US",
- HolidayHandlerType.FORWARD);
- final LocalDate localDate = new LocalDate("2006-08-08");
- cal1.setStartDate(localDate);
- final DateCalculator<LocalDate> cal2 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("UK",
- HolidayHandlerType.FORWARD);
-
- final DateCalculator<LocalDate> combo = cal1.combine(cal2);
- Assert.assertEquals("Combo name", "US/UK", combo.getName());
- Assert.assertEquals("Combo type", HolidayHandlerType.FORWARD, combo.getHolidayHandlerType());
- Assert.assertEquals("start", localDate, combo.getStartDate());
- Assert.assertEquals("currentDate", localDate, combo.getCurrentBusinessDate());
- Assert.assertEquals("Holidays", 6, combo.getNonWorkingDays().size());
- }
-
- public void testNullCombination() {
- DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays("US", createUSHolidays());
- final DateCalculator<LocalDate> cal1 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("US",
- HolidayHandlerType.FORWARD);
- final LocalDate localDate = new LocalDate("2006-08-08");
- cal1.setStartDate(localDate);
-
- final DateCalculator<LocalDate> combo = cal1.combine(null);
- Assert.assertSame("same", combo, cal1);
- Assert.assertEquals("Combo name", "US", combo.getName());
- Assert.assertEquals("Combo type", HolidayHandlerType.FORWARD, combo.getHolidayHandlerType());
- Assert.assertEquals("start", localDate, combo.getStartDate());
- Assert.assertEquals("currentDate", localDate, combo.getCurrentBusinessDate());
- Assert.assertEquals("Holidays", 3, combo.getNonWorkingDays().size());
- }
-
- public void testSameCombination() {
- DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays("US", createUSHolidays());
- final DateCalculator<LocalDate> cal1 = DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator("US",
- HolidayHandlerType.FORWARD);
- final LocalDate localDate = new LocalDate("2006-08-08");
- cal1.setStartDate(localDate);
-
- final DateCalculator<LocalDate> combo = cal1.combine(cal1);
- Assert.assertSame("same", combo, cal1);
- Assert.assertEquals("Combo name", "US", combo.getName());
- Assert.assertEquals("Combo type", HolidayHandlerType.FORWARD, combo.getHolidayHandlerType());
- Assert.assertEquals("start", localDate, combo.getStartDate());
- Assert.assertEquals("currentDate", localDate, combo.getCurrentBusinessDate());
- Assert.assertEquals("Holidays", 3, combo.getNonWorkingDays().size());
- }
-}
Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardDateCalculatorTest.java 2006-09-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardDateCalculatorTest.java 2006-09-01 14:34:19 UTC (rev 72)
@@ -51,4 +51,29 @@
holidays.add(newDate("2006-12-26"));
return holidays;
}
+
+ @Override
+ protected Set<LocalDate> createUKHolidays() {
+ final Set<LocalDate> uk = new HashSet<LocalDate>();
+ uk.add(new LocalDate("2006-01-01"));
+ uk.add(new LocalDate("2006-08-28"));
+ uk.add(new LocalDate("2006-12-25"));
+ uk.add(new LocalDate("2006-12-26"));
+ return uk;
+ }
+
+ @Override
+ protected Set<LocalDate> createUSHolidays() {
+ final Set<LocalDate> us = new HashSet<LocalDate>();
+ us.add(new LocalDate("2006-07-04"));
+ us.add(new LocalDate("2006-11-28"));
+ us.add(new LocalDate("2006-12-25"));
+ return us;
+ }
+
+ @Override
+ protected void registerHolidays(final String name, final Set<LocalDate> holidays) {
+ DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
+ }
+
}
Added: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateDateCalculatorCombinationTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateDateCalculatorCombinationTest.java (rev 0)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateDateCalculatorCombinationTest.java 2006-09-01 14:34:19 UTC (rev 72)
@@ -0,0 +1,79 @@
+/*
+ * $Id: org.eclipse.jdt.ui.prefs 59 2006-08-26 09:06:39Z marchy $
+ *
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package net.objectlab.kit.datecalc.joda;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import net.objectlab.kit.datecalc.common.DateCalculator;
+
+import org.joda.time.LocalDate;
+
+/**
+ *
+ * @author xhensevb
+ * @author $LastChangedBy: marchy $
+ * @version $Revision: 59 $ $Date: 2006-08-26 11:06:39 +0200 (Sat, 26 Aug 2006) $
+ *
+ */
+public class LocalDateDateCalculatorCombinationTest extends AbstractDateCalculatorCombinationTest<LocalDate> {
+
+ @Override
+ protected LocalDate newDate(final String date) {
+ return new LocalDate(date);
+ }
+
+ @Override
+ protected DateCalculator<LocalDate> newDateCalculator(final String name, final String type) {
+ return DefaultLocalDateCalculatorFactory.getDefaultInstance().getDateCalculator(name, type);
+ }
+
+ @Override
+ protected Set<LocalDate> newHolidaysSet() {
+ final Set<LocalDate> holidays = new HashSet<LocalDate>();
+ holidays.add(newDate("2006-08-28"));
+ holidays.add(newDate("2006-12-25"));
+ holidays.add(newDate("2006-12-26"));
+ return holidays;
+ }
+
+ @Override
+ protected Set<LocalDate> createUKHolidays() {
+ final Set<LocalDate> uk = new HashSet<LocalDate>();
+ uk.add(new LocalDate("2006-01-01"));
+ uk.add(new LocalDate("2006-08-28"));
+ uk.add(new LocalDate("2006-12-25"));
+ uk.add(new LocalDate("2006-12-26"));
+ return uk;
+ }
+
+ @Override
+ protected Set<LocalDate> createUSHolidays() {
+ final Set<LocalDate> us = new HashSet<LocalDate>();
+ us.add(new LocalDate("2006-07-04"));
+ us.add(new LocalDate("2006-11-28"));
+ us.add(new LocalDate("2006-12-25"));
+ return us;
+ }
+
+ @Override
+ protected void registerHolidays(final String name, final Set<LocalDate> holidays) {
+ DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
+ }
+
+}
Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java 2006-09-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateForwardDateCalculatorTest.java 2006-09-01 14:34:19 UTC (rev 72)
@@ -51,4 +51,29 @@
holidays.add(newDate("2006-12-26"));
return holidays;
}
+
+ @Override
+ protected Set<LocalDate> createUKHolidays() {
+ final Set<LocalDate> uk = new HashSet<LocalDate>();
+ uk.add(new LocalDate("2006-01-01"));
+ uk.add(new LocalDate("2006-08-28"));
+ uk.add(new LocalDate("2006-12-25"));
+ uk.add(new LocalDate("2006-12-26"));
+ return uk;
+ }
+
+ @Override
+ protected Set<LocalDate> createUSHolidays() {
+ final Set<LocalDate> us = new HashSet<LocalDate>();
+ us.add(new LocalDate("2006-07-04"));
+ us.add(new LocalDate("2006-11-28"));
+ us.add(new LocalDate("2006-12-25"));
+ return us;
+ }
+
+ @Override
+ protected void registerHolidays(final String name, final Set<LocalDate> holidays) {
+ DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
+ }
+
}
Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingDateCalculatorTest.java 2006-09-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingDateCalculatorTest.java 2006-09-01 14:34:19 UTC (rev 72)
@@ -51,4 +51,29 @@
holidays.add(newDate("2006-12-26"));
return holidays;
}
+
+ @Override
+ protected Set<LocalDate> createUKHolidays() {
+ final Set<LocalDate> uk = new HashSet<LocalDate>();
+ uk.add(new LocalDate("2006-01-01"));
+ uk.add(new LocalDate("2006-08-28"));
+ uk.add(new LocalDate("2006-12-25"));
+ uk.add(new LocalDate("2006-12-26"));
+ return uk;
+ }
+
+ @Override
+ protected Set<LocalDate> createUSHolidays() {
+ final Set<LocalDate> us = new HashSet<LocalDate>();
+ us.add(new LocalDate("2006-07-04"));
+ us.add(new LocalDate("2006-11-28"));
+ us.add(new LocalDate("2006-12-25"));
+ return us;
+ }
+
+ @Override
+ protected void registerHolidays(final String name, final Set<LocalDate> holidays) {
+ DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
+ }
+
}
Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingDateCalculatorTest.java 2006-09-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingDateCalculatorTest.java 2006-09-01 14:34:19 UTC (rev 72)
@@ -51,4 +51,29 @@
holidays.add(newDate("2006-12-26"));
return holidays;
}
+
+ @Override
+ protected Set<LocalDate> createUKHolidays() {
+ final Set<LocalDate> uk = new HashSet<LocalDate>();
+ uk.add(new LocalDate("2006-01-01"));
+ uk.add(new LocalDate("2006-08-28"));
+ uk.add(new LocalDate("2006-12-25"));
+ uk.add(new LocalDate("2006-12-26"));
+ return uk;
+ }
+
+ @Override
+ protected Set<LocalDate> createUSHolidays() {
+ final Set<LocalDate> us = new HashSet<LocalDate>();
+ us.add(new LocalDate("2006-07-04"));
+ us.add(new LocalDate("2006-11-28"));
+ us.add(new LocalDate("2006-12-25"));
+ return us;
+ }
+
+ @Override
+ protected void registerHolidays(final String name, final Set<LocalDate> holidays) {
+ DefaultLocalDateCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
+ }
+
}
Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardDateCalculatorTest.java 2006-09-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayBackwardDateCalculatorTest.java 2006-09-01 14:34:19 UTC (rev 72)
@@ -51,4 +51,29 @@
holidays.add(newDate("2006-12-26"));
return holidays;
}
+
+ @Override
+ protected Set<YearMonthDay> createUKHolidays() {
+ final Set<YearMonthDay> uk = new HashSet<YearMonthDay>();
+ uk.add(new YearMonthDay("2006-01-01"));
+ uk.add(new YearMonthDay("2006-08-28"));
+ uk.add(new YearMonthDay("2006-12-25"));
+ uk.add(new YearMonthDay("2006-12-26"));
+ return uk;
+ }
+
+ @Override
+ protected Set<YearMonthDay> createUSHolidays() {
+ final Set<YearMonthDay> us = new HashSet<YearMonthDay>();
+ us.add(new YearMonthDay("2006-07-04"));
+ us.add(new YearMonthDay("2006-11-28"));
+ us.add(new YearMonthDay("2006-12-25"));
+ return us;
+ }
+
+ @Override
+ protected void registerHolidays(final String name, final Set<YearMonthDay> holidays) {
+ DefaultYearMonthDayCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
+ }
+
}
Added: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculatorCombinationTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculatorCombinationTest.java (rev 0)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculatorCombinationTest.java 2006-09-01 14:34:19 UTC (rev 72)
@@ -0,0 +1,79 @@
+/*
+ * $Id: org.eclipse.jdt.ui.prefs 59 2006-08-26 09:06:39Z marchy $
+ *
+ * Copyright 2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package net.objectlab.kit.datecalc.joda;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import net.objectlab.kit.datecalc.common.DateCalculator;
+
+import org.joda.time.YearMonthDay;
+
+/**
+ *
+ * @author xhensevb
+ * @author $LastChangedBy: marchy $
+ * @version $Revision: 59 $ $Date: 2006-08-26 11:06:39 +0200 (Sat, 26 Aug 2006) $
+ *
+ */
+public class YearMonthDayDateCalculatorCombinationTest extends AbstractDateCalculatorCombinationTest<YearMonthDay> {
+
+ @Override
+ protected YearMonthDay newDate(final String date) {
+ return new YearMonthDay(date);
+ }
+
+ @Override
+ protected DateCalculator<YearMonthDay> newDateCalculator(final String name, final String type) {
+ return DefaultYearMonthDayCalculatorFactory.getDefaultInstance().getDateCalculator(name, type);
+ }
+
+ @Override
+ protected Set<YearMonthDay> newHolidaysSet() {
+ final Set<YearMonthDay> holidays = new HashSet<YearMonthDay>();
+ holidays.add(newDate("2006-08-28"));
+ holidays.add(newDate("2006-12-25"));
+ holidays.add(newDate("2006-12-26"));
+ return holidays;
+ }
+
+ @Override
+ protected Set<YearMonthDay> createUKHolidays() {
+ final Set<YearMonthDay> uk = new HashSet<YearMonthDay>();
+ uk.add(new YearMonthDay("2006-01-01"));
+ uk.add(new YearMonthDay("2006-08-28"));
+ uk.add(new YearMonthDay("2006-12-25"));
+ uk.add(new YearMonthDay("2006-12-26"));
+ return uk;
+ }
+
+ @Override
+ protected Set<YearMonthDay> createUSHolidays() {
+ final Set<YearMonthDay> us = new HashSet<YearMonthDay>();
+ us.add(new YearMonthDay("2006-07-04"));
+ us.add(new YearMonthDay("2006-11-28"));
+ us.add(new YearMonthDay("2006-12-25"));
+ return us;
+ }
+
+ @Override
+ protected void registerHolidays(final String name, final Set<YearMonthDay> holidays) {
+ DefaultYearMonthDayCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
+ }
+
+}
Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardDateCalculatorTest.java 2006-09-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardDateCalculatorTest.java 2006-09-01 14:34:19 UTC (rev 72)
@@ -51,4 +51,28 @@
holidays.add(newDate("2006-12-26"));
return holidays;
}
+
+ @Override
+ protected Set<YearMonthDay> createUKHolidays() {
+ final Set<YearMonthDay> uk = new HashSet<YearMonthDay>();
+ uk.add(new YearMonthDay("2006-01-01"));
+ uk.add(new YearMonthDay("2006-08-28"));
+ uk.add(new YearMonthDay("2006-12-25"));
+ uk.add(new YearMonthDay("2006-12-26"));
+ return uk;
+ }
+
+ @Override
+ protected Set<YearMonthDay> createUSHolidays() {
+ final Set<YearMonthDay> us = new HashSet<YearMonthDay>();
+ us.add(new YearMonthDay("2006-07-04"));
+ us.add(new YearMonthDay("2006-11-28"));
+ us.add(new YearMonthDay("2006-12-25"));
+ return us;
+ }
+
+ @Override
+ protected void registerHolidays(final String name, final Set<YearMonthDay> holidays) {
+ DefaultYearMonthDayCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
+ }
}
Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingDateCalculatorTest.java 2006-09-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingDateCalculatorTest.java 2006-09-01 14:34:19 UTC (rev 72)
@@ -51,4 +51,29 @@
holidays.add(newDate("2006-12-26"));
return holidays;
}
+
+ @Override
+ protected Set<YearMonthDay> createUKHolidays() {
+ final Set<YearMonthDay> uk = new HashSet<YearMonthDay>();
+ uk.add(new YearMonthDay("2006-01-01"));
+ uk.add(new YearMonthDay("2006-08-28"));
+ uk.add(new YearMonthDay("2006-12-25"));
+ uk.add(new YearMonthDay("2006-12-26"));
+ return uk;
+ }
+
+ @Override
+ protected Set<YearMonthDay> createUSHolidays() {
+ final Set<YearMonthDay> us = new HashSet<YearMonthDay>();
+ us.add(new YearMonthDay("2006-07-04"));
+ us.add(new YearMonthDay("2006-11-28"));
+ us.add(new YearMonthDay("2006-12-25"));
+ return us;
+ }
+
+ @Override
+ protected void registerHolidays(final String name, final Set<YearMonthDay> holidays) {
+ DefaultYearMonthDayCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
+ }
+
}
Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPrecedingDateCalculatorTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPrecedingDateCalculatorTest.java 2006-09-01 14:07:57 UTC (rev 71)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedPrecedingDateCalculatorTest.java 2006-09-01 14:34:19 UTC (rev 72)
@@ -51,4 +51,29 @@
holidays.add(newDate("2006-12-26"));
return holidays;
}
+
+ @Override
+ protected Set<YearMonthDay> createUKHolidays() {
+ final Set<YearMonthDay> uk = new HashSet<YearMonthDay>();
+ uk.add(new YearMonthDay("2006-01-01"));
+ uk.add(new YearMonthDay("2006-08-28"));
+ uk.add(new YearMonthDay("2006-12-25"));
+ uk.add(new YearMonthDay("2006-12-26"));
+ return uk;
+ }
+
+ @Override
+ protected Set<YearMonthDay> createUSHolidays() {
+ final Set<YearMonthDay> us = new HashSet<YearMonthDay>();
+ us.add(new YearMonthDay("2006-07-04"));
+ us.add(new YearMonthDay("2006-11-28"));
+ us.add(new YearMonthDay("2006-12-25"));
+ return us;
+ }
+
+ @Override
+ protected void registerHolidays(final String name, final Set<YearMonthDay> holidays) {
+ DefaultYearMonthDayCalculatorFactory.getDefaultInstance().registerHolidays(name, holidays);
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
