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

Change method to use EffortDuration

Browse source 
Remove unnecessary uses too.

FEA: ItEr71S07FragmentationDeletionItEr70S09
This commit is contained in:
Óscar González Fernández 2011-02-23 16:34:05 +01:00
parent 1b776c4e4f
commit 540a18c7ab
5 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Resource.java
View file

@ -834,12 +834,8 @@ public abstract class Resource extends IntegrationEntity {
}
public int getAssignedHours(LocalDate localDate) {
int sum = 0;
for (DayAssignment dayAssignment : getAssignmentsForDay(localDate)) {
sum += dayAssignment.getHours();
}
return sum;
public EffortDuration getAssignedEffort(LocalDate localDate) {
return DayAssignment.sum(getAssignmentsForDay(localDate));
}
public EffortDuration getAssignedDurationDiscounting(

2
navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/DerivedAllocationGeneratorTest.java
View file

@ -124,8 +124,6 @@ public class DerivedAllocationGeneratorTest {
private Worker workerWithAlwaysAssignedHours(int assignedHours){
Worker result = createNiceMock(Worker.class);
expect(result.getAssignedHours(isA(LocalDate.class))).andReturn(
assignedHours).anyTimes();
expect(
result.getAssignedDurationDiscounting(isA(Object.class),
isA(LocalDate.class))).andReturn(hours(assignedHours))

4
navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/GenericResourceAllocationTest.java
View file

@ -176,8 +176,6 @@ public class GenericResourceAllocationTest {
int hours) {
Worker result = createNiceMock(Worker.class);
expect(result.getCalendar()).andReturn(resourceCalendar).anyTimes();
expect(result.getAssignedHours(isA(LocalDate.class))).andReturn(hours)
.anyTimes();
expect(
result.getAssignedDurationDiscounting(isA(Object.class),
isA(LocalDate.class))).andReturn(hours(hours)).anyTimes();
@ -561,8 +559,6 @@ public class GenericResourceAllocationTest {
private void givenVirtualWorkerWithCapacity(int capacity) {
VirtualWorker worker = createNiceMock(VirtualWorker.class);
final int fullLoadForAll = 8 * capacity;
expect(worker.getAssignedHours(isA(LocalDate.class))).andReturn(
fullLoadForAll).anyTimes();
expect(
worker.getAssignedDurationDiscounting(isA(Object.class),
isA(LocalDate.class))).andReturn(hours(fullLoadForAll))

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

@ -173,8 +173,6 @@ public class SpecificResourceAllocationTest {
private void givenWorker() {
this.worker = createNiceMock(Worker.class);
expect(this.worker.getCalendar()).andReturn(calendar).anyTimes();
expect(this.worker.getAssignedHours(isA(LocalDate.class))).andReturn(
assignedHours).anyTimes();
replay(this.worker);
}

7
navalplanner-business/src/test/java/org/navalplanner/business/test/resources/entities/ResourceTest.java
View file

@ -551,7 +551,7 @@ public class ResourceTest {
public void workerWithoutAssignmentsGivesNoAssignedHours() {
givenWorker();
LocalDate today = new LocalDate();
assertThat(worker.getAssignedHours(today), equalTo(0));
assertThat(worker.getAssignedEffort(today), equalTo(hours(0)));
}
@Test
@ -566,7 +566,7 @@ public class ResourceTest {
today.plusDays(1), hours(1), worker);
givenWorkerWithAssignments(specificDayAssignment, another, atAnotherDay);
assertThat(worker.getAssignedHours(today), equalTo(13));
assertThat(worker.getAssignedEffort(today), equalTo(hours(13)));
}
@Test
@ -576,12 +576,11 @@ public class ResourceTest {
SpecificDayAssignment specificDayAssignment = new SpecificDayAssignment(
today, hours(10), worker);
givenWorkerWithAssignments(specificDayAssignment);
worker.getAssignedHours(today);
SpecificDayAssignment another = new SpecificDayAssignment(today,
hours(3), worker);
worker.addNewAssignments(Arrays.asList(another));
assertThat(worker.getAssignedHours(today), equalTo(13));
assertThat(worker.getAssignedEffort(today), equalTo(hours(13)));
}
private void givenWorkerWithAssignments(DayAssignment... assignments) {