Menu
▾
▴
[Objectlabkit-svn] SF.net SVN: objectlabkit: [51] trunk/datecalc-jdk
|
From: <be...@us...> - 2006-08-24 22:18:09
|
Revision: 51 Author: benoitx Date: 2006-08-24 15:17:05 -0700 (Thu, 24 Aug 2006) ViewCVS: http://svn.sourceforge.net/objectlabkit/?rev=51&view=rev Log Message: ----------- Removed Checkstyle issues. new stats. Modified Paths: -------------- trunk/datecalc-common/qalab.xml trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculator.java trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/WorkingWeek.java trunk/datecalc-jdk/qalab.xml trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/BaseDateCalculator.java trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ForwardHandler.java trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DateCalculatorCombinationTest.java trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DateCalculatorFactoryTest.java trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/ForwardDateCalculatorTest.java trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JodaWorkingWeekTest.java trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/PeriodCountCalculatorTest.java trunk/datecalc-joda/qalab.xml trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/BackwardHandler.java trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/BaseDateCalculator.java trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ForwardHandler.java trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ModifiedFollowingHandler.java trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ModifiedPreceedingHandler.java trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/BackwardDateCalculatorTest.java trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateCalculatorCombinationTest.java trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateCalculatorFactoryTest.java trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ForwardDateCalculatorTest.java trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/IMMDateTest.java trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ModifiedFollowingDateCalculatorTest.java trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ModifiedPreceedingDateCalculatorTest.java Modified: trunk/datecalc-common/qalab.xml =================================================================== --- trunk/datecalc-common/qalab.xml 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-common/qalab.xml 2006-08-24 22:17:05 UTC (rev 51) @@ -37,6 +37,9 @@ <summaryresult date="2006-08-23" filecount="10" statvalue="25" type="checkstyle"/> <summaryresult date="2006-08-23" filecount="9" statvalue="74" type="cobertura-line"/> <summaryresult date="2006-08-23" filecount="9" statvalue="87" type="cobertura-branch"/> + <summaryresult date="2006-08-24" filecount="10" statvalue="1" type="checkstyle"/> + <summaryresult date="2006-08-24" filecount="9" statvalue="62" type="cobertura-line"/> + <summaryresult date="2006-08-24" filecount="9" statvalue="65" type="cobertura-branch"/> </summary> <file id="net_objectlab_kit_datecalc_common_package.html" path="net/objectlab/kit/datecalc/common/package.html"> <result date="2006-08-08" statvalue="1" type="checkstyle"/> @@ -45,6 +48,7 @@ <result date="2006-08-19" statvalue="1" type="checkstyle"/> <result date="2006-08-20" statvalue="1" type="checkstyle"/> <result date="2006-08-23" statvalue="1" type="checkstyle"/> + <result date="2006-08-24" statvalue="1" type="checkstyle"/> </file> <file id="net_objectlab_kit_datecalc_common_Tenor.java" path="net/objectlab/kit/datecalc/common/Tenor.java"> <result date="2006-08-08" statvalue="1" type="checkstyle"/> @@ -62,6 +66,8 @@ <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> <result date="2006-08-23" statvalue="100" type="cobertura-line"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="100" type="cobertura-line"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_common_WorkingWeek.java" path="net/objectlab/kit/datecalc/common/WorkingWeek.java"> <result date="2006-08-08" statvalue="3" type="checkstyle"/> @@ -80,6 +86,8 @@ <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> <result date="2006-08-23" statvalue="100" type="cobertura-line"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="100" type="cobertura-line"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_common_TenorCode.java" path="net/objectlab/kit/datecalc/common/TenorCode.java"> <result date="2006-08-08" statvalue="100" type="cobertura-line"/> @@ -94,6 +102,8 @@ <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> <result date="2006-08-23" statvalue="100" type="cobertura-line"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="100" type="cobertura-line"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_common_HolidayHandlerType.java" path="net/objectlab/kit/datecalc/common/HolidayHandlerType.java"> <result date="2006-08-08" statvalue="100" type="cobertura-branch"/> @@ -102,12 +112,14 @@ <result date="2006-08-19" statvalue="100" type="cobertura-branch"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_common_PeriodCountBasis.java" path="net/objectlab/kit/datecalc/common/PeriodCountBasis.java"> <result date="2006-08-08" statvalue="100" type="cobertura-branch"/> <result date="2006-08-10" statvalue="100" type="cobertura-branch"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_common_StandardTenor.java" path="net/objectlab/kit/datecalc/common/StandardTenor.java"> <result date="2006-08-08" statvalue="100" type="cobertura-branch"/> @@ -121,6 +133,8 @@ <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> <result date="2006-08-23" statvalue="92" type="cobertura-line"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="92" type="cobertura-line"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_common_AbstractDateCalculator.java" path="net/objectlab/kit/datecalc/common/AbstractDateCalculator.java"> @@ -132,9 +146,13 @@ <result date="2006-08-23" statvalue="19" type="checkstyle"/> <result date="2006-08-23" statvalue="100" type="cobertura-line"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="100" type="cobertura-line"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_common_HolidayHandler.java" path="net/objectlab/kit/datecalc/common/HolidayHandler.java"> <result date="2006-08-23" statvalue="100" type="cobertura-line"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="100" type="cobertura-line"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> </qalab> Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java =================================================================== --- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2006-08-24 22:17:05 UTC (rev 51) @@ -14,13 +14,13 @@ private String name; - protected E startDate; + private E startDate; - protected E currentDate; + private E currentBusinessDate; - protected Set<E> nonWorkingDays; + private Set<E> nonWorkingDays; - protected HolidayHandler<E> holidayHandler; + private HolidayHandler<E> holidayHandler; protected AbstractDateCalculator(final String name, final Set<E> nonWorkingDays, final HolidayHandler<E> holidayHandler) { this.name = name; @@ -46,8 +46,8 @@ setCurrentBusinessDate(startDate); } - public E getCurrentDate() { - return currentDate; + public E getCurrentBusinessDate() { + return currentBusinessDate; } public Set<E> getNonWorkingDays() { @@ -106,15 +106,15 @@ } public boolean isCurrentDateNonWorking() { - return isNonWorkingDay(currentDate); + return isNonWorkingDay(currentBusinessDate); } public E setCurrentBusinessDate(final E date) { - currentDate = date; + currentBusinessDate = date; if (holidayHandler != null && date != null) { - currentDate = holidayHandler.moveCurrentDate(this); + currentBusinessDate = holidayHandler.moveCurrentDate(this); } - return currentDate; + return currentBusinessDate; } protected HolidayHandler<E> getHolidayHandler() { @@ -134,7 +134,7 @@ /** * Allows DateCalculators to be combined into a new one, the startDate and - * currentDate will be the ones from the existing calendar (not the + * currentBusinessDate will be the ones from the existing calendar (not the * parameter one). The name will be combined name1+"/"+calendar.getName(). * * @param calendar, @@ -172,17 +172,18 @@ * @return the next IMMDate based on current date. */ public E getNextIMMDate() { - return getNextIMMDate(true, currentDate); + return getNextIMMDate(true, currentBusinessDate); } /** * @return the previous IMMDate based on current date. */ public E getPreviousIMMDate() { - return getNextIMMDate(false, currentDate); + return getNextIMMDate(false, currentBusinessDate); } - protected abstract E getNextIMMDate(final boolean forward, final E startDate); + protected abstract E getNextIMMDate(final boolean forward, final E theStartDate); - protected abstract DateCalculator<E> createNewCalcultaor(String name, E startDate, Set<E> holidays, HolidayHandler<E> handler); + protected abstract DateCalculator<E> createNewCalcultaor(String calcName, E theStartDate, Set<E> holidays, + HolidayHandler<E> handler); } Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculator.java =================================================================== --- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculator.java 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculator.java 2006-08-24 22:17:05 UTC (rev 51) @@ -28,7 +28,7 @@ * @param currentDate * held by the calendar. */ - E getCurrentDate(); + E getCurrentBusinessDate(); /** * is the given date on a weekend, according to the WorkingWeek Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/WorkingWeek.java =================================================================== --- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/WorkingWeek.java 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/WorkingWeek.java 2006-08-24 22:17:05 UTC (rev 51) @@ -39,11 +39,10 @@ private static final byte SUNDAY = 64; - private static final byte DEFAULT_WORKING_DAYS = (byte) (MONDAY + TUESDAY - + WEDNESDAY + THURSDAY + FRIDAY); + private static final byte DEFAULT_WORKING_DAYS = (byte) (MONDAY + TUESDAY + WEDNESDAY + THURSDAY + FRIDAY); - private static final byte[] WORKING_WEEK_DAYS_OFFSET = new byte[] { SUNDAY, - MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY }; + private static final byte[] WORKING_WEEK_DAYS_OFFSET = new byte[] { SUNDAY, MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, + SATURDAY }; public static final WorkingWeek DEFAULT = new WorkingWeek(); @@ -51,7 +50,7 @@ * Default Working Week Monday -> Friday. */ public WorkingWeek() { - this((byte) DEFAULT_WORKING_DAYS); + this(DEFAULT_WORKING_DAYS); } private WorkingWeek(final byte workingDays) { Modified: trunk/datecalc-jdk/qalab.xml =================================================================== --- trunk/datecalc-jdk/qalab.xml 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-jdk/qalab.xml 2006-08-24 22:17:05 UTC (rev 51) @@ -35,6 +35,10 @@ <summaryresult date="2006-08-23" filecount="1" statvalue="1" type="pmd"/> <summaryresult date="2006-08-23" filecount="7" statvalue="81" type="cobertura-line"/> <summaryresult date="2006-08-23" filecount="7" statvalue="79" type="cobertura-branch"/> + <summaryresult date="2006-08-24" filecount="8" statvalue="6" type="checkstyle"/> + <summaryresult date="2006-08-24" filecount="1" statvalue="1" type="pmd"/> + <summaryresult date="2006-08-24" filecount="7" statvalue="86" type="cobertura-line"/> + <summaryresult date="2006-08-24" filecount="7" statvalue="81" type="cobertura-branch"/> </summary> <file id="net_objectlab_kit_datecalc_jdk_package.html" path="net/objectlab/kit/datecalc/jdk/package.html"> <result date="2006-08-08" statvalue="1" type="checkstyle"/> @@ -42,6 +46,7 @@ <result date="2006-08-10" statvalue="1" type="checkstyle"/> <result date="2006-08-20" statvalue="1" type="checkstyle"/> <result date="2006-08-23" statvalue="1" type="checkstyle"/> + <result date="2006-08-24" statvalue="1" type="checkstyle"/> </file> <file id="net_objectlab_kit_datecalc_jdk_BaseDateCalculator.java" path="net/objectlab/kit/datecalc/jdk/BaseDateCalculator.java"> <result date="2006-08-08" statvalue="1" type="checkstyle"/> @@ -62,6 +67,10 @@ <result date="2006-08-23" statvalue="1" type="pmd"/> <result date="2006-08-23" statvalue="78" type="cobertura-line"/> <result date="2006-08-23" statvalue="76" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="3" type="checkstyle"/> + <result date="2006-08-24" statvalue="1" type="pmd"/> + <result date="2006-08-24" statvalue="84" type="cobertura-line"/> + <result date="2006-08-24" statvalue="76" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_jdk_DefaultDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/jdk/DefaultDateCalculatorFactory.java"> @@ -74,6 +83,9 @@ <result date="2006-08-23" statvalue="1" type="checkstyle"/> <result date="2006-08-23" statvalue="100" type="cobertura-line"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="1" type="checkstyle"/> + <result date="2006-08-24" statvalue="100" type="cobertura-line"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> <file id="C:_project_objectlab-kit_datecalc-jdk_src_test_java_net_objectlab_kit_datecalc_jdk_DateCalculatorCombinationTest.java" path="C:/project/objectlab-kit/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DateCalculatorCombinationTest.java"> @@ -102,6 +114,8 @@ <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> <result date="2006-08-23" statvalue="100" type="cobertura-line"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="100" type="cobertura-line"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_jdk_HolidayHandler.java" path="net/objectlab/kit/datecalc/jdk/HolidayHandler.java"> <result date="2006-08-08" statvalue="100" type="cobertura-line"/> @@ -124,6 +138,8 @@ <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> <result date="2006-08-23" statvalue="100" type="cobertura-line"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="100" type="cobertura-line"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_jdk_DefaultPeriodCountCalculator.java" path="net/objectlab/kit/datecalc/jdk/DefaultPeriodCountCalculator.java"> @@ -134,6 +150,8 @@ <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> <result date="2006-08-23" statvalue="50" type="cobertura-line"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="50" type="cobertura-line"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> <file id="C:_project_objectlabkit_datecalc-jdk_src_test_java_net_objectlab_kit_datecalc_jdk_DateCalculatorCombinationTest.java" path="C:/project/objectlabkit/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DateCalculatorCombinationTest.java"/> @@ -144,11 +162,16 @@ <result date="2006-08-23" statvalue="1" type="checkstyle"/> <result date="2006-08-23" statvalue="75" type="cobertura-line"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="1" type="checkstyle"/> + <result date="2006-08-24" statvalue="75" type="cobertura-line"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_jdk_ForwardHandler.java" path="net/objectlab/kit/datecalc/jdk/ForwardHandler.java"> <result date="2006-08-20" statvalue="100" type="cobertura-line"/> <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> <result date="2006-08-23" statvalue="100" type="cobertura-line"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="100" type="cobertura-line"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> </qalab> Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/BaseDateCalculator.java =================================================================== --- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/BaseDateCalculator.java 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/BaseDateCalculator.java 2006-08-24 22:17:05 UTC (rev 51) @@ -35,7 +35,7 @@ * @author Benoit Xhenseval */ public class BaseDateCalculator extends AbstractDateCalculator<Date> { - + private WorkingWeek workingWeek = WorkingWeek.DEFAULT; @SuppressWarnings("unchecked") @@ -62,32 +62,31 @@ } public DateCalculator<Date> moveByDays(final int days) { - if (currentDate == null) { + if (getCurrentBusinessDate() == null) { initialise(); } - - final Calendar cal = Utils.getCal(currentDate); + + final Calendar cal = Utils.getCal(getCurrentBusinessDate()); cal.add(Calendar.DAY_OF_MONTH, days); setCurrentBusinessDate(cal.getTime()); - + return this; } private void initialise() { - if (startDate == null) { + if (getStartDate() == null) { setStartDate(new Date()); - } else if (currentDate == null) { + } else if (getCurrentBusinessDate() == null) { setCurrentBusinessDate(new Date()); } } @Override - protected DateCalculator<Date> createNewCalcultaor(final String name, final Date startDate, final Set<Date> holidays, + protected DateCalculator<Date> createNewCalcultaor(final String name, final Date startDate, final Set<Date> holidays, final HolidayHandler<Date> handler) { return new BaseDateCalculator(name, startDate, holidays, handler); } - - + /** * Calculates IMMDates between a start and end dates the 3rd wednesday of * Mar/Jun/Sep/Dec when a lot of derivative contracts expire @@ -95,7 +94,7 @@ * @return a List of Dates */ public List<Date> getIMMDates(final Date start, final Date end) { - + final List<Date> dates = new ArrayList<Date>(); Date date = start; while (true) { @@ -106,39 +105,37 @@ break; } } - - return dates; + + return dates; } @Override protected Date getNextIMMDate(final boolean forward, final Date startDate) { - + final Calendar cal = Utils.getCal(startDate); if (isIMMMonth(cal)) { moveToIMMDay(cal); // TODO simplify this if condition - if ((forward && cal.getTime().after(startDate)) || - (!forward && cal.getTime().before(startDate))) { + if ((forward && cal.getTime().after(startDate)) || (!forward && cal.getTime().before(startDate))) { return cal.getTime(); } } - + final int delta = (forward ? 1 : -1); do { cal.add(Calendar.MONTH, delta); } while (!isIMMMonth(cal)); - + moveToIMMDay(cal); return cal.getTime(); } private boolean isIMMMonth(final Calendar cal) { final int month = cal.get(Calendar.MONTH); - return (month == Calendar.MARCH || month == Calendar.JUNE || - month == Calendar.SEPTEMBER || month == Calendar.DECEMBER); + return (month == Calendar.MARCH || month == Calendar.JUNE || month == Calendar.SEPTEMBER || month == Calendar.DECEMBER); } - + /** * Assumes that the month is correct, get the day for the 3rd wednesday. * @@ -147,7 +144,7 @@ */ private void moveToIMMDay(final Calendar cal) { cal.set(Calendar.DAY_OF_MONTH, 1); - + // go to 1st wed final int dayOfWeek = cal.get(Calendar.DAY_OF_WEEK); if (dayOfWeek < Calendar.WEDNESDAY) { @@ -157,7 +154,7 @@ } else { cal.add(Calendar.DAY_OF_MONTH, (Calendar.WEDNESDAY + 7) - dayOfWeek); } - + // go to 3rd wednesday - i.e. move 2 weeks forward cal.add(Calendar.DAY_OF_MONTH, 7 * 2); } Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ForwardHandler.java =================================================================== --- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ForwardHandler.java 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/ForwardHandler.java 2006-08-24 22:17:05 UTC (rev 51) @@ -31,7 +31,7 @@ public Date moveCurrentDate(final DateCalculator<Date> calendar) { - final Calendar cal = Utils.getCal(calendar.getCurrentDate()); + final Calendar cal = Utils.getCal(calendar.getCurrentBusinessDate()); while (calendar.isNonWorkingDay(cal.getTime())) { cal.add(Calendar.DAY_OF_MONTH, 1); Modified: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DateCalculatorCombinationTest.java =================================================================== --- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DateCalculatorCombinationTest.java 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DateCalculatorCombinationTest.java 2006-08-24 22:17:05 UTC (rev 51) @@ -3,7 +3,6 @@ import java.util.Date; import junit.framework.Assert; - import net.objectlab.kit.datecalc.common.DateCalculator; import net.objectlab.kit.datecalc.common.HolidayHandlerType; @@ -62,7 +61,7 @@ Assert.assertEquals("Combo name", "bla/UK", combo.getName()); Assert.assertEquals("Combo type", HolidayHandlerType.FORWARD, combo.getHolidayHandlerType()); Assert.assertEquals("start", Date, combo.getStartDate()); - Assert.assertEquals("currentDate", Date, combo.getCurrentDate()); + Assert.assertEquals("currentDate", Date, combo.getCurrentBusinessDate()); Assert.assertEquals("Holidays", 4, combo.getNonWorkingDays().size()); } @@ -80,7 +79,7 @@ Assert.assertEquals("Combo name", "UK/UK", combo.getName()); Assert.assertEquals("Combo type", HolidayHandlerType.FORWARD, combo.getHolidayHandlerType()); Assert.assertEquals("start", Date, combo.getStartDate()); - Assert.assertEquals("currentDate", Date, combo.getCurrentDate()); + Assert.assertEquals("currentDate", Date, combo.getCurrentBusinessDate()); Assert.assertEquals("Holidays", 4, combo.getNonWorkingDays().size()); } @@ -98,7 +97,7 @@ Assert.assertEquals("Combo name", "US/UK", combo.getName()); Assert.assertEquals("Combo type", HolidayHandlerType.FORWARD, combo.getHolidayHandlerType()); Assert.assertEquals("start", Date, combo.getStartDate()); - Assert.assertEquals("currentDate", Date, combo.getCurrentDate()); + Assert.assertEquals("currentDate", Date, combo.getCurrentBusinessDate()); Assert.assertEquals("Holidays", 6, combo.getNonWorkingDays().size()); } @@ -114,7 +113,7 @@ Assert.assertEquals("Combo name", "US", combo.getName()); Assert.assertEquals("Combo type", HolidayHandlerType.FORWARD, combo.getHolidayHandlerType()); Assert.assertEquals("start", Date, combo.getStartDate()); - Assert.assertEquals("currentDate", Date, combo.getCurrentDate()); + Assert.assertEquals("currentDate", Date, combo.getCurrentBusinessDate()); Assert.assertEquals("Holidays", 3, combo.getNonWorkingDays().size()); } @@ -130,7 +129,7 @@ Assert.assertEquals("Combo name", "US", combo.getName()); Assert.assertEquals("Combo type", HolidayHandlerType.FORWARD, combo.getHolidayHandlerType()); Assert.assertEquals("start", Date, combo.getStartDate()); - Assert.assertEquals("currentDate", Date, combo.getCurrentDate()); + Assert.assertEquals("currentDate", Date, combo.getCurrentBusinessDate()); Assert.assertEquals("Holidays", 3, combo.getNonWorkingDays().size()); } } Modified: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DateCalculatorFactoryTest.java =================================================================== --- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DateCalculatorFactoryTest.java 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DateCalculatorFactoryTest.java 2006-08-24 22:17:05 UTC (rev 51) @@ -4,7 +4,6 @@ import java.util.Set; import junit.framework.Assert; - import net.objectlab.kit.datecalc.common.DateCalculator; import net.objectlab.kit.datecalc.common.HolidayHandlerType; Modified: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/ForwardDateCalculatorTest.java =================================================================== --- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/ForwardDateCalculatorTest.java 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/ForwardDateCalculatorTest.java 2006-08-24 22:17:05 UTC (rev 51) @@ -1,12 +1,11 @@ package net.objectlab.kit.datecalc.jdk; import java.util.Calendar; -import java.util.HashSet; import java.util.Date; +import java.util.HashSet; import java.util.Set; import junit.framework.Assert; - import net.objectlab.kit.datecalc.common.DateCalculator; import net.objectlab.kit.datecalc.common.HolidayHandlerType; import net.objectlab.kit.datecalc.common.WorkingWeek; @@ -199,6 +198,6 @@ } private void checkDate(final String string, final DateCalculator calendar, final String string2) { - Assert.assertEquals(string, createDate(string2), calendar.getCurrentDate()); + Assert.assertEquals(string, createDate(string2), calendar.getCurrentBusinessDate()); } } Modified: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JodaWorkingWeekTest.java =================================================================== --- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JodaWorkingWeekTest.java 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JodaWorkingWeekTest.java 2006-08-24 22:17:05 UTC (rev 51) @@ -17,10 +17,9 @@ import java.util.Calendar; -import net.objectlab.kit.datecalc.common.WorkingWeek; - import junit.framework.Assert; import junit.framework.TestCase; +import net.objectlab.kit.datecalc.common.WorkingWeek; /** * @author Benoit Xhenseval Modified: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/PeriodCountCalculatorTest.java =================================================================== --- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/PeriodCountCalculatorTest.java 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/PeriodCountCalculatorTest.java 2006-08-24 22:17:05 UTC (rev 51) @@ -19,7 +19,6 @@ import java.util.Date; import junit.framework.Assert; - import net.objectlab.kit.datecalc.common.PeriodCountBasis; public class PeriodCountCalculatorTest extends AbstractDateCalculatorTest { @@ -278,8 +277,8 @@ Assert.assertEquals(name + " Basis:" + pcount + " start:" + start + " dayDiff", dayDiff, cal.dayDiff(start, end, pcount)); final BigDecimal yearDiff = new BigDecimal(cal.yearDiff(start, end, pcount)).setScale(6, BigDecimal.ROUND_HALF_UP); - Assert.assertTrue(name + " Basis:" + pcount + " yearDiff expected:" + test[5] + " got:" + yearDiff, (new BigDecimal(test[5])) - .compareTo(yearDiff) == 0); + Assert.assertTrue(name + " Basis:" + pcount + " yearDiff expected:" + test[5] + " got:" + yearDiff, (new BigDecimal( + test[5])).compareTo(yearDiff) == 0); } } \ No newline at end of file Modified: trunk/datecalc-joda/qalab.xml =================================================================== --- trunk/datecalc-joda/qalab.xml 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-joda/qalab.xml 2006-08-24 22:17:05 UTC (rev 51) @@ -43,6 +43,8 @@ <summaryresult date="2006-08-23" filecount="11" statvalue="1" type="checkstyle"/> <summaryresult date="2006-08-23" filecount="10" statvalue="93" type="cobertura-line"/> <summaryresult date="2006-08-23" filecount="10" statvalue="95" type="cobertura-branch"/> + <summaryresult date="2006-08-24" filecount="10" statvalue="93" type="cobertura-line"/> + <summaryresult date="2006-08-24" filecount="10" statvalue="94" type="cobertura-branch"/> </summary> <file id="net_objectlab_kit_datecalc_joda_package.html" path="net/objectlab/kit/datecalc/joda/package.html"> <result date="2006-08-08" statvalue="1" type="checkstyle"/> @@ -73,6 +75,8 @@ <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> <result date="2006-08-23" statvalue="97" type="cobertura-line"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="100" type="cobertura-line"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_joda_DefaultDateCalculatorFactory.java" path="net/objectlab/kit/datecalc/joda/DefaultDateCalculatorFactory.java"> @@ -91,6 +95,8 @@ <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> <result date="2006-08-23" statvalue="100" type="cobertura-line"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="100" type="cobertura-line"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_joda_DefaultPeriodCountCalculator.java" path="net/objectlab/kit/datecalc/joda/DefaultPeriodCountCalculator.java"> @@ -112,6 +118,8 @@ <result date="2006-08-20" statvalue="84" type="cobertura-branch"/> <result date="2006-08-23" statvalue="81" type="cobertura-line"/> <result date="2006-08-23" statvalue="84" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="81" type="cobertura-line"/> + <result date="2006-08-24" statvalue="84" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_joda_JodaWorkingWeek.java" path="net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java"> <result date="2006-08-08" statvalue="1" type="checkstyle"/> @@ -129,6 +137,8 @@ <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> <result date="2006-08-23" statvalue="100" type="cobertura-line"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="100" type="cobertura-line"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_joda_BackwardHandler.java" path="net/objectlab/kit/datecalc/joda/BackwardHandler.java"> <result date="2006-08-08" statvalue="28" type="cobertura-line"/> @@ -140,6 +150,8 @@ <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> <result date="2006-08-23" statvalue="100" type="cobertura-line"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="100" type="cobertura-line"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_joda_DateCalculator.java" path="net/objectlab/kit/datecalc/joda/DateCalculator.java"> <result date="2006-08-08" statvalue="100" type="cobertura-line"/> @@ -167,6 +179,8 @@ <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> <result date="2006-08-23" statvalue="100" type="cobertura-line"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="100" type="cobertura-line"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_joda_ForwardHandler.java" path="net/objectlab/kit/datecalc/joda/ForwardHandler.java"> <result date="2006-08-08" statvalue="100" type="cobertura-line"/> @@ -181,6 +195,8 @@ <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> <result date="2006-08-23" statvalue="100" type="cobertura-line"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="100" type="cobertura-line"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_joda_HolidayHandler.java" path="net/objectlab/kit/datecalc/joda/HolidayHandler.java"> <result date="2006-08-08" statvalue="100" type="cobertura-line"/> @@ -208,6 +224,8 @@ <result date="2006-08-20" statvalue="100" type="cobertura-branch"/> <result date="2006-08-23" statvalue="100" type="cobertura-line"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="100" type="cobertura-line"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_joda_ModifiedFollowingHandler.java" path="net/objectlab/kit/datecalc/joda/ModifiedFollowingHandler.java"> @@ -217,6 +235,8 @@ <result date="2006-08-20" statvalue="16" type="cobertura-line"/> <result date="2006-08-23" statvalue="100" type="cobertura-line"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="100" type="cobertura-line"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> <file id="net_objectlab_kit_datecalc_joda_ModifiedPreceedingHandler.java" path="net/objectlab/kit/datecalc/joda/ModifiedPreceedingHandler.java"> @@ -226,5 +246,7 @@ <result date="2006-08-20" statvalue="16" type="cobertura-line"/> <result date="2006-08-23" statvalue="75" type="cobertura-line"/> <result date="2006-08-23" statvalue="100" type="cobertura-branch"/> + <result date="2006-08-24" statvalue="75" type="cobertura-line"/> + <result date="2006-08-24" statvalue="100" type="cobertura-branch"/> </file> </qalab> Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/BackwardHandler.java =================================================================== --- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/BackwardHandler.java 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/BackwardHandler.java 2006-08-24 22:17:05 UTC (rev 51) @@ -30,7 +30,7 @@ public class BackwardHandler implements HolidayHandler<LocalDate> { public LocalDate moveCurrentDate(final DateCalculator<LocalDate> calendar) { - LocalDate date = calendar.getCurrentDate(); + LocalDate date = calendar.getCurrentBusinessDate(); while (calendar.isNonWorkingDay(date)) { date = date.minusDays(1); } Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/BaseDateCalculator.java =================================================================== --- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/BaseDateCalculator.java 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/BaseDateCalculator.java 2006-08-24 22:17:05 UTC (rev 51) @@ -65,22 +65,22 @@ } public DateCalculator<LocalDate> moveByDays(final int days) { - if (currentDate == null) { + if (getCurrentBusinessDate() == null) { initialise(); } - currentDate = currentDate.plusDays(days); + setCurrentBusinessDate(getCurrentBusinessDate().plusDays(days)); - if (holidayHandler != null) { - currentDate = holidayHandler.moveCurrentDate(this); + if (getHolidayHandler() != null) { + setCurrentBusinessDate(getHolidayHandler().moveCurrentDate(this)); } return this; } private void initialise() { - if (startDate == null) { + if (getStartDate() == null) { setStartDate(new LocalDate()); - } else if (currentDate == null) { + } else if (getCurrentBusinessDate() == null) { setCurrentBusinessDate(new LocalDate()); } } Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ForwardHandler.java =================================================================== --- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ForwardHandler.java 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ForwardHandler.java 2006-08-24 22:17:05 UTC (rev 51) @@ -30,7 +30,7 @@ public class ForwardHandler implements HolidayHandler<LocalDate> { public LocalDate moveCurrentDate(final DateCalculator<LocalDate> calendar) { - LocalDate date = calendar.getCurrentDate(); + LocalDate date = calendar.getCurrentBusinessDate(); while (calendar.isNonWorkingDay(date)) { date = date.plusDays(1); } Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ModifiedFollowingHandler.java =================================================================== --- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ModifiedFollowingHandler.java 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ModifiedFollowingHandler.java 2006-08-24 22:17:05 UTC (rev 51) @@ -31,7 +31,7 @@ public class ModifiedFollowingHandler implements HolidayHandler<LocalDate> { public LocalDate moveCurrentDate(final DateCalculator<LocalDate> calendar) { - LocalDate date = calendar.getCurrentDate(); + LocalDate date = calendar.getCurrentBusinessDate(); final int month = date.getMonthOfYear(); int step = 1; while (calendar.isNonWorkingDay(date)) { Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ModifiedPreceedingHandler.java =================================================================== --- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ModifiedPreceedingHandler.java 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/ModifiedPreceedingHandler.java 2006-08-24 22:17:05 UTC (rev 51) @@ -31,7 +31,7 @@ public class ModifiedPreceedingHandler implements HolidayHandler<LocalDate> { public LocalDate moveCurrentDate(final DateCalculator<LocalDate> calendar) { - LocalDate date = calendar.getCurrentDate(); + LocalDate date = calendar.getCurrentBusinessDate(); final int month = date.getMonthOfYear(); int step = -1; while (calendar.isNonWorkingDay(date)) { Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/BackwardDateCalculatorTest.java =================================================================== --- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/BackwardDateCalculatorTest.java 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/BackwardDateCalculatorTest.java 2006-08-24 22:17:05 UTC (rev 51) @@ -222,7 +222,8 @@ cal.setStartDate(new LocalDate("2006-08-24")); checkDate("Add 1 week", cal.moveByDays(7), "2006-08-31"); cal.setStartDate(new LocalDate("2006-08-24")); -// checkDate("Move by 1W with 1 bank holiday", cal.moveByBusinessDays(7), "2006-09-05"); + // checkDate("Move by 1W with 1 bank holiday", + // cal.moveByBusinessDays(7), "2006-09-05"); } @@ -259,6 +260,6 @@ } private void checkDate(final String string, final DateCalculator calendar, final String string2) { - Assert.assertEquals(string, new LocalDate(string2), calendar.getCurrentDate()); + Assert.assertEquals(string, new LocalDate(string2), calendar.getCurrentBusinessDate()); } } Modified: 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-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateCalculatorCombinationTest.java 2006-08-24 22:17:05 UTC (rev 51) @@ -61,7 +61,7 @@ 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.getCurrentDate()); + Assert.assertEquals("currentDate", localDate, combo.getCurrentBusinessDate()); Assert.assertEquals("Holidays", 4, combo.getNonWorkingDays().size()); } @@ -79,7 +79,7 @@ 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.getCurrentDate()); + Assert.assertEquals("currentDate", localDate, combo.getCurrentBusinessDate()); Assert.assertEquals("Holidays", 4, combo.getNonWorkingDays().size()); } @@ -97,7 +97,7 @@ 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.getCurrentDate()); + Assert.assertEquals("currentDate", localDate, combo.getCurrentBusinessDate()); Assert.assertEquals("Holidays", 6, combo.getNonWorkingDays().size()); } @@ -113,7 +113,7 @@ 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.getCurrentDate()); + Assert.assertEquals("currentDate", localDate, combo.getCurrentBusinessDate()); Assert.assertEquals("Holidays", 3, combo.getNonWorkingDays().size()); } @@ -129,7 +129,7 @@ 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.getCurrentDate()); + 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/DateCalculatorFactoryTest.java =================================================================== --- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateCalculatorFactoryTest.java 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateCalculatorFactoryTest.java 2006-08-24 22:17:05 UTC (rev 51) @@ -76,16 +76,16 @@ Assert.assertNotNull("No hol", cal1.getNonWorkingDays()); Assert.assertTrue("empty hol", cal1.getNonWorkingDays().isEmpty()); - LocalDate date = cal1.moveByDays(0).getCurrentDate(); + LocalDate date = cal1.moveByDays(0).getCurrentBusinessDate(); Assert.assertEquals("default today", new LocalDate(), date); cal1.setStartDate(null); - date = cal1.moveByDays(0).getCurrentDate(); + date = cal1.moveByDays(0).getCurrentBusinessDate(); Assert.assertEquals("default today", new LocalDate(), date); cal1.setStartDate(new LocalDate("2006-08-08")); cal1.setCurrentBusinessDate(null); - date = cal1.moveByDays(0).getCurrentDate(); + date = cal1.moveByDays(0).getCurrentBusinessDate(); Assert.assertEquals("default today", new LocalDate(), date); } Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ForwardDateCalculatorTest.java =================================================================== --- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ForwardDateCalculatorTest.java 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ForwardDateCalculatorTest.java 2006-08-24 22:17:05 UTC (rev 51) @@ -256,6 +256,6 @@ } private void checkDate(final String string, final DateCalculator calendar, final String string2) { - Assert.assertEquals(string, new LocalDate(string2), calendar.getCurrentDate()); + Assert.assertEquals(string, new LocalDate(string2), calendar.getCurrentBusinessDate()); } } Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/IMMDateTest.java =================================================================== --- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/IMMDateTest.java 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/IMMDateTest.java 2006-08-24 22:17:05 UTC (rev 51) @@ -90,7 +90,7 @@ cal.setStartDate(startDate); Assert.assertEquals("From " + cal.getStartDate(), new LocalDate("2006-06-21"), cal.moveByTenor(StandardTenor.IMM) - .getCurrentDate()); + .getCurrentBusinessDate()); } Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ModifiedFollowingDateCalculatorTest.java =================================================================== --- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ModifiedFollowingDateCalculatorTest.java 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ModifiedFollowingDateCalculatorTest.java 2006-08-24 22:17:05 UTC (rev 51) @@ -254,7 +254,7 @@ cal.setStartDate(new LocalDate("2006-08-08")); checkDate("Move 4W", cal.moveByTenor(new Tenor(4, TenorCode.WEEK)), "2006-09-05"); } - + public void testAddAcrossMonth() { final DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLLOWING); @@ -265,18 +265,18 @@ cal.moveByDays(1); checkDate("do move to next month", cal, "2006-08-01"); - + // now if it due to roll over: cal.setStartDate(new LocalDate("2006-07-28")); - Set<LocalDate> hol = new HashSet<LocalDate>(); + final Set<LocalDate> hol = new HashSet<LocalDate>(); hol.add(new LocalDate("2006-07-31")); cal.setNonWorkingDays(hol); cal.moveByDays(1); - + checkDate("do NOT move to next month", cal, "2006-07-28"); } private void checkDate(final String string, final DateCalculator calendar, final String string2) { - Assert.assertEquals(string, new LocalDate(string2), calendar.getCurrentDate()); + Assert.assertEquals(string, new LocalDate(string2), calendar.getCurrentBusinessDate()); } } Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ModifiedPreceedingDateCalculatorTest.java =================================================================== --- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ModifiedPreceedingDateCalculatorTest.java 2006-08-24 21:37:58 UTC (rev 50) +++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ModifiedPreceedingDateCalculatorTest.java 2006-08-24 22:17:05 UTC (rev 51) @@ -254,7 +254,7 @@ cal.setStartDate(new LocalDate("2006-08-08")); checkDate("Move 4W", cal.moveByTenor(new Tenor(4, TenorCode.WEEK)), "2006-09-05"); } - + public void testAddAcrossMonth() { final DateCalculator cal = DefaultDateCalculatorFactory.getDefaultInstance().getDateCalculator("bla", HolidayHandlerType.MODIFIED_FOLLLOWING); @@ -265,18 +265,18 @@ cal.moveByDays(-1); checkDate("do move to next month", cal, "2006-07-31"); - + // now if it due to roll over: cal.setStartDate(new LocalDate("2006-08-02")); - Set<LocalDate> hol = new HashSet<LocalDate>(); + final Set<LocalDate> hol = new HashSet<LocalDate>(); hol.add(new LocalDate("2006-08-01")); cal.setNonWorkingDays(hol); cal.moveByDays(-1); - + checkDate("do NOT move to next month", cal, "2006-08-02"); } private void checkDate(final String string, final DateCalculator calendar, final String string2) { - Assert.assertEquals(string, new LocalDate(string2), calendar.getCurrentDate()); + Assert.assertEquals(string, new LocalDate(string2), calendar.getCurrentBusinessDate()); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
