Revision 8f6bbcc2
Added by Katja Luther over 8 years ago
| cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.java | ||
|---|---|---|
| 1132 | 1132 |
Taxon child2 =(Taxon) service.find(TaxonGenerator.SPECIES2_UUID); |
| 1133 | 1133 |
|
| 1134 | 1134 |
// try {
|
| 1135 |
result = service.deleteTaxon(child2.getUuid(), config, null);
|
|
| 1135 |
result = service.deleteTaxon(child2.getUuid(), config, child2.getTaxonNodes().iterator().next().getClassification().getUuid());
|
|
| 1136 | 1136 |
if (!result.isOk()){
|
| 1137 | 1137 |
Assert.fail("Delete should not throw an exception");
|
| 1138 | 1138 |
} |
| ... | ... | |
| 1176 | 1176 |
|
| 1177 | 1177 |
|
| 1178 | 1178 |
// try {
|
| 1179 |
DeleteResult result = service.deleteTaxon(speciesTaxon.getUuid(), config, null); |
|
| 1179 |
|
|
| 1180 |
DeleteResult result = service.deleteTaxon(speciesTaxon.getUuid(), config, speciesTaxon.getTaxonNodes().iterator().next().getClassification().getUuid()); |
|
| 1180 | 1181 |
if (!result.isOk()){
|
| 1181 | 1182 |
Assert.fail(); |
| 1182 | 1183 |
} |
| ... | ... | |
| 1229 | 1230 |
config.setDeleteSynonymsIfPossible(false); |
| 1230 | 1231 |
|
| 1231 | 1232 |
|
| 1232 |
DeleteResult result = service.deleteTaxon(speciesTaxon.getUuid(), config, null);
|
|
| 1233 |
DeleteResult result = service.deleteTaxon(speciesTaxon.getUuid(), config, speciesTaxon.getTaxonNodes().iterator().next().getClassification().getUuid());
|
|
| 1233 | 1234 |
if (!result.isOk()){
|
| 1234 | 1235 |
Assert.fail(); |
| 1235 | 1236 |
} |
| ... | ... | |
| 1266 | 1267 |
|
| 1267 | 1268 |
TaxonDeletionConfigurator config = new TaxonDeletionConfigurator(); |
| 1268 | 1269 |
config.setDeleteNameIfPossible(true); |
| 1269 |
DeleteResult result = service.deleteTaxon(speciesTaxon.getUuid(), config, null);
|
|
| 1270 |
DeleteResult result = service.deleteTaxon(speciesTaxon.getUuid(), config, speciesTaxon.getTaxonNodes().iterator().next().getClassification().getUuid());
|
|
| 1270 | 1271 |
if (!result.isOk()){
|
| 1271 | 1272 |
Assert.fail(); |
| 1272 | 1273 |
} |
| ... | ... | |
| 1299 | 1300 |
|
| 1300 | 1301 |
secondClassification.addChildTaxon(testTaxon, null, null); |
| 1301 | 1302 |
//delete the taxon in all classifications |
| 1302 |
//try {
|
|
| 1303 |
config.setDeleteInAllClassifications(true);
|
|
| 1303 | 1304 |
DeleteResult result = service.deleteTaxon(testTaxon.getUuid(), config, null); |
| 1304 | 1305 |
if (!result.isOk()){
|
| 1305 | 1306 |
Assert.fail(); |
| ... | ... | |
| 1374 | 1375 |
config.getTaxonNodeConfig().setChildHandling(ChildHandling.MOVE_TO_PARENT); |
| 1375 | 1376 |
|
| 1376 | 1377 |
|
| 1377 |
DeleteResult result = service.deleteTaxon(testTaxon.getUuid(), config, null);
|
|
| 1378 |
DeleteResult result = service.deleteTaxon(testTaxon.getUuid(), config, classification.getUuid());
|
|
| 1378 | 1379 |
if(!result.isOk()){
|
| 1379 | 1380 |
Assert.fail(); |
| 1380 | 1381 |
} |
| ... | ... | |
| 1413 | 1414 |
config.getTaxonNodeConfig().setChildHandling(ChildHandling.DELETE); |
| 1414 | 1415 |
|
| 1415 | 1416 |
// try {
|
| 1416 |
DeleteResult result = service.deleteTaxon(testTaxon.getUuid(), config, null);
|
|
| 1417 |
DeleteResult result = service.deleteTaxon(testTaxon.getUuid(), config, testTaxon.getTaxonNodes().iterator().next().getClassification().getUuid());
|
|
| 1417 | 1418 |
if(!result.isOk()){
|
| 1418 | 1419 |
Assert.fail(); |
| 1419 | 1420 |
} |
| ... | ... | |
| 1452 | 1453 |
TaxonDeletionConfigurator config = new TaxonDeletionConfigurator() ; |
| 1453 | 1454 |
config.getTaxonNodeConfig().setChildHandling(ChildHandling.DELETE); |
| 1454 | 1455 |
|
| 1455 |
DeleteResult result = service.deleteTaxon(testTaxon.getUuid(), config, null);
|
|
| 1456 |
DeleteResult result = service.deleteTaxon(testTaxon.getUuid(), config, node.getClassification().getUuid());
|
|
| 1456 | 1457 |
|
| 1457 | 1458 |
if(!result.isOk()){
|
| 1458 | 1459 |
Assert.fail(); |
| ... | ... | |
| 1489 | 1490 |
TaxonDeletionConfigurator config = new TaxonDeletionConfigurator() ; |
| 1490 | 1491 |
config.setDeleteMisappliedNamesAndInvalidDesignations(true); |
| 1491 | 1492 |
|
| 1492 |
DeleteResult result = service.deleteTaxon(testTaxon.getUuid(), config, null);
|
|
| 1493 |
DeleteResult result = service.deleteTaxon(testTaxon.getUuid(), config, node.getClassification().getUuid());
|
|
| 1493 | 1494 |
if(!result.isOk()){
|
| 1494 | 1495 |
Assert.fail(); |
| 1495 | 1496 |
} |
| ... | ... | |
| 1518 | 1519 |
TaxonDeletionConfigurator config = new TaxonDeletionConfigurator() ; |
| 1519 | 1520 |
config.setDeleteMisappliedNamesAndInvalidDesignations(false); |
| 1520 | 1521 |
|
| 1521 |
DeleteResult result = service.deleteTaxon(testTaxon.getUuid(), config, null);
|
|
| 1522 |
DeleteResult result = service.deleteTaxon(testTaxon.getUuid(), config, node.getClassification().getUuid());
|
|
| 1522 | 1523 |
if(!result.isOk()){
|
| 1523 | 1524 |
Assert.fail(); |
| 1524 | 1525 |
} |
| ... | ... | |
| 1551 | 1552 |
|
| 1552 | 1553 |
|
| 1553 | 1554 |
// try {
|
| 1554 |
service.deleteTaxon(misappliedNameTaxon.getUuid(), config, null);
|
|
| 1555 |
service.deleteTaxon(misappliedNameTaxon.getUuid(), config,null); |
|
| 1555 | 1556 |
// } catch (DataChangeNoRollbackException e) {
|
| 1556 | 1557 |
// e.printStackTrace(); |
| 1557 | 1558 |
|
Also available in: Unified diff
fix #5179 and adapting the tests because the classification argument is needed now