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

Change test to remove more old hours methods in SumChargedEffort

Browse source 
FEA: ItEr75S22WortReportsEffortDuration
This commit is contained in:
Manuel Rego Casasnovas 2011-09-06 18:11:11 +02:00
parent 0cb361eaed
commit 4a3dc1b14a
2 changed files with 7 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SumChargedEffort.java
View file

@ -43,10 +43,6 @@ public class SumChargedEffort extends BaseEntity {
return create(new SumChargedEffort());
}
public void setDirectChargedEffort(EffortDuration directChargedEffort) {
this.directChargedEffort = directChargedEffort;
}
public void addDirectChargedEffort(EffortDuration directChargedEffort) {
this.directChargedEffort = this.directChargedEffort
.plus(directChargedEffort);
@ -61,10 +57,6 @@ public class SumChargedEffort extends BaseEntity {
return directChargedEffort;
}
public void setIndirectChargedEffort(EffortDuration indirectChargedEffort) {
this.indirectChargedEffort = indirectChargedEffort;
}
public void addIndirectChargedEffort(EffortDuration indirectChargedEffort) {
this.indirectChargedEffort = this.indirectChargedEffort
.plus(indirectChargedEffort);
@ -78,24 +70,6 @@ public class SumChargedEffort extends BaseEntity {
return directChargedEffort.plus(indirectChargedEffort);
}
/**
* @deprecated Use
* {@link SumChargedEffort#setDirectChargedEffort(EffortDuration)}
* instead
*/
public void setDirectChargedHours(Integer directChargedHours) {
setDirectChargedEffort(EffortDuration.hours(directChargedHours));
}
/**
* @deprecated Use
* {@link SumChargedEffort#setIndirectChargedEffort(EffortDuration)}
* instead
*/
public void setIndirectChargedHours(Integer indirectChargedHours) {
setIndirectChargedEffort(EffortDuration.hours(indirectChargedHours));
}
/**
* @deprecated Use {@link SumChargedEffort#getTotalChargedEffort()} instead
*/

10
navalplanner-business/src/test/java/org/navalplanner/business/test/orders/daos/OrderElementDAOTest.java
View file

@ -68,6 +68,7 @@ import org.navalplanner.business.scenarios.entities.OrderVersion;
import org.navalplanner.business.test.calendars.entities.BaseCalendarTest;
import org.navalplanner.business.test.orders.entities.OrderElementTest;
import org.navalplanner.business.test.planner.daos.ResourceAllocationDAOTest;
import org.navalplanner.business.workingday.EffortDuration;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ -420,8 +421,10 @@ public class OrderElementDAOTest {
public void testSumChargedHoursRelation() throws InstanceNotFoundException {
OrderLine orderLine = createValidOrderLine();
orderLine.getSumChargedEffort().setDirectChargedHours(8);
orderLine.getSumChargedEffort().setIndirectChargedHours(10);
orderLine.getSumChargedEffort().addDirectChargedEffort(
EffortDuration.hours(8));
orderLine.getSumChargedEffort().addIndirectChargedEffort(
EffortDuration.hours(10));
orderElementDAO.save(orderLine);
@ -430,6 +433,7 @@ public class OrderElementDAOTest {
assertEquals(orderLine.getSumChargedEffort().getId(),
orderLineCopy.getSumChargedEffort().getId());
assertTrue(orderLineCopy.getSumChargedEffort().getTotalChargedHours().equals(18));
assertEquals(orderLineCopy.getSumChargedEffort()
.getTotalChargedEffort(), EffortDuration.hours(18));
}
}