From 70fd6b42996e6faa6d6e5f9190c97e0e769f3fe3 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Tue, 3 May 2011 13:24:10 +0200 Subject: [PATCH] [Bug #1040] Added new checks on tests and fixed problem for orphan children advance types. FEA: ItEr74S07WBSTreeRefactoring --- .../navalplanner/business/orders/entities/OrderLineGroup.java | 4 ++++ .../navalplanner/web/orders/OrderElementTreeModelTest.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java index 96faa3b5d..be31d9573 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java @@ -290,6 +290,10 @@ public class OrderLineGroup extends OrderElement implements .getAdvanceType()); } } + + if ((indirectAdvanceAssignments.size() == 1) && existChildrenAdvance()) { + removeChildrenAdvanceOrderLineGroup(); + } } @Override diff --git a/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderElementTreeModelTest.java b/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderElementTreeModelTest.java index 4b3a257d1..c5bbf69ed 100644 --- a/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderElementTreeModelTest.java +++ b/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderElementTreeModelTest.java @@ -290,6 +290,7 @@ public class OrderElementTreeModelTest { model.removeNode(element); assertTrue(order.getChildren().isEmpty()); assertThat(order.getDirectAdvanceAssignments().size(), equalTo(1)); + assertTrue(order.getIndirectAdvanceAssignments().isEmpty()); assertFalse(order.getCriterionRequirements().isEmpty()); } @@ -308,7 +309,7 @@ public class OrderElementTreeModelTest { model.removeNode(element); assertTrue(order.getChildren().isEmpty()); assertTrue(order.getDirectAdvanceAssignments().isEmpty()); - assertNull(order.getIndirectAdvanceAssignment(advanceType)); + assertTrue(order.getIndirectAdvanceAssignments().isEmpty()); assertTrue(order.getCriterionRequirements().isEmpty()); }