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

ItEr59S04ValidacionEProbasFuncionaisItEr58S04 : Fixing tests.

Browse source 
Fixes the tests OrderModelTest and AddAdvanceAssignmentsToOrderElementTest.
This commit is contained in:
Susana Montes Pedreira 2010-06-03 12:57:42 +02:00 • committed by Javier Moran Rua
parent eb03750192
commit 945d8f40bf
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssignmentsToOrderElementTest.java
View file

@ -353,23 +353,26 @@ public class AddAdvanceAssignmentsToOrderElementTest {
@Test(expected = DuplicateAdvanceAssignmentForOrderElementException.class)
public void addingAnotherAdvanceAssignmentWithAnEquivalentTypeButDifferentInstance()
throws Exception {
final Order order = createValidOrder();
OrderLine line = createValidLeaf("GranSon", "75757");
final OrderLine line = createValidLeaf("GranSon", "75757");
order.add(line);
orderDao.save(order);
AdvanceType type = createAndSaveType("tipoA");
getSession().flush();
getSession().evict(type);
AdvanceType typeReloaded = reloadType(type);
DirectAdvanceAssignment assignment = createValidAdvanceAssignment(false);
final DirectAdvanceAssignment assignment = createValidAdvanceAssignment(false);
assignment.setAdvanceType(type);
DirectAdvanceAssignment assignmentWithSameType = createValidAdvanceAssignment(false);
assignmentWithSameType.setAdvanceType(typeReloaded);
line.addAdvanceAssignment(assignment);
getSession().evict(type);
AdvanceType typeReloaded = reloadType(type);
final DirectAdvanceAssignment assignmentWithSameType = createValidAdvanceAssignment(false);
assignmentWithSameType.setAdvanceType(typeReloaded);
line.addAdvanceAssignment(assignmentWithSameType);
}
@ -393,10 +396,14 @@ public class AddAdvanceAssignmentsToOrderElementTest {
AdvanceType advanceType = createAndSaveType("test");
DirectAdvanceAssignment advanceAssignment = createValidAdvanceAssignment(true);
advanceAssignment.setAdvanceType(advanceType);
DirectAdvanceAssignment advanceAssignmentA = createValidAdvanceAssignment(true);
advanceAssignmentA.setAdvanceType(advanceType);
orderLineGroup.addAdvanceAssignment(advanceAssignment);
DirectAdvanceAssignment advanceAssignmentB = createValidAdvanceAssignment(true);
advanceAssignmentB.setAdvanceType(advanceType);
orderLineGroup.addAdvanceAssignment(advanceAssignmentA);
orderLineGroup.addAdvanceAssignment(advanceAssignmentB);
}
}

2
navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderModelTest.java
View file

@ -272,7 +272,7 @@ public class OrderModelTest {
for (OrderElement orderElement : elements) {
assertThat(((OrderLineGroup) orderElement)
.getIndirectAdvanceAssignments().size(),
equalTo(1));
equalTo(0));
}
for (int i = 0; i < containers.length; i++) {
assertThat(elements.get(i).getId(),