Menu
▾
▴
[Objectlabkit-svn] SF.net SVN: objectlabkit: [63] trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk
|
From: <ma...@us...> - 2006-08-26 09:59:13
|
Revision: 63 Author: marchy Date: 2006-08-26 02:58:46 -0700 (Sat, 26 Aug 2006) ViewCVS: http://svn.sourceforge.net/objectlabkit/?rev=63&view=rev Log Message: ----------- Making tests pass. Renamed JodaWorkingWeekTest.java test to JdkWorkingWeekTest.java Modified Paths: -------------- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/ForwardDateCalculatorTest.java Added Paths: ----------- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkWorkingWeekTest.java Removed Paths: ------------- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JodaWorkingWeekTest.java 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-26 09:34:14 UTC (rev 62) +++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/ForwardDateCalculatorTest.java 2006-08-26 09:58:46 UTC (rev 63) @@ -65,26 +65,26 @@ Assert.assertEquals("Name", "bla", cal.getName()); Assert.assertEquals("Holidays size", 0, cal.getNonWorkingDays().size()); - cal.setStartDate(createDate("2006-07-31")); // start date Monday + cal.setStartDate(createDate("2006-07-31")); checkDate("start date Monday", cal, "2006-07-31"); - cal.setStartDate(createDate("2006-08-01")); // start date Tuesday + cal.setStartDate(createDate("2006-08-01")); checkDate("start date Tuesday", cal, "2006-08-01"); - cal.setStartDate(createDate("2006-08-02")); // start date Wednesday + cal.setStartDate(createDate("2006-08-02")); checkDate("start date Wednesday", cal, "2006-08-02"); - cal.setStartDate(createDate("2006-08-03")); // start date Thursday + cal.setStartDate(createDate("2006-08-03")); checkDate("start date Thursday", cal, "2006-08-03"); - cal.setStartDate(createDate("2006-08-04")); // set on a Friday + cal.setStartDate(createDate("2006-08-04")); checkDate("start date friday", cal, "2006-08-04"); - cal.setStartDate(createDate("2006-08-05")); // set on a Saturday - checkDate("start date Saturday", cal, "2006-08-05"); + cal.setStartDate(createDate("2006-08-05")); + checkDate("start date Saturday, move to Monday", cal, "2006-08-07"); - cal.setStartDate(createDate("2006-08-06")); // set on a Sunday - checkDate("start date Sunday", cal, "2006-08-06"); + cal.setStartDate(createDate("2006-08-06")); + checkDate("start date Sunday, move to Monday", cal, "2006-08-07"); } public void testSimpleForwardStartDateWhackyWeek() { Copied: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkWorkingWeekTest.java (from rev 57, trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JodaWorkingWeekTest.java) =================================================================== --- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkWorkingWeekTest.java (rev 0) +++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkWorkingWeekTest.java 2006-08-26 09:58:46 UTC (rev 63) @@ -0,0 +1,78 @@ +/* + * 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.Calendar; + +import junit.framework.Assert; +import junit.framework.TestCase; +import net.objectlab.kit.datecalc.common.WorkingWeek; + +/** + * @author Benoit Xhenseval + */ +public class JdkWorkingWeekTest extends TestCase { + + public void testIsWorkingDayFromCalendar() { + final WorkingWeek ww = new WorkingWeek(); + Assert.assertTrue("Calendar.MONDAY", ww.isWorkingDayFromCalendar(Calendar.MONDAY)); + Assert.assertTrue("Calendar.TUESDAY", ww.isWorkingDayFromCalendar(Calendar.TUESDAY)); + Assert.assertTrue("Calendar.WEDNESDAY", ww.isWorkingDayFromCalendar(Calendar.WEDNESDAY)); + Assert.assertTrue("Calendar.THURSDAY", ww.isWorkingDayFromCalendar(Calendar.THURSDAY)); + Assert.assertTrue("Calendar.FRIDAY", ww.isWorkingDayFromCalendar(Calendar.FRIDAY)); + Assert.assertFalse("Calendar.SATURDAY", ww.isWorkingDayFromCalendar(Calendar.SATURDAY)); + Assert.assertFalse("Calendar.SUNDAY", ww.isWorkingDayFromCalendar(Calendar.SUNDAY)); + } + + public void testSetWorkingDayFromCalendar() { + final WorkingWeek ww = new WorkingWeek(); + ww.withWorkingDayFromCalendar(true, Calendar.SUNDAY); // sunday + // working + // day + ww.withWorkingDayFromCalendar(true, Calendar.SUNDAY); // sunday + // working + // day + // do + // it + // twice + Assert.assertTrue("Calendar.MONDAY", ww.isWorkingDayFromCalendar(Calendar.MONDAY)); + Assert.assertTrue("Calendar.TUESDAY", ww.isWorkingDayFromCalendar(Calendar.TUESDAY)); + Assert.assertTrue("Calendar.WEDNESDAY", ww.isWorkingDayFromCalendar(Calendar.WEDNESDAY)); + Assert.assertTrue("Calendar.THURSDAY", ww.isWorkingDayFromCalendar(Calendar.THURSDAY)); + Assert.assertTrue("Calendar.FRIDAY", ww.isWorkingDayFromCalendar(Calendar.FRIDAY)); + Assert.assertFalse("Calendar.SATURDAY", ww.isWorkingDayFromCalendar(Calendar.SATURDAY)); + Assert.assertFalse("Calendar.SUNDAY", ww.isWorkingDayFromCalendar(Calendar.SUNDAY)); + + ww.withWorkingDayFromCalendar(false, Calendar.SUNDAY); // sunday + // working + // day + Assert.assertTrue("2/ Calendar.MONDAY", ww.isWorkingDayFromCalendar(Calendar.MONDAY)); + Assert.assertTrue("2/ Calendar.TUESDAY", ww.isWorkingDayFromCalendar(Calendar.TUESDAY)); + Assert.assertTrue("2/ Calendar.WEDNESDAY", ww.isWorkingDayFromCalendar(Calendar.WEDNESDAY)); + Assert.assertTrue("2/ Calendar.THURSDAY", ww.isWorkingDayFromCalendar(Calendar.THURSDAY)); + Assert.assertTrue("2/ Calendar.FRIDAY", ww.isWorkingDayFromCalendar(Calendar.FRIDAY)); + Assert.assertFalse("2/ Calendar.SATURDAY", ww.isWorkingDayFromCalendar(Calendar.SATURDAY)); + Assert.assertFalse("2/ Calendar.SUNDAY", ww.isWorkingDayFromCalendar(Calendar.SUNDAY)); + + ww.withWorkingDayFromCalendar(true, Calendar.SUNDAY); // sunday + // working + // day + // do + // it + // twice + } + +} Deleted: 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-26 09:34:14 UTC (rev 62) +++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JodaWorkingWeekTest.java 2006-08-26 09:58:46 UTC (rev 63) @@ -1,78 +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.Calendar; - -import junit.framework.Assert; -import junit.framework.TestCase; -import net.objectlab.kit.datecalc.common.WorkingWeek; - -/** - * @author Benoit Xhenseval - */ -public class JodaWorkingWeekTest extends TestCase { - - public void testIsWorkingDayFromCalendar() { - final WorkingWeek ww = new WorkingWeek(); - Assert.assertTrue("Calendar.MONDAY", ww.isWorkingDayFromCalendar(Calendar.MONDAY)); - Assert.assertTrue("Calendar.TUESDAY", ww.isWorkingDayFromCalendar(Calendar.TUESDAY)); - Assert.assertTrue("Calendar.WEDNESDAY", ww.isWorkingDayFromCalendar(Calendar.WEDNESDAY)); - Assert.assertTrue("Calendar.THURSDAY", ww.isWorkingDayFromCalendar(Calendar.THURSDAY)); - Assert.assertTrue("Calendar.FRIDAY", ww.isWorkingDayFromCalendar(Calendar.FRIDAY)); - Assert.assertFalse("Calendar.SATURDAY", ww.isWorkingDayFromCalendar(Calendar.SATURDAY)); - Assert.assertFalse("Calendar.SUNDAY", ww.isWorkingDayFromCalendar(Calendar.SUNDAY)); - } - - public void testSetWorkingDayFromCalendar() { - final WorkingWeek ww = new WorkingWeek(); - ww.withWorkingDayFromCalendar(true, Calendar.SUNDAY); // sunday - // working - // day - ww.withWorkingDayFromCalendar(true, Calendar.SUNDAY); // sunday - // working - // day - // do - // it - // twice - Assert.assertTrue("Calendar.MONDAY", ww.isWorkingDayFromCalendar(Calendar.MONDAY)); - Assert.assertTrue("Calendar.TUESDAY", ww.isWorkingDayFromCalendar(Calendar.TUESDAY)); - Assert.assertTrue("Calendar.WEDNESDAY", ww.isWorkingDayFromCalendar(Calendar.WEDNESDAY)); - Assert.assertTrue("Calendar.THURSDAY", ww.isWorkingDayFromCalendar(Calendar.THURSDAY)); - Assert.assertTrue("Calendar.FRIDAY", ww.isWorkingDayFromCalendar(Calendar.FRIDAY)); - Assert.assertFalse("Calendar.SATURDAY", ww.isWorkingDayFromCalendar(Calendar.SATURDAY)); - Assert.assertTrue("Calendar.SUNDAY", ww.isWorkingDayFromCalendar(Calendar.SUNDAY)); - - ww.withWorkingDayFromCalendar(false, Calendar.SUNDAY); // sunday - // working - // day - Assert.assertTrue("2/ Calendar.MONDAY", ww.isWorkingDayFromCalendar(Calendar.MONDAY)); - Assert.assertTrue("2/ Calendar.TUESDAY", ww.isWorkingDayFromCalendar(Calendar.TUESDAY)); - Assert.assertTrue("2/ Calendar.WEDNESDAY", ww.isWorkingDayFromCalendar(Calendar.WEDNESDAY)); - Assert.assertTrue("2/ Calendar.THURSDAY", ww.isWorkingDayFromCalendar(Calendar.THURSDAY)); - Assert.assertTrue("2/ Calendar.FRIDAY", ww.isWorkingDayFromCalendar(Calendar.FRIDAY)); - Assert.assertFalse("2/ Calendar.SATURDAY", ww.isWorkingDayFromCalendar(Calendar.SATURDAY)); - Assert.assertFalse("2/ Calendar.SUNDAY", ww.isWorkingDayFromCalendar(Calendar.SUNDAY)); - - ww.withWorkingDayFromCalendar(true, Calendar.SUNDAY); // sunday - // working - // day - // do - // it - // twice - } - -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
