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

ItEr36S11CUCreacionUnidadesPlanificacionItEr35S12: Removing use of general create method of AllocationBeingModified

Browse source
This commit is contained in:
Óscar González Fernández 2009-11-23 18:25:38 +01:00
parent 2140999560
commit 79a7f7bb1e
2 changed files with 13 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/allocationalgorithms/AllocationBeingModified.java
View file

@ -88,20 +88,6 @@ public abstract class AllocationBeingModified {
}
}
public static AllocationBeingModified create(
ResourceAllocation<?> resourceAllocation,
ResourcesPerDay resourcesPerDay,
Collection<? extends Resource> resources) {
if (resourceAllocation instanceof GenericResourceAllocation) {
GenericResourceAllocation generic = (GenericResourceAllocation) resourceAllocation;
return create(generic, resourcesPerDay, resources);
} else {
SpecificResourceAllocation specific = (SpecificResourceAllocation) resourceAllocation;
return create(specific, resourcesPerDay);
}
}
public static AllocationBeingModified create(
GenericResourceAllocation resourceAllocation,
ResourcesPerDay resourcesPerDay, List<Resource> resources) {

24
navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/AllocationUntilFillingHoursTest.java
View file

@ -29,7 +29,6 @@ import static org.navalplanner.business.test.planner.entities.DayAssignmentMatch
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.joda.time.LocalDate;
@ -179,7 +178,8 @@ public class AllocationUntilFillingHoursTest {
for (ResourcesPerDay resourcesPerDay : specifiedResourcesPerDay) {
SpecificResourceAllocation allocation = createSpecificResourceAllocationFor(
task, worker);
allocations.add(AllocationBeingModified.create(allocation, resourcesPerDay, Arrays.asList(worker)));
allocations.add(AllocationBeingModified.create(allocation,
resourcesPerDay));
}
}
@ -204,25 +204,27 @@ public class AllocationUntilFillingHoursTest {
private void givenAllocationsWithoutTask() {
allocations.add(AllocationBeingModified.create(
createStubAllocationReturning(SpecificResourceAllocation.class,
null), ResourcesPerDay.amount(2), resources));
(SpecificResourceAllocation)
createStubAllocationReturning(
SpecificResourceAllocation.class, null),
ResourcesPerDay.amount(2)));
allocations.add(AllocationBeingModified.create(
createStubAllocationReturning(SpecificResourceAllocation.class,
null), ResourcesPerDay.amount(2), resources));
null), ResourcesPerDay.amount(2)));
}
private void givenAllocationsBelongingToDifferentTasks() {
Task task = createStubTask();
allocations.add(AllocationBeingModified.create(
createStubAllocationReturning(SpecificResourceAllocation.class,
task), ResourcesPerDay.amount(2), resources));
task), ResourcesPerDay.amount(2)));
allocations.add(AllocationBeingModified.create(
createStubAllocationReturning(SpecificResourceAllocation.class,
task), ResourcesPerDay.amount(2), resources));
task), ResourcesPerDay.amount(2)));
Task other = createStubTask();
allocations.add(AllocationBeingModified.create(
createStubAllocationReturning(SpecificResourceAllocation.class,
other), ResourcesPerDay.amount(2), resources));
other), ResourcesPerDay.amount(2)));
}
private Task createStubTask() {
@ -245,9 +247,9 @@ public class AllocationUntilFillingHoursTest {
return result;
}
private ResourceAllocation<?> createStubAllocationReturning(
Class<? extends ResourceAllocation<?>> allocationClass, Task task) {
ResourceAllocation<?> resourceAllocation = createNiceMock(allocationClass);
private <T extends ResourceAllocation<?>> T createStubAllocationReturning(
Class<T> allocationClass, Task task) {
T resourceAllocation = createNiceMock(allocationClass);
expect(resourceAllocation.getTask()).andReturn(task).anyTimes();
replay(resourceAllocation);
return resourceAllocation;