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

ItEr24S03ContornaItEr23S03: Fixing failing test.

Browse source
This commit is contained in:
Óscar González Fernández 2009-09-02 17:53:05 +02:00
parent 4095db826b
commit 7abda4c132
1 changed files with 38 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
navalplanner-webapp/src/test/java/org/navalplanner/web/resources/CriterionModelTest.java
View file

@ -2,6 +2,7 @@ package org.navalplanner.web.resources;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
import static org.navalplanner.business.BusinessGlobalNames.BUSINESS_SPRING_CONFIG_FILE;
import static org.navalplanner.web.WebappGlobalNames.WEBAPP_SPRING_CONFIG_FILE;
import static org.navalplanner.web.test.WebappGlobalNames.WEBAPP_SPRING_CONFIG_TEST_FILE;
@ -57,6 +58,9 @@ public class CriterionModelTest {
@Autowired
private ICriterionTypeDAO criterionTypeDAO;
@Autowired
private IAdHocTransactionService transactionService;
private Criterion criterion;
@Test(expected = InvalidStateException.class)
@ -176,8 +180,8 @@ public class CriterionModelTest {
}
private int getCriterionsNumber(final ICriterionType<?> type) {
return adHocTransactionService
.runOnTransaction(new IOnTransaction<Integer>() {
return adHocTransactionService.runOnTransaction(
new IOnTransaction<Integer>() {
@Override
public Integer execute() {
@ -193,16 +197,40 @@ public class CriterionModelTest {
criterionModel.save(criterion);
}
@Test(expected = ValidationException.class)
@NotTransactional
public void twoDifferentCriterionsWithSameNameAndTypeAreDetectedIfPossible()
throws ValidationException {
String unique = UUID.randomUUID().toString();
Criterion criterion = givenValidCriterionFor(
PredefinedCriterionTypes.WORK_RELATIONSHIP, unique);
criterionModel.save(criterion);
Criterion criterion2 = givenValidCriterionFor(
PredefinedCriterionTypes.WORK_RELATIONSHIP, unique);
criterionModel.save(criterion2);
final String unique = UUID.randomUUID().toString();
transactionService.runOnTransaction(new IOnTransaction<Void>() {
@Override
public Void execute() {
Criterion criterion = givenValidCriterionFor(
PredefinedCriterionTypes.WORK_RELATIONSHIP, unique);
try {
criterionModel.save(criterion);
} catch (ValidationException e) {
throw new RuntimeException(e);
}
return null;
}
});
transactionService.runOnTransaction(new IOnTransaction<Void>() {
@Override
public Void execute() {
try {
Criterion criterion2 = givenValidCriterionFor(
PredefinedCriterionTypes.WORK_RELATIONSHIP, unique);
criterionModel.save(criterion2);
fail("must send "
+ ValidationException.class.getSimpleName());
} catch (ValidationException e) {
// ok
}
return null;
}
});
}
}