From 9438bf658cb0533838976a3d912ccfdc8c6dcc12 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Fri, 22 Jan 2010 08:16:43 +0100 Subject: [PATCH] ItEr44S11CUImportarTraballoRealizadoPorSubcontrataItEr43S14: Fixed tests because of change in OrderElementConventer. Now if an OrderLineDTO does not have HoursGroup a default 0 hours HoursGroup is created when converted to entity. --- .../ws/orders/OrderElementServiceTest.java | 32 ++----------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/orders/OrderElementServiceTest.java b/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/orders/OrderElementServiceTest.java index 144f2cd3c..180ef8400 100644 --- a/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/orders/OrderElementServiceTest.java +++ b/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/orders/OrderElementServiceTest.java @@ -245,36 +245,8 @@ public class OrderElementServiceTest { List constraintViolations = instanceConstraintViolationsList .get(0).constraintViolations; - // Mandatory fields: code, name. Check constraints: - // checkConstraintAtLeastOneHoursGroupForEachOrderElement - assertThat(constraintViolations.size(), equalTo(3)); - - assertThat(orderDAO.getOrders().size(), equalTo(previous)); - } - - @Test - public void orderWithOrderLineWithoutHoursGroup() { - int previous = orderDAO.getOrders().size(); - - OrderDTO orderDTO = new OrderDTO(); - orderDTO.name = "Order name"; - orderDTO.code = "order-code"; - orderDTO.initDate = new Date(); - - OrderLineDTO orderLineDTO = new OrderLineDTO(); - orderLineDTO.name = "Order line"; - orderLineDTO.code = "order-line-code"; - orderDTO.children.add(orderLineDTO); - - List instanceConstraintViolationsList = orderElementService - .addOrder(orderDTO).instanceConstraintViolationsList; - assertThat(instanceConstraintViolationsList.size(), equalTo(1)); - - List constraintViolations = instanceConstraintViolationsList - .get(0).constraintViolations; - // Check constraints: - // checkConstraintAtLeastOneHoursGroupForEachOrderElement - assertThat(constraintViolations.size(), equalTo(1)); + // Mandatory fields: code, name. + assertThat(constraintViolations.size(), equalTo(2)); assertThat(orderDAO.getOrders().size(), equalTo(previous)); }