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

[Bug #1040] Added new checks on tests and fixed problem for orphan children advance types.

Browse source 
FEA: ItEr74S07WBSTreeRefactoring
This commit is contained in:
Manuel Rego Casasnovas 2011-05-03 13:24:10 +02:00
parent 9e4ffd25ee
commit 70fd6b4299
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java
View file

@ -290,6 +290,10 @@ public class OrderLineGroup extends OrderElement implements
.getAdvanceType());
}
}
if ((indirectAdvanceAssignments.size() == 1) && existChildrenAdvance()) {
removeChildrenAdvanceOrderLineGroup();
}
}
@Override

3
navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderElementTreeModelTest.java
View file

@ -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());
}