Menu
▾
▴
[Objectlabkit-svn] SF.net SVN: objectlabkit: [36] trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk
|
From: <ma...@us...> - 2006-08-23 20:06:34
|
Revision: 36 Author: marchy Date: 2006-08-23 13:05:37 -0700 (Wed, 23 Aug 2006) ViewCVS: http://svn.sourceforge.net/objectlabkit/?rev=36&view=rev Log Message: ----------- renamed addDays() to moveByDays() to match moveByBusinessDays() Modified Paths: -------------- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/BaseDateCalculator.java trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateCalculator.java trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/ForwardDateCalculatorTest.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/DateCalculator.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/DateCalculatorFactoryTest.java trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ForwardDateCalculatorTest.java 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-23 12:14:53 UTC (rev 35) +++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/BaseDateCalculator.java 2006-08-23 20:05:37 UTC (rev 36) @@ -142,7 +142,7 @@ return currentDate; } - public DateCalculator addDays(final int days) { + public DateCalculator moveByDays(final int days) { if (currentDate == null) { initialise(); } @@ -167,7 +167,7 @@ final int step = (businessDays < 0 ? -1 : 1); for (int i = 0; i < numberOfStepsLeft; i++) { - addDays(step); + moveByDays(step); } return this; @@ -306,9 +306,9 @@ switch (tenor.getCode()) { case DAY: - return addDays(tenor.getUnits()); + return moveByDays(tenor.getUnits()); case WEEK: - return addDays(tenor.getUnits() * DAYS_IN_WEEK); + return moveByDays(tenor.getUnits() * DAYS_IN_WEEK); case IMM: setCurrentBusinessDate(getNextIMMDate()); return this; Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateCalculator.java =================================================================== --- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateCalculator.java 2006-08-23 12:14:53 UTC (rev 35) +++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateCalculator.java 2006-08-23 20:05:37 UTC (rev 36) @@ -117,7 +117,7 @@ * @return the businessCalendar (so one can do * calendar.addDays(2).getCurrentBusinessDate();) */ - DateCalculator addDays(final int days); + DateCalculator moveByDays(final int days); /** * move the current date by a number of business days, this means that if a 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-23 12:14:53 UTC (rev 35) +++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/ForwardDateCalculatorTest.java 2006-08-23 20:05:37 UTC (rev 36) @@ -20,11 +20,11 @@ final Date startDate = createDate("2006-08-01"); cal.setStartDate(startDate); - checkDate("Move by 0 days", cal.addDays(0), "2006-08-01"); - checkDate("Move by 1 days", cal.addDays(1), "2006-08-02"); - checkDate("Move by 1 more days", cal.addDays(1), "2006-08-03"); - checkDate("Move by 1 more more days", cal.addDays(1), "2006-08-04"); - checkDate("Move by 1 more more more days (across weekend)", cal.addDays(1), "2006-08-07"); + checkDate("Move by 0 days", cal.moveByDays(0), "2006-08-01"); + checkDate("Move by 1 days", cal.moveByDays(1), "2006-08-02"); + checkDate("Move by 1 more days", cal.moveByDays(1), "2006-08-03"); + checkDate("Move by 1 more more days", cal.moveByDays(1), "2006-08-04"); + checkDate("Move by 1 more more more days (across weekend)", cal.moveByDays(1), "2006-08-07"); } public void testSimpleForwardStartDateWithWeekend() { @@ -185,16 +185,16 @@ checkDate("Xmas Eve", cal, "2006-12-27"); cal.setStartDate(createDate("2006-12-21")); - checkDate("21/12 + 1", cal.addDays(1), "2006-12-22"); + checkDate("21/12 + 1", cal.moveByDays(1), "2006-12-22"); cal.setStartDate(createDate("2006-12-21")); - checkDate("21/12 + 1", cal.addDays(2), "2006-12-27"); + checkDate("21/12 + 1", cal.moveByDays(2), "2006-12-27"); cal.setStartDate(createDate("2006-12-22")); - checkDate("22/12 + 1", cal.addDays(1), "2006-12-27"); + checkDate("22/12 + 1", cal.moveByDays(1), "2006-12-27"); cal.setStartDate(createDate("2006-12-23")); - checkDate("23/12 + 1", cal.addDays(1), "2006-12-28"); + checkDate("23/12 + 1", cal.moveByDays(1), "2006-12-28"); } private void checkDate(final String string, final DateCalculator calendar, final String string2) { 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-23 12:14:53 UTC (rev 35) +++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/BaseDateCalculator.java 2006-08-23 20:05:37 UTC (rev 36) @@ -151,7 +151,7 @@ return currentDate; } - public DateCalculator addDays(final int days) { + public DateCalculator moveByDays(final int days) { if (currentDate == null) { initialise(); } @@ -177,7 +177,7 @@ final int step = (businessDays < 0 ? -1 : 1); for (int i = 0; i < numberOfStepsLeft; i++) { - addDays(step); + moveByDays(step); } return this; @@ -361,9 +361,9 @@ setCurrentBusinessDate(getNextIMMDate()); return this; case DAY: - return addDays(tenor.getUnits()); + return moveByDays(tenor.getUnits()); case WEEK: - return addDays(tenor.getUnits() * DAYS_IN_WEEK); + return moveByDays(tenor.getUnits() * DAYS_IN_WEEK); default: throw new UnsupportedOperationException("Sorry not yet..."); } Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DateCalculator.java =================================================================== --- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DateCalculator.java 2006-08-23 12:14:53 UTC (rev 35) +++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/DateCalculator.java 2006-08-23 20:05:37 UTC (rev 36) @@ -122,7 +122,7 @@ * @return the businessCalendar (so one can do * calendar.addDays(2).getCurrentBusinessDate();) */ - DateCalculator addDays(final int days); + DateCalculator moveByDays(final int days); /** * move the current date by a number of business days, this means that if a 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-23 12:14:53 UTC (rev 35) +++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/BackwardDateCalculatorTest.java 2006-08-23 20:05:37 UTC (rev 36) @@ -23,11 +23,11 @@ final LocalDate startDate = new LocalDate("2006-08-01"); cal.setStartDate(startDate); - checkDate("Move by 0 days", cal.addDays(0), "2006-08-01"); - checkDate("Move by 1 days", cal.addDays(1), "2006-08-02"); - checkDate("Move by 1 more days", cal.addDays(1), "2006-08-03"); - checkDate("Move by 1 more more days", cal.addDays(1), "2006-08-04"); - checkDate("Move by 1 more more more days (across weekend)", cal.addDays(1), "2006-08-04"); + checkDate("Move by 0 days", cal.moveByDays(0), "2006-08-01"); + checkDate("Move by 1 days", cal.moveByDays(1), "2006-08-02"); + checkDate("Move by 1 more days", cal.moveByDays(1), "2006-08-03"); + checkDate("Move by 1 more more days", cal.moveByDays(1), "2006-08-04"); + checkDate("Move by 1 more more more days (across weekend)", cal.moveByDays(1), "2006-08-04"); } public void testSimpleBackwardStartDateWithWeekend() { @@ -188,16 +188,16 @@ checkDate("Xmas Eve", cal, "2006-12-22"); cal.setStartDate(new LocalDate("2006-12-21")); - checkDate("21/12 + 1", cal.addDays(1), "2006-12-22"); + checkDate("21/12 + 1", cal.moveByDays(1), "2006-12-22"); cal.setStartDate(new LocalDate("2006-12-21")); - checkDate("21/12 + 1", cal.addDays(2), "2006-12-22"); + checkDate("21/12 + 1", cal.moveByDays(2), "2006-12-22"); cal.setStartDate(new LocalDate("2006-12-22")); - checkDate("22/12 + 1", cal.addDays(1), "2006-12-22"); + checkDate("22/12 + 1", cal.moveByDays(1), "2006-12-22"); cal.setStartDate(new LocalDate("2006-12-23")); - checkDate("23/12 + 1", cal.addDays(1), "2006-12-22"); + checkDate("23/12 + 1", cal.moveByDays(1), "2006-12-22"); } /** @@ -219,7 +219,7 @@ checkDate("Move 1 BD", cal.moveByBusinessDays(1), "2006-08-25"); cal.setStartDate(new LocalDate("2006-08-24")); - checkDate("Add 1 week", cal.addDays(7), "2006-08-31"); + 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"); 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-23 12:14:53 UTC (rev 35) +++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateCalculatorFactoryTest.java 2006-08-23 20:05:37 UTC (rev 36) @@ -75,16 +75,16 @@ Assert.assertNotNull("No hol", cal1.getNonWorkingDays()); Assert.assertTrue("empty hol", cal1.getNonWorkingDays().isEmpty()); - LocalDate date = cal1.addDays(0).getCurrentDate(); + LocalDate date = cal1.moveByDays(0).getCurrentDate(); Assert.assertEquals("default today", new LocalDate(), date); cal1.setStartDate(null); - date = cal1.addDays(0).getCurrentDate(); + date = cal1.moveByDays(0).getCurrentDate(); Assert.assertEquals("default today", new LocalDate(), date); cal1.setStartDate(new LocalDate("2006-08-08")); cal1.setCurrentBusinessDate(null); - date = cal1.addDays(0).getCurrentDate(); + date = cal1.moveByDays(0).getCurrentDate(); 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-23 12:14:53 UTC (rev 35) +++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/ForwardDateCalculatorTest.java 2006-08-23 20:05:37 UTC (rev 36) @@ -23,11 +23,11 @@ final LocalDate startDate = new LocalDate("2006-08-01"); cal.setStartDate(startDate); - checkDate("Move by 0 days", cal.addDays(0), "2006-08-01"); - checkDate("Move by 1 days", cal.addDays(1), "2006-08-02"); - checkDate("Move by 1 more days", cal.addDays(1), "2006-08-03"); - checkDate("Move by 1 more more days", cal.addDays(1), "2006-08-04"); - checkDate("Move by 1 more more more days (across weekend)", cal.addDays(1), "2006-08-07"); + checkDate("Move by 0 days", cal.moveByDays(0), "2006-08-01"); + checkDate("Move by 1 days", cal.moveByDays(1), "2006-08-02"); + checkDate("Move by 1 more days", cal.moveByDays(1), "2006-08-03"); + checkDate("Move by 1 more more days", cal.moveByDays(1), "2006-08-04"); + checkDate("Move by 1 more more more days (across weekend)", cal.moveByDays(1), "2006-08-07"); } public void testSimpleForwardStartDateWithWeekend() { @@ -188,16 +188,16 @@ checkDate("Xmas Eve", cal, "2006-12-27"); cal.setStartDate(new LocalDate("2006-12-21")); - checkDate("21/12 + 1", cal.addDays(1), "2006-12-22"); + checkDate("21/12 + 1", cal.moveByDays(1), "2006-12-22"); cal.setStartDate(new LocalDate("2006-12-21")); - checkDate("21/12 + 1", cal.addDays(2), "2006-12-27"); + checkDate("21/12 + 1", cal.moveByDays(2), "2006-12-27"); cal.setStartDate(new LocalDate("2006-12-22")); - checkDate("22/12 + 1", cal.addDays(1), "2006-12-27"); + checkDate("22/12 + 1", cal.moveByDays(1), "2006-12-27"); cal.setStartDate(new LocalDate("2006-12-23")); - checkDate("23/12 + 1", cal.addDays(1), "2006-12-28"); + checkDate("23/12 + 1", cal.moveByDays(1), "2006-12-28"); } public void testMoveByBusinessDays() { @@ -216,7 +216,7 @@ checkDate("Move 1 BD", cal.moveByBusinessDays(1), "2006-08-25"); cal.setStartDate(new LocalDate("2006-08-24")); - checkDate("Add 1 week", cal.addDays(7), "2006-08-31"); + 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"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
