Menu
▾
▴
[Objectlabkit-svn] SF.net SVN: objectlabkit: [142] trunk/datecalc-common/src
|
From: <be...@us...> - 2006-09-10 13:56:07
|
Revision: 142
http://svn.sourceforge.net/objectlabkit/?rev=142&view=rev
Author: benoitx
Date: 2006-09-10 06:55:43 -0700 (Sun, 10 Sep 2006)
Log Message:
-----------
Removed some tenor codes which aren't real ones..
Modified Paths:
--------------
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/StandardTenor.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/TenorCode.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/TenorTest.java
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-09-10 13:45:41 UTC (rev 141)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2006-09-10 13:55:43 UTC (rev 142)
@@ -111,11 +111,18 @@
throw new IllegalArgumentException("Tenor cannot be null");
}
- // get to the Spot date first:
- moveByDays(daysToSpot);
+ final TenorCode tenorCode = tenor.getCode();
+ if (tenorCode != TenorCode.OVERNIGHT) {
+ // get to the Spot date first:
+ moveByDays(daysToSpot);
+ }
// move by tenor
- switch (tenor.getCode()) {
+ switch (tenorCode) {
+ case OVERNIGHT:
+ return moveByDays(1);
+ case SPOT:
+ return this;
case DAY:
return moveByDays(tenor.getUnits());
case WEEK:
@@ -171,8 +178,8 @@
&& holidayHandler != null
&& (holidayHandler.getType().equals(HolidayHandlerType.FORWARD) || holidayHandler.getType().equals(
HolidayHandlerType.MODIFIED_FOLLLOWING))) {
- throw new IllegalArgumentException("A " + HolidayHandlerType.MODIFIED_FOLLLOWING + " or "
- + HolidayHandlerType.FORWARD + " does not allow negative steps for moveByBusinessDays");
+ throw new IllegalArgumentException("A " + HolidayHandlerType.MODIFIED_FOLLLOWING + " or " + HolidayHandlerType.FORWARD
+ + " does not allow negative steps for moveByBusinessDays");
}
final int numberOfStepsLeft = Math.abs(businessDays);
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/StandardTenor.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/StandardTenor.java 2006-09-10 13:45:41 UTC (rev 141)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/StandardTenor.java 2006-09-10 13:55:43 UTC (rev 142)
@@ -28,12 +28,6 @@
public static final Tenor OVERNIGHT = new Tenor(0, TenorCode.OVERNIGHT);
- public static final Tenor TOM_NEXT = new Tenor(0, TenorCode.TOMNEXT);
-
- public static final Tenor SPOT_NEXT = new Tenor(0, TenorCode.SPOTNEXT);
-
- public static final Tenor SPOT_WEEK = new Tenor(0, TenorCode.SPOTWEEK);
-
public static final Tenor T_1D = new Tenor(1, TenorCode.DAY);
public static final Tenor T_1W = new Tenor(1, TenorCode.WEEK);
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/TenorCode.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/TenorCode.java 2006-09-10 13:45:41 UTC (rev 141)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/TenorCode.java 2006-09-10 13:55:43 UTC (rev 142)
@@ -16,8 +16,12 @@
package net.objectlab.kit.datecalc.common;
public enum TenorCode {
- OVERNIGHT("ON", false), TOMNEXT("TN", false), SPOT("SP", false), SPOTNEXT("SN", false), SPOTWEEK("SW", false), DAY("D", true), WEEK(
- "W", true), MONTH("M", true), YEAR("Y", true);
+ OVERNIGHT("ON", false),
+ // TOMNEXT("TN", false),
+ SPOT("SP", false),
+ // SPOTNEXT("SN", false),
+ // SPOTWEEK("SW", false),
+ DAY("D", true), WEEK("W", true), MONTH("M", true), YEAR("Y", true);
private final String code;
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java 2006-09-10 13:45:41 UTC (rev 141)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateTestCase.java 2006-09-10 13:55:43 UTC (rev 142)
@@ -66,8 +66,8 @@
final DateCalculator<E> cal = newDateCalculator("bla", holidayHandlerType);
cal.setNonWorkingDays(createUKHolidays());
cal.setStartDate(newDate(startDate));
- checkDate("Move start:" + startDate + " tenor:" + tenor + " daysToSpot:" + daysToSpot,
- cal.moveByTenor(tenor, daysToSpot), expectedDate);
+ checkDate("Move start:" + startDate + " tenor:" + tenor + " daysToSpot:" + daysToSpot, cal.moveByTenor(tenor, daysToSpot),
+ expectedDate);
}
}
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/TenorTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/TenorTest.java 2006-09-10 13:45:41 UTC (rev 141)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/TenorTest.java 2006-09-10 13:55:43 UTC (rev 142)
@@ -48,9 +48,6 @@
public void testValidTenors() {
checkValidTenor("SP", false, TenorCode.SPOT, 0);
checkValidTenor("ON", false, TenorCode.OVERNIGHT, 0);
- checkValidTenor("SW", false, TenorCode.SPOTWEEK, 0);
- checkValidTenor("SN", false, TenorCode.SPOTNEXT, 0);
- checkValidTenor("TN", false, TenorCode.TOMNEXT, 0);
checkValidTenor("1D", true, TenorCode.DAY, 1);
checkValidTenor("0D", true, TenorCode.DAY, 0);
@@ -76,9 +73,6 @@
public void testToString() {
checkToString("SP");
checkToString("ON");
- checkToString("SW");
- checkToString("SN");
- checkToString("TN");
checkToString("1D");
checkToString("1W");
checkToString("1M");
@@ -90,10 +84,10 @@
public void testHashcode() {
final Set<Tenor> set = new HashSet<Tenor>();
set.add(StandardTenor.OVERNIGHT);
+ set.add(StandardTenor.T_1D);
set.add(StandardTenor.T_15Y);
- set.add(StandardTenor.SPOT_WEEK);
Assert.assertEquals("size", 3, set.size());
- Assert.assertTrue("Contains " + StandardTenor.SPOT_WEEK, set.contains(StandardTenor.SPOT_WEEK));
+ Assert.assertTrue("Contains " + StandardTenor.T_1D, set.contains(StandardTenor.T_1D));
Assert.assertTrue("Contains " + StandardTenor.OVERNIGHT, set.contains(StandardTenor.OVERNIGHT));
Assert.assertTrue("Contains " + StandardTenor.T_15Y, set.contains(StandardTenor.T_15Y));
Assert.assertEquals("Equals ", StandardTenor.T_15Y, StandardTenor.T_15Y);
@@ -102,7 +96,7 @@
public void testEquals() {
Assert.assertEquals("Equals ", StandardTenor.T_15Y, StandardTenor.T_15Y);
Assert.assertTrue("same", StandardTenor.OVERNIGHT.equals(StandardTenor.OVERNIGHT));
- Assert.assertFalse("not same", StandardTenor.OVERNIGHT.equals(StandardTenor.SPOT_NEXT));
+ Assert.assertFalse("not same", StandardTenor.OVERNIGHT.equals(StandardTenor.SPOT));
Assert.assertFalse("Different class", StandardTenor.OVERNIGHT.equals("Hello"));
Assert.assertFalse("Null", StandardTenor.OVERNIGHT.equals(null));
Assert.assertTrue("same", StandardTenor.T_10Y.equals(StandardTenor.T_10Y));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
