From 01d0bf9a8ae0d2fccff727124d7640865ec6bfe2 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Wed, 4 May 2011 10:52:07 +0200 Subject: [PATCH] Reorganized code of last tests for WBS. FEA: ItEr74S07WBSTreeRefactoring --- .../web/orders/OrderElementTreeModelTest.java | 223 +++++++++--------- 1 file changed, 112 insertions(+), 111 deletions(-) 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 c5153ae86..de111e1a4 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 @@ -1052,54 +1052,6 @@ public class OrderElementTreeModelTest { } } - @Test - public void checkMoveOrderLineWithAdvanceToOrderLineGroupWithSameAdvanceType() - throws DuplicateValueTrueReportGlobalAdvanceException, - DuplicateAdvanceAssignmentForOrderElementException { - model.addElement("element", 100); - model.addElementAt(order.getChildren().get(0), "element2", 50); - - OrderLineGroup container = (OrderLineGroup) order.getChildren().get(0); - - OrderLine element = null; - OrderLine element2 = null; - for (OrderElement each : container.getChildren()) { - if (each.getName().equals("element")) { - element = (OrderLine) each; - } else if (each.getName().equals("element2")) { - element2 = (OrderLine) each; - } - } - - model.unindent(element2); - - addDirectAdvanceAssignment(container); - addDirectAdvanceAssignment(element2); - - addAnotherDirectAdvanceAssignment(element2); - - model.move(element2, container); - - assertTrue(order.getDirectAdvanceAssignments().isEmpty()); - assertThat(order.getIndirectAdvanceAssignments().size(), equalTo(3)); - assertNotNull(order.getAdvanceAssignmentByType(advanceType)); - assertNotNull(order.getAdvanceAssignmentByType(advanceType2)); - - assertThat(container.getDirectAdvanceAssignments().size(), equalTo(1)); - assertThat(container.getIndirectAdvanceAssignments().size(), equalTo(2)); - assertNotNull(container.getAdvanceAssignmentByType(advanceType)); - assertNull(container.getIndirectAdvanceAssignment(advanceType)); - assertNotNull(container.getIndirectAdvanceAssignment(advanceType2)); - - assertTrue(element.getDirectAdvanceAssignments().isEmpty()); - assertNull(element.getAdvanceAssignmentByType(advanceType)); - assertNull(element.getAdvanceAssignmentByType(advanceType2)); - - assertFalse(element2.getDirectAdvanceAssignments().isEmpty()); - assertNull(element2.getAdvanceAssignmentByType(advanceType)); - assertNotNull(element2.getAdvanceAssignmentByType(advanceType2)); - } - @Test public void checkMoveOrderLineWithLabelToOrderLineGroupWithSameLabel() { model.addElement("element", 100); @@ -1136,69 +1088,6 @@ public class OrderElementTreeModelTest { assertThat(element2.getLabels().iterator().next(), equalTo(label2)); } - @Test - public void checkMoveOrderLineWithCriterionToOrderLineGroupWithSameCriterion() { - model.addElement("element", 100); - model.addElementAt(order.getChildren().get(0), "element2", 50); - - OrderLineGroup container = (OrderLineGroup) order.getChildren().get(0); - - OrderLine element = null; - OrderLine element2 = null; - for (OrderElement each : container.getChildren()) { - if (each.getName().equals("element")) { - element = (OrderLine) each; - } else if (each.getName().equals("element2")) { - element2 = (OrderLine) each; - } - } - - model.unindent(element2); - - addCriterionRequirement(container); - addCriterionRequirement(element2); - - addAnotherCriterionRequirement(element2); - - model.move(element2, container); - - assertTrue(order.getCriterionRequirements().isEmpty()); - - assertThat(container.getCriterionRequirements().size(), equalTo(1)); - assertDirectCriterion(container.getCriterionRequirements().iterator() - .next(), criterion); - - assertThat(element.getCriterionRequirements().size(), equalTo(1)); - assertIndirectCriterion(element.getCriterionRequirements().iterator() - .next(), criterion); - assertThat(element.getHoursGroups().get(0).getCriterionRequirements().size(), equalTo(1)); - assertIndirectCriterion(element.getHoursGroups().get(0) - .getCriterionRequirements().iterator().next(), criterion); - - assertThat(element2.getCriterionRequirements().size(), equalTo(2)); - for (CriterionRequirement each : element2.getCriterionRequirements()) { - if (each.getCriterion().isEquivalent(criterion)) { - assertTrue(each instanceof IndirectCriterionRequirement); - } else if (each.getCriterion().isEquivalent(criterion2)) { - assertTrue(each instanceof DirectCriterionRequirement); - } else { - fail("Unexpected criterion: " + each.getCriterion()); - } - } - - assertThat(element2.getHoursGroups().get(0).getCriterionRequirements() - .size(), equalTo(2)); - for (CriterionRequirement each : element2.getHoursGroups().get(0) - .getCriterionRequirements()) { - if (each.getCriterion().isEquivalent(criterion) - || each.getCriterion().isEquivalent(criterion2)) { - assertTrue(each instanceof IndirectCriterionRequirement); - } else { - fail("Unexpected criterion: " + each.getCriterion()); - } - } - } - @Test public void checkMoveOrderGroupLineWithLabelToOrderLineGroupWithSameLabel() { model.addElement("element", 100); @@ -1323,6 +1212,54 @@ public class OrderElementTreeModelTest { assertTrue(element3.getLabels().isEmpty()); } + @Test + public void checkMoveOrderLineWithAdvanceToOrderLineGroupWithSameAdvanceType() + throws DuplicateValueTrueReportGlobalAdvanceException, + DuplicateAdvanceAssignmentForOrderElementException { + model.addElement("element", 100); + model.addElementAt(order.getChildren().get(0), "element2", 50); + + OrderLineGroup container = (OrderLineGroup) order.getChildren().get(0); + + OrderLine element = null; + OrderLine element2 = null; + for (OrderElement each : container.getChildren()) { + if (each.getName().equals("element")) { + element = (OrderLine) each; + } else if (each.getName().equals("element2")) { + element2 = (OrderLine) each; + } + } + + model.unindent(element2); + + addDirectAdvanceAssignment(container); + addDirectAdvanceAssignment(element2); + + addAnotherDirectAdvanceAssignment(element2); + + model.move(element2, container); + + assertTrue(order.getDirectAdvanceAssignments().isEmpty()); + assertThat(order.getIndirectAdvanceAssignments().size(), equalTo(3)); + assertNotNull(order.getAdvanceAssignmentByType(advanceType)); + assertNotNull(order.getAdvanceAssignmentByType(advanceType2)); + + assertThat(container.getDirectAdvanceAssignments().size(), equalTo(1)); + assertThat(container.getIndirectAdvanceAssignments().size(), equalTo(2)); + assertNotNull(container.getAdvanceAssignmentByType(advanceType)); + assertNull(container.getIndirectAdvanceAssignment(advanceType)); + assertNotNull(container.getIndirectAdvanceAssignment(advanceType2)); + + assertTrue(element.getDirectAdvanceAssignments().isEmpty()); + assertNull(element.getAdvanceAssignmentByType(advanceType)); + assertNull(element.getAdvanceAssignmentByType(advanceType2)); + + assertFalse(element2.getDirectAdvanceAssignments().isEmpty()); + assertNull(element2.getAdvanceAssignmentByType(advanceType)); + assertNotNull(element2.getAdvanceAssignmentByType(advanceType2)); + } + @Test public void checkMoveOrderLineGroupWithAdvanceToOrderLineGroupWithSameAdvance() throws DuplicateValueTrueReportGlobalAdvanceException, @@ -1487,6 +1424,70 @@ public class OrderElementTreeModelTest { assertNull(element3.getAdvanceAssignmentByType(advanceType2)); } + @Test + public void checkMoveOrderLineWithCriterionToOrderLineGroupWithSameCriterion() { + model.addElement("element", 100); + model.addElementAt(order.getChildren().get(0), "element2", 50); + + OrderLineGroup container = (OrderLineGroup) order.getChildren().get(0); + + OrderLine element = null; + OrderLine element2 = null; + for (OrderElement each : container.getChildren()) { + if (each.getName().equals("element")) { + element = (OrderLine) each; + } else if (each.getName().equals("element2")) { + element2 = (OrderLine) each; + } + } + + model.unindent(element2); + + addCriterionRequirement(container); + addCriterionRequirement(element2); + + addAnotherCriterionRequirement(element2); + + model.move(element2, container); + + assertTrue(order.getCriterionRequirements().isEmpty()); + + assertThat(container.getCriterionRequirements().size(), equalTo(1)); + assertDirectCriterion(container.getCriterionRequirements().iterator() + .next(), criterion); + + assertThat(element.getCriterionRequirements().size(), equalTo(1)); + assertIndirectCriterion(element.getCriterionRequirements().iterator() + .next(), criterion); + assertThat(element.getHoursGroups().get(0).getCriterionRequirements() + .size(), equalTo(1)); + assertIndirectCriterion(element.getHoursGroups().get(0) + .getCriterionRequirements().iterator().next(), criterion); + + assertThat(element2.getCriterionRequirements().size(), equalTo(2)); + for (CriterionRequirement each : element2.getCriterionRequirements()) { + if (each.getCriterion().isEquivalent(criterion)) { + assertTrue(each instanceof IndirectCriterionRequirement); + } else if (each.getCriterion().isEquivalent(criterion2)) { + assertTrue(each instanceof DirectCriterionRequirement); + } else { + fail("Unexpected criterion: " + each.getCriterion()); + } + } + + assertThat(element2.getHoursGroups().get(0).getCriterionRequirements() + .size(), equalTo(2)); + for (CriterionRequirement each : element2.getHoursGroups().get(0) + .getCriterionRequirements()) { + if (each.getCriterion().isEquivalent(criterion) + || each.getCriterion().isEquivalent(criterion2)) { + assertTrue(each instanceof IndirectCriterionRequirement); + } else { + fail("Unexpected criterion: " + each.getCriterion()); + } + } + } + @Test public void checkMoveOrderGroupLineWithCriterionToOrderLineGroupWithSameCriterion() { model.addElement("element", 100);