From e8cc8df75ef9345432d3a7c03537a11c299af32e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Mon, 11 Oct 2010 19:35:30 +0200
Subject: [PATCH] Remove uses of asDurationOn(LocalDate, ResourcesPerDay)

FEA: ItEr61S08TimeUnitConfigurablePlanning
---
 .../business/planner/entities/EffortDistributor.java      | 3 ++-
 .../planner/entities/GenericResourceAllocationTest.java   | 6 +-----
 .../planner/entities/SpecificResourceAllocationTest.java  | 8 --------
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/EffortDistributor.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/EffortDistributor.java
index d6b206e33..e3f7d120d 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/EffortDistributor.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/EffortDistributor.java
@@ -33,6 +33,7 @@ import org.navalplanner.business.calendars.entities.ResourceCalendar;
 import org.navalplanner.business.calendars.entities.SameWorkHoursEveryDay;
 import org.navalplanner.business.resources.entities.Resource;
 import org.navalplanner.business.workingday.EffortDuration;
+import org.navalplanner.business.workingday.IntraDayDate.PartialDay;
 import org.navalplanner.business.workingday.ResourcesPerDay;
 
 /**
@@ -238,7 +239,7 @@ public class EffortDistributor {
                     .getAssignedDurationAt(resource, day);
             final int alreadyAssignedSeconds = alreadyAssigned.getSeconds();
             Integer capacityEachOneSeconds = calendarForResource.asDurationOn(
-                    day, ONE).getSeconds();
+                    PartialDay.wholeDay(day), ONE).getSeconds();
             final int capacityUnits = resources.get(i).capacityUnits;
             assert capacityUnits >= 1;
             final int assignedForEach = alreadyAssignedSeconds / capacityUnits;
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/GenericResourceAllocationTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/GenericResourceAllocationTest.java
index 38a0cd4ec..05381283f 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/GenericResourceAllocationTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/GenericResourceAllocationTest.java
@@ -253,10 +253,6 @@ public class GenericResourceAllocationTest {
                         .asDurationGivenWorkingDayOf(hours(hoursPerDay));
             }
         };
-        expect(
-                baseCalendar.asDurationOn(isA(LocalDate.class),
-                        isA(ResourcesPerDay.class))).andAnswer(
-                durationAnswer).anyTimes();
         expect(
                 baseCalendar.asDurationOn(isA(PartialDay.class),
                         isA(ResourcesPerDay.class))).andAnswer(durationAnswer)
@@ -585,7 +581,7 @@ public class GenericResourceAllocationTest {
                 .anyTimes();
 
         expect(
-                calendar.asDurationOn(isA(LocalDate.class),
+                calendar.asDurationOn(isA(PartialDay.class),
                         isA(ResourcesPerDay.class))).andReturn(hours(unit))
                 .anyTimes();
 
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/SpecificResourceAllocationTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/SpecificResourceAllocationTest.java
index 93e66ec3b..748e8c630 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/SpecificResourceAllocationTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/SpecificResourceAllocationTest.java
@@ -83,10 +83,6 @@ public class SpecificResourceAllocationTest {
         expect(this.calendar.getCapacityOn(isA(PartialDay.class)))
                 .andReturn(EffortDuration.hours(hours)).anyTimes();
         IAnswer<? extends EffortDuration> asDurationAnswer = asDurationOnAnswer(hours(hours));
-        expect(
-                this.calendar.asDurationOn(isA(LocalDate.class),
-                        isA(ResourcesPerDay.class)))
-                .andAnswer(asDurationAnswer).anyTimes();
         expect(
                 this.calendar.asDurationOn(isA(PartialDay.class),
                         isA(ResourcesPerDay.class)))
@@ -164,10 +160,6 @@ public class SpecificResourceAllocationTest {
                 return hours(toHoursAnswer.answer());
             }
         };
-        expect(
-                this.calendar.asDurationOn(isA(LocalDate.class),
-                        isA(ResourcesPerDay.class))).andAnswer(
-                effortAnswer).anyTimes();
         expect(
                 this.calendar.asDurationOn(isA(PartialDay.class),
                         isA(ResourcesPerDay.class))).andAnswer(effortAnswer)