Menu
▾
▴
[Objectlabkit-svn] SF.net SVN: objectlabkit: [121] trunk
|
From: <be...@us...> - 2006-09-06 14:41:54
|
Revision: 121
http://svn.sourceforge.net/objectlabkit/?rev=121&view=rev
Author: benoitx
Date: 2006-09-06 07:41:28 -0700 (Wed, 06 Sep 2006)
Log Message:
-----------
Increase coverage.
Modified Paths:
--------------
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractExcelDateUtilTest.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/CalendarExcelDateUtilTest.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/DateExcelDateUtilTest.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/UtilsTest.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingHandler.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateTimeExcelDateUtilTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateExcelDateUtilTest.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayExcelDateUtilTest.java
Removed Paths:
-------------
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DatePeriodCountCalculatorTest.java
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractExcelDateUtilTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractExcelDateUtilTest.java 2006-09-06 14:00:18 UTC (rev 120)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractExcelDateUtilTest.java 2006-09-06 14:41:28 UTC (rev 121)
@@ -5,24 +5,31 @@
public abstract class AbstractExcelDateUtilTest<E> extends TestCase {
protected abstract E createDate(final String str);
- protected abstract E createDateFromExcel(double excelDate);
+ protected abstract E createDateFromExcel(double excelDate, boolean use1904windowing);
public void testExcelDate() {
- checkDate(createDate("1899-12-31"), 0);
- checkDate(createDate("1900-01-01"), 1.0);
- checkDate(createDate("1900-03-01"), 61.0);
- checkDate(createDate("1968-06-11"), 25000.0);
- checkDate(createDate("1978-05-31"), 28641.00);
- checkDate(createDate("1999-12-31"), 36525.00);
- checkDate(createDate("2000-01-01"), 36526.00);
- checkDate(createDate("2000-01-01"), 36526.00);
- checkDate(createDate("2000-02-28"), 36584.00);
- checkDate(createDate("2000-02-29"), 36585.00);
- checkDate(createDate("2000-03-01"), 36586.00);
- checkDate(null, -1.0);
+ checkDate(createDate("1899-12-31"), 0, false);
+ checkDate(createDate("1900-01-01"), 1.0, false);
+ checkDate(createDate("1900-03-01"), 61.0, false);
+ checkDate(createDate("1968-06-11"), 25000.0, false);
+ checkDate(createDate("1978-05-31"), 28641.00, false);
+ checkDate(createDate("1999-12-31"), 36525.00, false);
+ checkDate(createDate("2000-01-01"), 36526.00, false);
+ checkDate(createDate("2000-01-01"), 36526.00, false);
+ checkDate(createDate("2000-02-28"), 36584.00, false);
+ checkDate(createDate("2000-02-29"), 36585.00, false);
+ checkDate(createDate("2000-03-01"), 36586.00, false);
+ checkDate(null, -1.0, false);
}
- private void checkDate(final E date, final double excelDate) {
- assertEquals("excel:" + excelDate, date, createDateFromExcel(excelDate));
+ public void testExcelDateUsing1904Windowing() {
+ checkDate(createDate("1904-01-01"), 0.0, true);
+ checkDate(createDate("1904-01-02"), 1.0, true);
+ checkDate(createDate("1904-03-02"), 61.0, true);
+ checkDate(null, -1.0, false);
}
+
+ private void checkDate(final E date, final double excelDate, final boolean use1904windowing) {
+ assertEquals("excel:" + excelDate, date, createDateFromExcel(excelDate, use1904windowing));
+ }
}
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/CalendarExcelDateUtilTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/CalendarExcelDateUtilTest.java 2006-09-06 14:00:18 UTC (rev 120)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/CalendarExcelDateUtilTest.java 2006-09-06 14:41:28 UTC (rev 121)
@@ -10,7 +10,7 @@
}
@Override
- protected Calendar createDateFromExcel(final double excelDate) {
- return ExcelDateUtil.getJavaCalendar(excelDate, false);
+ protected Calendar createDateFromExcel(final double excelDate, final boolean use1904Windowing) {
+ return ExcelDateUtil.getJavaCalendar(excelDate, use1904Windowing);
}
}
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/DateExcelDateUtilTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/DateExcelDateUtilTest.java 2006-09-06 14:00:18 UTC (rev 120)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/DateExcelDateUtilTest.java 2006-09-06 14:41:28 UTC (rev 121)
@@ -10,7 +10,7 @@
}
@Override
- protected Date createDateFromExcel(final double excelDate) {
- return ExcelDateUtil.getJavaDateOnly(excelDate, false);
+ protected Date createDateFromExcel(final double excelDate, final boolean use1904Windowing) {
+ return ExcelDateUtil.getJavaDateOnly(excelDate, use1904Windowing);
}
}
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/UtilsTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/UtilsTest.java 2006-09-06 14:00:18 UTC (rev 120)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/UtilsTest.java 2006-09-06 14:41:28 UTC (rev 121)
@@ -76,4 +76,22 @@
Collections.sort(actual);
assertEquals(expected, actual);
}
+
+ public void testFailCreateDate() {
+ try {
+ Utils.createDate("blablabla");
+ fail("should have thown an IllegalArgumentException");
+ } catch(IllegalArgumentException e) {
+ // all ok
+ }
+ }
+
+ public void testFailCreateCalendar() {
+ try {
+ Utils.createCalendar("blablabla");
+ fail("should have thown an IllegalArgumentException");
+ } catch(IllegalArgumentException e) {
+ // all ok
+ }
+ }
}
Deleted: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DatePeriodCountCalculatorTest.java
===================================================================
--- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DatePeriodCountCalculatorTest.java 2006-09-06 14:00:18 UTC (rev 120)
+++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/DatePeriodCountCalculatorTest.java 2006-09-06 14:41:28 UTC (rev 121)
@@ -1,41 +0,0 @@
-/*
- * 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.jdk;
-
-import java.util.Date;
-
-import net.objectlab.kit.datecalc.common.AbstractPeriodCountCalculator;
-import net.objectlab.kit.datecalc.common.PeriodCountCalculator;
-import net.objectlab.kit.datecalc.common.Utils;
-
-public class DatePeriodCountCalculatorTest extends AbstractPeriodCountCalculator<Date> {
-
- @Override
- public PeriodCountCalculator<Date> getPeriodCountCalculator() {
- return DefaultJdkDateCalculatorFactory.getDefaultInstance().getPeriodCountCalculator();
- }
-
- @Override
- public Date parseDate(final String string) {
- return Utils.createDate(string);
- }
-
- @Override
- public Date getDate() {
- return new Date();
- }
-
-}
\ No newline at end of file
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingHandler.java 2006-09-06 14:00:18 UTC (rev 120)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedPreceedingHandler.java 2006-09-06 14:41:28 UTC (rev 121)
@@ -30,6 +30,10 @@
*/
public class LocalDateModifiedPreceedingHandler implements HolidayHandler<LocalDate> {
+ public String getType() {
+ return HolidayHandlerType.MODIFIED_PRECEEDING;
+ }
+
public LocalDate moveCurrentDate(final DateCalculator<LocalDate> calendar) {
LocalDate date = calendar.getCurrentBusinessDate();
final int month = date.getMonthOfYear();
@@ -44,9 +48,4 @@
}
return date;
}
-
- public String getType() {
- return HolidayHandlerType.MODIFIED_PRECEEDING;
- }
-
}
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java 2006-09-06 14:00:18 UTC (rev 120)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java 2006-09-06 14:41:28 UTC (rev 121)
@@ -32,6 +32,10 @@
*/
public class YearMonthDayModifiedFollowingHandler implements HolidayHandler<YearMonthDay> {
+ public String getType() {
+ return HolidayHandlerType.MODIFIED_FOLLLOWING;
+ }
+
public YearMonthDay moveCurrentDate(final DateCalculator<YearMonthDay> calendar) {
YearMonthDay date = calendar.getCurrentBusinessDate();
final int month = date.getMonthOfYear();
@@ -47,8 +51,4 @@
return date;
}
- public String getType() {
- return HolidayHandlerType.MODIFIED_FOLLLOWING;
- }
-
}
Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateTimeExcelDateUtilTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateTimeExcelDateUtilTest.java 2006-09-06 14:00:18 UTC (rev 120)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/DateTimeExcelDateUtilTest.java 2006-09-06 14:41:28 UTC (rev 121)
@@ -12,7 +12,7 @@
}
@Override
- protected DateTime createDateFromExcel(final double excelDate) {
- return JodaExcelDateUtil.getDateTime(excelDate, false);
+ protected DateTime createDateFromExcel(final double excelDate, final boolean use1904Windowing) {
+ return JodaExcelDateUtil.getDateTime(excelDate, use1904Windowing);
}
}
Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateExcelDateUtilTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateExcelDateUtilTest.java 2006-09-06 14:00:18 UTC (rev 120)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/LocalDateExcelDateUtilTest.java 2006-09-06 14:41:28 UTC (rev 121)
@@ -12,7 +12,7 @@
}
@Override
- protected LocalDate createDateFromExcel(final double excelDate) {
- return JodaExcelDateUtil.getLocalDate(excelDate, false);
+ protected LocalDate createDateFromExcel(final double excelDate, final boolean use1904Windowing) {
+ return JodaExcelDateUtil.getLocalDate(excelDate, use1904Windowing);
}
}
Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayExcelDateUtilTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayExcelDateUtilTest.java 2006-09-06 14:00:18 UTC (rev 120)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/YearMonthDayExcelDateUtilTest.java 2006-09-06 14:41:28 UTC (rev 121)
@@ -12,7 +12,7 @@
}
@Override
- protected YearMonthDay createDateFromExcel(final double excelDate) {
- return JodaExcelDateUtil.getYearMonthDay(excelDate, false);
+ protected YearMonthDay createDateFromExcel(final double excelDate, final boolean use1904Windowing) {
+ return JodaExcelDateUtil.getYearMonthDay(excelDate, use1904Windowing);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
