diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SumChargedEffort.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SumChargedEffort.java index 58706cab6..2ae70aff6 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SumChargedEffort.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/SumChargedEffort.java @@ -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 */ diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/daos/OrderElementDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/daos/OrderElementDAOTest.java index 0a9d42f49..f2e9f058f 100644 --- a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/daos/OrderElementDAOTest.java +++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/daos/OrderElementDAOTest.java @@ -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)); } }