[Objectlabkit-svn] SF.net SVN: objectlabkit: [84] trunk/datecalc-joda/src

[<ma...@us...>]

Revision: 84
          http://svn.sourceforge.net/objectlabkit/?rev=84&view=rev
Author:   marchy
Date:     2006-09-03 09:54:15 -0700 (Sun, 03 Sep 2006)

Log Message:
-----------
Fixed problem with refactored JodaWorkingWeek.

Modified Paths:
--------------
    trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java
    trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeekTest.java

Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java	2006-09-03 11:39:24 UTC (rev 83)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java	2006-09-03 16:54:15 UTC (rev 84)
@@ -41,7 +41,8 @@
     }
     
     public boolean isWorkingDay(final LocalDate date) {
-        return isWorkingDayFromCalendar(date.getDayOfWeek());
+        int dayOfWeek = jodaToCalendarDayConstant(date.getDayOfWeek());
+        return isWorkingDayFromCalendar(dayOfWeek);
     }
     
     /**
@@ -52,7 +53,8 @@
      * @param dayOfWeek
      *            e.g. DateTimeConstants.MONDAY, DateTimeConstants.TUESDAY, etc
      */
-    public JodaWorkingWeek withWorkingDayFromDateTimeConstant(final boolean working, final int dayOfWeek) {
+    public JodaWorkingWeek withWorkingDayFromDateTimeConstant(final boolean working, int dayOfWeek) {
+        dayOfWeek = jodaToCalendarDayConstant(dayOfWeek);
         return new JodaWorkingWeek(super.withWorkingDayFromCalendar(working, dayOfWeek));
     }
 

Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeekTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeekTest.java	2006-09-03 11:39:24 UTC (rev 83)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeekTest.java	2006-09-03 16:54:15 UTC (rev 84)
@@ -96,6 +96,9 @@
         // do
         // it
         // twice
+        Assert.assertFalse("2/ DateTimeConstants.SATURDAY", ww.isWorkingDayFromDateTimeConstant(DateTimeConstants.SATURDAY));
+        Assert.assertTrue("2/ DateTimeConstants.SUNDAY", ww.isWorkingDayFromDateTimeConstant(DateTimeConstants.SUNDAY));
+
     }
     
     public void testJodaToCalendarDayConstant() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.