ref #6794 fix termType settings in deleteTerms test and clean it up

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TermServiceImplTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TermServiceImplTest.java
index d6181c521bb9d5ae511c54e4a0194c71bbc89513..11bb19670c758559b8145fb32d9cd8b798febc5a 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TermServiceImplTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TermServiceImplTest.java
@@ -33,6 +33,7 @@ import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.Representation;\r
 import eu.etaxonomy.cdm.model.common.TermType;\r
 import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
+import eu.etaxonomy.cdm.model.description.State;\r
 import eu.etaxonomy.cdm.model.location.NamedArea;\r
 import eu.etaxonomy.cdm.model.name.IBotanicalName;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
@@ -45,7 +46,6 @@ import eu.etaxonomy.cdm.test.unitils.CleanSweepInsertLoadStrategy;
 /**\r
  * @author a.mueller\r
  * @since 27.05.2008\r
- * @version 1.0\r
  */\r
 public class TermServiceImplTest extends CdmTransactionalIntegrationTest{\r
     @SuppressWarnings("unused")\r
@@ -207,46 +207,43 @@ public class TermServiceImplTest extends CdmTransactionalIntegrationTest{
                 "DefinedTermBase","Representation"};\r
 \r
        commitAndStartNewTransaction(tableNames);\r
-       TermVocabulary<DefinedTerm> vocs = TermVocabulary.NewInstance(TermType.Feature, "TestFeatures", null, null, null);\r
-       vocs.addTerm(DefinedTerm.NewInstance(TermType.State, "green", "green", "gn"));\r
-       vocs= vocabularyService.save(vocs);\r
+       TermVocabulary<State> vocStates = TermVocabulary.NewInstance(TermType.State, "Test States", null, null, null);\r
+       vocStates.addTerm(State.NewInstance("green", "green", "gn"));\r
+       vocabularyService.save(vocStates);\r
        Pager<DefinedTermBase> term = termService.findByRepresentationText("green", DefinedTermBase.class, null, null);\r
        if (term.getCount() != 0){\r
-\r
                DeleteResult result = termService.delete(term.getRecords().get(0));\r
                assertTrue(result.isOk());\r
                commitAndStartNewTransaction(tableNames);\r
                }\r
-       TermVocabulary<DefinedTerm> voc = TermVocabulary.NewInstance(TermType.Feature, "TestFeatures", null, null, null);\r
-       voc.addTerm(DefinedTerm.NewDnaMarkerInstance("test", "marker", "t"));\r
-       UUID vocUUID = vocabularyService.save(voc).getUuid();\r
-\r
-       voc = vocabularyService.find(vocUUID);\r
-       Set<DefinedTerm> terms = voc.getTerms();\r
-       DefinedTermBase termBase =terms.iterator().next();\r
-       UUID termUUID = termBase.getUuid();\r
+       TermVocabulary<DefinedTerm> vocDna = TermVocabulary.NewInstance(TermType.DnaMarker, "Test DNA marker", null, null, null);\r
+       vocDna.addTerm(DefinedTerm.NewDnaMarkerInstance("test", "marker", "t"));\r
+       vocabularyService.save(vocDna);\r
+\r
+       vocDna = vocabularyService.find(vocDna.getUuid());\r
+       Set<DefinedTerm> terms = vocDna.getTerms();\r
+       DefinedTerm termBase =terms.iterator().next();\r
        termService.delete(termBase, null);\r
        //commitAndStartNewTransaction(tableNames);\r
-       termBase =  termService.load(termUUID);\r
+       termBase =  (DefinedTerm)termService.load(termBase.getUuid());\r
        assertNull(termBase);\r
 \r
 \r
        //TermVocabulary<DefinedTerm> voc = TermVocabulary.NewInstance(TermType.Feature, "TestFeatures", null, null, null);\r
-        voc.addTerm(DefinedTerm.NewDnaMarkerInstance("test", "marker", "t"));\r
-        vocUUID = vocabularyService.save(voc).getUuid();\r
+        vocDna.addTerm(DefinedTerm.NewDnaMarkerInstance("test", "marker", "t"));\r
+        vocabularyService.save(vocDna);\r
 \r
-        voc = vocabularyService.find(vocUUID);\r
-        terms = voc.getTerms();\r
+        vocDna = vocabularyService.find(vocDna.getUuid());\r
+        terms = vocDna.getTerms();\r
         termBase =terms.iterator().next();\r
-        termUUID = termBase.getUuid();\r
-        termBase = termService.load(termUUID);\r
+        termBase = (DefinedTerm)termService.load(termBase.getUuid());\r
         IBotanicalName testName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());\r
         Taxon testTaxon = Taxon.NewInstance(testName,null);\r
-        testTaxon.addIdentifier("Test", (DefinedTerm) termBase);\r
+        testTaxon.addIdentifier("Test", termBase);\r
         taxonService.save(testTaxon);\r
         termService.delete(termBase, null);\r
         //commitAndStartNewTransaction(tableNames);\r
-        termBase =  termService.load(termUUID);\r
+        termBase =  (DefinedTerm)termService.load(termBase.getUuid());\r
         assertNotNull(termBase);\r
     }\r
 \r