ref #5974 Some synonymRelationship updates and update for dataset.dtd in TaxEditor

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / test / java / eu / etaxonomy / taxeditor / editor / name / operation / ChangeSynonymToMisapplicationOperationTest.java

diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperationTest.java
index 95739883f387720408a705bc3dc5c151302e3091..cf305c6c5de77b260dfbe7ff630fc73812423057 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperationTest.java
+++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperationTest.java
@@ -19,9 +19,8 @@ import org.junit.Test;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
-import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;
+import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.taxeditor.editor.name.operation.ChangeSynonymToMisapplicationOperation;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.store.operations.AbstractTaxeditorOperationTestBase;
 
@@ -40,7 +39,7 @@ public class ChangeSynonymToMisapplicationOperationTest extends AbstractTaxedito
 
        private static AbstractPostOperation operation;
 
-       private static SynonymRelationshipType synonymRelationshipType;
+       private static SynonymType synonymType;
        
        /**
         * @throws java.lang.Exception
@@ -49,8 +48,8 @@ public class ChangeSynonymToMisapplicationOperationTest extends AbstractTaxedito
        public static void setUpBeforeClass() throws Exception {
                taxon = Taxon.NewInstance(null, null);
                synonym = Synonym.NewInstance(NonViralName.NewInstance(null), null);
-               synonymRelationshipType = SynonymRelationshipType.SYNONYM_OF();
-               taxon.addSynonym(synonym, synonymRelationshipType);
+               synonymType = SynonymType.SYNONYM_OF();
+               taxon.addSynonym(synonym, synonymType);
                
                operation = new ChangeSynonymToMisapplicationOperation("Change Synonym To Misapplication", null, taxon, synonym, postOperation);
        }
@@ -79,7 +78,7 @@ public class ChangeSynonymToMisapplicationOperationTest extends AbstractTaxedito
                Assert.assertTrue("Taxon should have synonyms.", taxon.getSynonyms().size() > 0);
                Assert.assertTrue("Taxon should not have taxon relationship.", taxon.getTaxonRelations().size() == 0);
                Assert.assertEquals("Not the expected synonym.", synonym, taxon.getSynonyms().toArray(new Synonym[0])[0]);
-               Assert.assertEquals("SynonymRelationshipType is not the expected.", synonymRelationshipType, taxon.getSynonyms().toArray(new Synonym[0])[0].getRelationType(taxon));
+               Assert.assertEquals("SynonymType is not the expected.", synonymType, taxon.getSynonyms().iterator().next().getType());
        }
        
        /**