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

Changed tests and fixed issue with CHILDREN advance.

Browse source 
FEA: ItEr74S07WBSTreeRefactoring
This commit is contained in:
Manuel Rego Casasnovas 2011-05-04 13:55:36 +02:00
parent f2835347b9
commit efd65cca4d
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -263,7 +263,8 @@ public class OrderLineGroup extends OrderElement implements
}
}
if (indirectAdvanceAssignments.isEmpty()) {
if (indirectAdvanceAssignments.isEmpty()
&& !orderElement.getAllDirectAdvanceAssignments().isEmpty()) {
addChildrenAdvanceOrderLineGroup();
}
}

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

@ -251,6 +251,9 @@ public class OrderElementTreeModelTest {
model.addElement("element", 100);
assertThat(order.getDirectAdvanceAssignments().size(), equalTo(1));
assertTrue(order.getIndirectAdvanceAssignments().isEmpty());
OrderLine element = (OrderLine) model.getRoot().getChildren().get(0);
assertTrue(element.getDirectAdvanceAssignments().isEmpty());
@ -1296,7 +1299,7 @@ public class OrderElementTreeModelTest {
assertNotNull(order.getAdvanceAssignmentByType(advanceType2));
assertThat(container.getDirectAdvanceAssignments().size(), equalTo(1));
assertThat(container.getIndirectAdvanceAssignments().size(), equalTo(2));
assertThat(container.getIndirectAdvanceAssignments().size(), equalTo(1));
assertNotNull(container.getAdvanceAssignmentByType(advanceType));
assertNull(container.getIndirectAdvanceAssignment(advanceType));
assertNotNull(container.getIndirectAdvanceAssignment(advanceType2));
@ -1329,7 +1332,7 @@ public class OrderElementTreeModelTest {
assertNotNull(order.getAdvanceAssignmentByType(advanceType2));
assertThat(container.getDirectAdvanceAssignments().size(), equalTo(1));
assertThat(container.getIndirectAdvanceAssignments().size(), equalTo(2));
assertThat(container.getIndirectAdvanceAssignments().size(), equalTo(1));
assertNotNull(container.getAdvanceAssignmentByType(advanceType));
assertNull(container.getIndirectAdvanceAssignment(advanceType));
assertNotNull(container.getIndirectAdvanceAssignment(advanceType2));
@ -1362,7 +1365,7 @@ public class OrderElementTreeModelTest {
assertNotNull(order.getAdvanceAssignmentByType(advanceType2));
assertThat(container.getDirectAdvanceAssignments().size(), equalTo(1));
assertThat(container.getIndirectAdvanceAssignments().size(), equalTo(2));
assertThat(container.getIndirectAdvanceAssignments().size(), equalTo(1));
assertNotNull(container.getAdvanceAssignmentByType(advanceType));
assertNull(container.getIndirectAdvanceAssignment(advanceType));
assertNotNull(container.getIndirectAdvanceAssignment(advanceType2));
@ -1372,8 +1375,7 @@ public class OrderElementTreeModelTest {
assertNull(element.getAdvanceAssignmentByType(advanceType2));
assertFalse(container2.getDirectAdvanceAssignments().isEmpty());
assertThat(container2.getIndirectAdvanceAssignments().size(),
equalTo(1));
assertTrue(container2.getIndirectAdvanceAssignments().isEmpty());
assertNull(container2.getAdvanceAssignmentByType(advanceType));
assertNotNull(container2.getAdvanceAssignmentByType(advanceType2));
assertNull(container2.getIndirectAdvanceAssignment(advanceType2));
@ -1406,7 +1408,7 @@ public class OrderElementTreeModelTest {
assertNotNull(order.getAdvanceAssignmentByType(advanceType2));
assertThat(container.getDirectAdvanceAssignments().size(), equalTo(1));
assertThat(container.getIndirectAdvanceAssignments().size(), equalTo(2));
assertThat(container.getIndirectAdvanceAssignments().size(), equalTo(1));
assertNotNull(container.getAdvanceAssignmentByType(advanceType));
assertNull(container.getIndirectAdvanceAssignment(advanceType));
assertNotNull(container.getIndirectAdvanceAssignment(advanceType2));
@ -1416,8 +1418,7 @@ public class OrderElementTreeModelTest {
assertNull(element.getAdvanceAssignmentByType(advanceType2));
assertFalse(container2.getDirectAdvanceAssignments().isEmpty());
assertThat(container2.getIndirectAdvanceAssignments().size(),
equalTo(1));
assertTrue(container2.getIndirectAdvanceAssignments().isEmpty());
assertNull(container2.getAdvanceAssignmentByType(advanceType));
assertNotNull(container2.getAdvanceAssignmentByType(advanceType2));
assertNull(container2.getIndirectAdvanceAssignment(advanceType2));