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

Added more tests for labels in WBS and fixed detected issue.

Browse source 
FEA: ItEr74S07WBSTreeRefactoring
This commit is contained in:
Manuel Rego Casasnovas 2011-05-03 17:02:57 +02:00
parent b9de4bc47a
commit 37d21e8895
2 changed files with 23 additions and 4 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/OrderElement.java
View file

@ -589,6 +589,10 @@ public abstract class OrderElement extends IntegrationEntity implements
}
labels.removeAll(toRemove);
}
for (OrderElement each : getChildren()) {
each.updateLabels();
}
}
public void removeLabel(Label label) {

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

@ -114,7 +114,7 @@ public class OrderElementTreeModelTest {
private MaterialAssignment materialAssignment;
private Label label;
private Label label, label2;
private QualityForm qualityForm;
@ -211,6 +211,12 @@ public class OrderElementTreeModelTest {
orderElement.addLabel(label);
}
private void addAnotherLabel(OrderElement orderElement) {
label2 = Label.create("label2");
LabelType.create("label-type-2").addLabel(label2);
orderElement.addLabel(label2);
}
private void addMaterialAssignment(OrderElement orderElement) {
materialAssignment = MaterialAssignment.create(Material
.createUnvalidated("material-code", "material-description",
@ -1110,6 +1116,8 @@ public class OrderElementTreeModelTest {
addLabel(container);
addSameLabel(element2);
addAnotherLabel(element2);
model.move(element2, container);
assertTrue(order.getLabels().isEmpty());
@ -1118,7 +1126,8 @@ public class OrderElementTreeModelTest {
assertThat(container.getLabels().iterator().next(), equalTo(label));
assertTrue(element.getLabels().isEmpty());
assertTrue(element2.getLabels().isEmpty());
assertThat(element2.getLabels().size(), equalTo(1));
assertThat(element2.getLabels().iterator().next(), equalTo(label2));
}
@Test
@ -1212,6 +1221,8 @@ public class OrderElementTreeModelTest {
addLabel(container);
addSameLabel(container2);
addAnotherLabel(container2);
model.move(container2, container);
assertTrue(order.getLabels().isEmpty());
@ -1221,7 +1232,8 @@ public class OrderElementTreeModelTest {
assertTrue(element.getLabels().isEmpty());
assertTrue(container2.getLabels().isEmpty());
assertThat(container2.getLabels().size(), equalTo(1));
assertThat(container2.getLabels().iterator().next(), equalTo(label2));
assertTrue(element2.getLabels().isEmpty());
assertTrue(element3.getLabels().isEmpty());
}
@ -1271,6 +1283,8 @@ public class OrderElementTreeModelTest {
addLabel(container);
addSameLabel(element2);
addAnotherLabel(element2);
model.move(container2, container);
assertTrue(order.getLabels().isEmpty());
@ -1281,7 +1295,8 @@ public class OrderElementTreeModelTest {
assertTrue(element.getLabels().isEmpty());
assertTrue(container2.getLabels().isEmpty());
assertTrue(element2.getLabels().isEmpty());
assertThat(element2.getLabels().size(), equalTo(1));
assertThat(element2.getLabels().iterator().next(), equalTo(label2));
assertTrue(element3.getLabels().isEmpty());
}