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

ItEr40S05ValidacionEProbasFuncionaisItEr39S05: [Bug #195] Fixing bug. getDaysDuration is calculate dnow based on the date part

Browse source
This commit is contained in:
Óscar González Fernández 2009-12-21 14:26:31 +01:00
parent 52fd1bbf27
commit 00d85c3d10
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java
View file

@ -165,8 +165,9 @@ public class Task extends TaskElement {
}
public Integer getDaysDuration() {
Days daysBetween = Days.daysBetween(toDateTime(getStartDate()),
toDateTime(getEndDate()));
Days daysBetween = Days.daysBetween(new LocalDate(
toDateTime(getStartDate())), new LocalDate(
toDateTime(getEndDate())));
return daysBetween.getDays();
}

8
navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/TaskTest.java
View file

@ -30,6 +30,7 @@ import static org.junit.Assert.assertTrue;
import java.util.Arrays;
import org.joda.time.DateTime;
import org.junit.Test;
import org.navalplanner.business.orders.entities.HoursGroup;
import org.navalplanner.business.orders.entities.OrderLine;
@ -126,6 +127,13 @@ public class TaskTest {
assertThat(task.getAssignedHours(), equalTo(8));
}
@Test
public void theDaysBetweenIsCalculatedBasedOnlyOnDatesNotHours() {
task.setStartDate(new DateTime(2008, 10, 5, 23, 0, 0, 0).toDate());
task.setEndDate(new DateTime(2008, 10, 6, 1, 0, 0, 0).toDate());
assertThat(task.getDaysDuration(), equalTo(1));
}
private SpecificResourceAllocation stubResourceAllocationWithAssignedHours(
Task task,
int hours) {