RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr29S06CUAsignacionGrupoRecursosAPlanificacionItEr28S06: The end date of an allocation is exclusive, not inclusive

Browse source
This commit is contained in:
Óscar González Fernández 2009-10-09 15:13:48 +02:00
parent 6d91ef279b
commit 5753c95ded
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
View file

@ -463,14 +463,14 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
if (assignments.isEmpty()) {
return null;
}
return assignments.get(assignments.size() - 1).getDay();
return assignments.get(assignments.size() - 1).getDay().plusDays(1);
}
public boolean isAlreadyFinishedBy(LocalDate date) {
if (getEndDate() == null) {
return false;
}
return getEndDate().compareTo(date) < 0;
return getEndDate().compareTo(date) <= 0;
}
private interface PredicateOnDayAssignment {

19
navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/SpecificResourceAllocationTest.java
View file

@ -24,6 +24,7 @@ import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA;
import static org.easymock.classextension.EasyMock.createNiceMock;
import static org.easymock.classextension.EasyMock.replay;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.navalplanner.business.test.planner.entities.DayAssignmentMatchers.consecutiveDays;
@ -250,4 +251,22 @@ public class SpecificResourceAllocationTest {
assertThat(specificResourceAllocation.getAssignments(), haveHours(2, 8));
}
@Test
public void theEndDateOfTheAllocationIsExclusive() {
LocalDate start = new LocalDate(2000, 2, 4);
givenSpecificResourceAllocation(start, 2);
specificResourceAllocation.allocate(ResourcesPerDay.amount(1));
assertThat(specificResourceAllocation.getEndDate(),
equalTo(new LocalDate(2000, 2, 6)));
}
@Test
public void theAllocationIsFinishedByEndDate() {
LocalDate start = new LocalDate(2000, 2, 4);
givenSpecificResourceAllocation(start, 2);
specificResourceAllocation.allocate(ResourcesPerDay.amount(1));
assertTrue(specificResourceAllocation
.isAlreadyFinishedBy(specificResourceAllocation.getEndDate()));
}
}