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

Fix problem in test

Browse source 
It was not throwing the exception due to the cause stated in the test.

FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
This commit is contained in:
Óscar González Fernández 2010-09-03 19:10:53 +02:00
parent 5472ba7ac4
commit f91034fc1b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
navalplanner-webapp/src/main/java/org/navalplanner/web/scenarios/TransferOrdersModel.java
View file

@ -135,8 +135,6 @@ public class TransferOrdersModel implements ITransferOrdersModel {
@Override
@Transactional
public void transfer(Order order) throws ValidationException {
orderDAO.save(order);
Scenario sourceScenario = getSourceScenario();
Scenario destinationScenario = getDestinationScenario();
@ -170,6 +168,7 @@ public class TransferOrdersModel implements ITransferOrdersModel {
_("Order version is the same in source and destination scenarios"));
}
orderDAO.save(order);
order.useSchedulingDataFor(sourceOrderVersion);
OrderVersion newOrderVersion = OrderVersion

5
navalplanner-webapp/src/test/java/org/navalplanner/web/scenarios/TransferOrdersModelTest.java
View file

@ -230,11 +230,12 @@ public class TransferOrdersModelTest {
transactionService.runOnTransaction(new IOnTransaction<Void>() {
@Override
public Void execute() {
// reload order so it has the relationship with destination
Order orderReloaded = orderDAO.findExistingEntity(order.getId());
transferOrdersModel.setSourceScenario(source);
transferOrdersModel.setDestinationScenario(destination);
transferOrdersModel.transfer(order);
transferOrdersModel.transfer(orderReloaded);
return null;
}
});