Revision 4c92c2ec
Added by Katja Luther over 4 years ago
| eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/RemotingDeleteTaxonNodeOperation.java | ||
|---|---|---|
| 21 | 21 |
import eu.etaxonomy.cdm.api.service.DeleteResult; |
| 22 | 22 |
import eu.etaxonomy.cdm.api.service.UpdateResult; |
| 23 | 23 |
import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator; |
| 24 |
import eu.etaxonomy.cdm.model.common.CdmBase; |
|
| 24 | 25 |
import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto; |
| 25 | 26 |
import eu.etaxonomy.taxeditor.navigation.l10n.Messages; |
| 26 | 27 |
import eu.etaxonomy.taxeditor.operation.RemotingCdmUpdateOperation; |
| ... | ... | |
| 101 | 102 |
|
| 102 | 103 |
|
| 103 | 104 |
} |
| 105 |
Set<CdmBase> allUpdatedNodes = result.getUpdatedObjects(); |
|
| 106 |
allUpdatedNodes.addAll(result.getDeletedObjects()); |
|
| 104 | 107 |
CdmApplicationState.getCurrentDataChangeService() |
| 105 |
.fireChangeEvent(new CdmChangeEvent(Action.Delete, result.getDeletedObjects(),this), true);
|
|
| 108 |
.fireChangeEvent(new CdmChangeEvent(Action.Delete, allUpdatedNodes,this), true);
|
|
| 106 | 109 |
return result; |
| 107 | 110 |
} |
| 108 | 111 |
|
| eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/session/MockSessionOwner.java | ||
|---|---|---|
| 82 | 82 |
eventUpdatedObjects = event.getChangedObjects(); |
| 83 | 83 |
if(expectedUpdatedObjects != null && !expectedUpdatedObjects.isEmpty()) {
|
| 84 | 84 |
for(CdmBase cb : expectedUpdatedObjects) {
|
| 85 |
Assert.assertTrue(event.getChangedObjects().contains(cb)); |
|
| 85 |
Assert.assertTrue(event.getChangedObjects().contains(cb) );
|
|
| 86 | 86 |
} |
| 87 | 87 |
} |
| 88 | 88 |
|
Also available in: Unified diff
fix failing tests