From cf6c36ded79b74cb9af8190a872356b00347d0a2 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Wed, 26 May 2010 10:55:07 +0200 Subject: [PATCH] ItEr58S17AsignacionConsolidacion: Fixed tests because of changes in allocation methods. --- .../test/planner/entities/AllocationUntilFillingHoursTest.java | 2 ++ .../test/planner/entities/GenericResourceAllocationTest.java | 2 ++ .../test/planner/entities/SpecificResourceAllocationTest.java | 1 + 3 files changed, 5 insertions(+) diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/AllocationUntilFillingHoursTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/AllocationUntilFillingHoursTest.java index a5a25cfac..6de17e414 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/AllocationUntilFillingHoursTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/AllocationUntilFillingHoursTest.java @@ -203,6 +203,8 @@ public class AllocationUntilFillingHoursTest { startDate.toDateTimeAtStartOfDay().toDate()).anyTimes(); expect(task.getCriterions()).andReturn( Collections. emptySet()).anyTimes(); + expect(task.getFirstDayNotConsolidated()).andReturn(startDate) + .anyTimes(); replay(task); } 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 0681b7f1a..f391a4088 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 @@ -88,6 +88,8 @@ public class GenericResourceAllocationTest { .anyTimes(); expect(task.getEndDate()).andReturn(interval.getEnd().toDate()) .anyTimes(); + expect(task.getFirstDayNotConsolidated()).andReturn( + interval.getStart().toLocalDate()).anyTimes(); expect(task.getCalendar()).andReturn(baseCalendar).anyTimes(); replay(task); return this.task = task; 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 0102651c6..e1a09fa84 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 @@ -152,6 +152,7 @@ public class SpecificResourceAllocationTest { start.toDateTimeAtStartOfDay().toDate()).anyTimes(); expect(task.getEndDate()).andReturn( end.toDateTimeAtStartOfDay().toDate()).anyTimes(); + expect(task.getFirstDayNotConsolidated()).andReturn(start).anyTimes(); replay(task); }