fix failing test

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java
index fb5fdd10eb7bd02cf5d8067b8028d10e79929c2f..4cf151846ea868fd0d82f1f985066a794d0a961f 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java
@@ -75,15 +75,13 @@ public class SwapSynonymAndAcceptedOperation extends AbstractPostTaxonOperation
                monitor.worked(20);
 
                UpdateResult result = CdmStore.getService(ITaxonService.class).swapSynonymAndAcceptedTaxon(synonym.getUuid(), element.getUuid(), setNameInSource);//TODO
-               Taxon taxon = (Taxon)result.getCdmEntity();
+               element = (Taxon)result.getCdmEntity();
                List<String> propertyPath = new ArrayList<>();
                propertyPath.add("synonyms");
-//             Taxon taxon = (Taxon) CdmStore.getService(ITaxonService.class).load(result.getCdmEntity().getUuid(), propertyPath);
-
 
                monitor.worked(40);
 
-               return postExecute(taxon);
+               return postExecute(element);
        }
 
        /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java
index 8998e659dae494d6df2a1c30501bfdd3a1090c00..8ecf13f40fa413d63dda5e5341fa3715ea42cd2e 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java
+++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java
@@ -25,7 +25,6 @@ import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 import eu.etaxonomy.cdm.model.term.DefaultTermInitializer;
-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.store.operations.AbstractTaxeditorOperationTestBase;
 
 /**
@@ -36,7 +35,7 @@ public class SwapSynonymAndAcceptedOperationTest extends AbstractTaxeditorOperat
        private static final Logger logger = Logger
                        .getLogger(SwapSynonymAndAcceptedOperationTest.class);
 
-       private static AbstractPostOperation operation;
+       private static SwapSynonymAndAcceptedOperation operation;
 
        private static Taxon taxon;
 
@@ -125,7 +124,8 @@ public class SwapSynonymAndAcceptedOperationTest extends AbstractTaxeditorOperat
                operation.execute(null, null);
 
                // New taxon has correct name?
-               Assert.assertEquals(taxon.getName(), oldSynonymName);
+               taxon = operation.getElement();
+               Assert.assertEquals(taxon, oldSynonymName);
 
 //             // New taxon has correct parent?
 //             Assert.assertEquals(taxon.getTaxonomicParent(), parentTaxon);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPostOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPostOperation.java
index b3d2b318b5529476b577a7d57e9362a9a9052cce..a73e991946ae73280df446c2a9dc0545afcfa734 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPostOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPostOperation.java
@@ -29,6 +29,7 @@ public abstract class AbstractPostOperation<T extends ICdmBase> extends Abstract
      */
     protected T element;
 
+
     /**
      *
      */
@@ -57,6 +58,11 @@ public abstract class AbstractPostOperation<T extends ICdmBase> extends Abstract
         this.cdmEntitySessionEnabled = cdmEntitySessionEnabled;
     }
 
+    public T getElement() {
+        return element;
+    }
+
+
     /**
      * This method will try to call the post operation on a possibly registered
      * IPostOperationEnabled implementor. Objects that were affected by the operation