Project

General

Profile

Revision 9a3490b1

ID9a3490b1e4f6eeb0a914958586c6cd86d89954b7
Parent 8831fc56
Child 77cb7459

Added by Andreas Müller almost 4 years ago

ref #3547 Cleanup TaxonDao.testGetTaxaByNameAndArea.xml test data a bit

View differences:

cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java
316 316
        Taxon taxonRethera = (Taxon)taxonDao.findByUuid(rethera);
317 317
        taxonRethera.addSynonym(synAtroposAgassiz, SynonymRelationshipType.SYNONYM_OF());
318 318
        logger.warn("addSynonym(..)");
319
        //this.taxonDao.clear();
319

  
320 320
        Synonym synAtroposLeach = (Synonym)taxonDao.findByUuid(atroposLeach);
321 321
        Taxon taxonRetheraSecCdmtest = (Taxon)taxonDao.findByUuid(retheraSecCdmtest);
322 322
        taxonRetheraSecCdmtest.addSynonym(synAtroposLeach, SynonymRelationshipType.SYNONYM_OF());
323 323
        this.taxonDao.save(taxonRetheraSecCdmtest);
324
        //this.taxonDao.clear();
324

  
325 325
        Taxon test = (Taxon)this.taxonDao.findByUuid(retheraSecCdmtest);
326
        Set<Synonym> synonyms = test.getSynonyms();
326
//        Set<Synonym> synonyms3 = test.getSynonyms();
327 327
        // 1. searching for a taxon (Rethera)
328 328
        //long numberOfTaxa = taxonDao.countTaxaByName(Taxon.class, "Rethera", null, MatchMode.BEGINNING, namedAreas);
329 329

  
......
363 363
            null, null, null);
364 364
        //only five taxa have a distribution
365 365
        assertNotNull("getTaxaByName should return a List", results);
366
        assertTrue("expected to find 7 taxa but found "+results.size(), results.size() == 8);
366
        assertTrue("expected to find 8 taxa but found "+results.size(), results.size() == 8);
367 367
    }
368 368

  
369 369

  
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testGetTaxaByNameAndArea.xml
79 79
  <DESCRIPTIONELEMENTBASE_LANGUAGESTRING TEXTDATA_ID="35" MULTILANGUAGETEXT_ID="2" MULTILANGUAGETEXT_MAPKEY_ID="406"/>
80 80
  <DESCRIPTIONELEMENTBASE_LANGUAGESTRING TEXTDATA_ID="36" MULTILANGUAGETEXT_ID="3" MULTILANGUAGETEXT_MAPKEY_ID="406"/>
81 81
  <DESCRIPTIONELEMENTBASE_LANGUAGESTRING TEXTDATA_ID="38" MULTILANGUAGETEXT_ID="4" MULTILANGUAGETEXT_MAPKEY_ID="406"/>
82
  <HOMOTYPICALGROUP ID="1" CREATED="2008-12-10 09:56:07.0" UUID="7b214eb9-a6ac-48e5-af02-bbea634d2a03" UPDATED="2008-12-10 09:56:07.238"/>
83
  <HOMOTYPICALGROUP ID="2" CREATED="2008-12-10 09:56:07.0" UUID="6c241a4c-e5a0-4344-8e5e-a81f17b75973" UPDATED="2008-12-10 09:56:07.253"/>
82

  
84 83
  <HOMOTYPICALGROUP ID="3" CREATED="2008-12-10 09:56:07.0" UUID="76eac2b8-9c5a-4b25-acd1-e4e0d894106f" UPDATED="2008-12-10 09:56:07.253"/>
85 84
  <HOMOTYPICALGROUP ID="4" CREATED="2008-12-10 09:56:07.0" UUID="3c6ff240-9cab-4ec9-b47e-97280318ab30" UPDATED="2008-12-10 09:56:07.253"/>
86 85
  <HOMOTYPICALGROUP ID="5" CREATED="2008-12-10 09:56:07.0" UUID="5cd73df5-1c72-44a6-9864-adb145d8bd56" UPDATED="2008-12-10 09:56:07.253"/>
......
126 125
  <REFERENCE  ID="2" CREATED="2008-12-10 09:56:07.0" UUID="ad4322b7-4b05-48af-be70-f113e46c545e" UPDATED="2008-12-10 09:56:07.253" TITLECACHE="cate-sphingidae.org" PROTECTEDTITLECACHE="true" PROTECTEDABBREVTITLECACHE="false" ABBREVTITLECACHE="Sp. Pl." ABBREVTITLE="Sp. Pl." NOMENCLATURALLYRELEVANT="false" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1"/>
127 126
  <REFERENCE  ID="3" CREATED="2008-12-10 09:56:07.0" UUID="3eea6f96-0682-4025-8cdd-aaaf7c915ae2" UPDATED="2008-12-10 09:56:07.253" TITLECACHE="cate-araceae.org" PROTECTEDTITLECACHE="true" PROTECTEDABBREVTITLECACHE="false" ABBREVTITLECACHE="Sp. Pl." ABBREVTITLE="Sp. Pl." NOMENCLATURALLYRELEVANT="false" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1"/>
128 127

  
129
  <TAXONBASE DTYPE="Taxon" ID="1" SEC_ID="1" CREATED="2008-12-10 09:56:07.0" UUID="496b1325-be50-4b0a-9aa2-3ecd610215f2" UPDATED="2008-12-10 09:56:07.253" TITLECACHE=" sec. ???" PROTECTEDTITLECACHE="true" DOUBTFUL="false" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false"  UNPLACED="false" EXCLUDED="false" NAME_ID="1" PUBLISH="true"/>
130
  <TAXONBASE DTYPE="Taxon" ID="2" SEC_ID="1" CREATED="2008-12-10 09:56:07.0" UUID="822d98dc-9ef7-44b7-a870-94573a3bcb46" UPDATED="2008-12-10 09:56:07.253" TITLECACHE="  sec. ???" PROTECTEDTITLECACHE="true" DOUBTFUL="false" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false"  UNPLACED="false" EXCLUDED="false" NAME_ID="2" PUBLISH="true"/>
131 128
  <TAXONBASE DTYPE="Taxon" ID="3" SEC_ID="2" CREATED="2008-12-10 09:56:07.0" UUID="54e767ee-894e-4540-a758-f906ecb4e2d9" UPDATED="2008-12-10 09:56:07.253" TITLECACHE="Sphingidae Linnaeus, 1758 sec. cate-sphingidae.org" PROTECTEDTITLECACHE="true" DOUBTFUL="false" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false"  UNPLACED="false" EXCLUDED="false" NAME_ID="3" PUBLISH="true"/>
132 129
  <TAXONBASE DTYPE="Taxon" ID="4" SEC_ID="2" CREATED="2008-12-10 09:56:07.0" UUID="ef96fafa-7750-4141-b31b-1ad1daab3e76" UPDATED="2008-12-10 09:56:07.253" TITLECACHE="Lathoe Fabricius, 1807 sec. cate-sphingidae.org" PROTECTEDTITLECACHE="true" DOUBTFUL="false" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false"  UNPLACED="false" EXCLUDED="false" NAME_ID="4" PUBLISH="true"/>
133 130
  <TAXONBASE DTYPE="Taxon" ID="5" SEC_ID="2" CREATED="2008-12-10 09:56:07.0" UUID="17233b5e-74e7-42fc-bc37-522684657ed4" UPDATED="2008-12-10 09:56:07.253" TITLECACHE="Smerinthus Latreille, 1802 sec. cate-sphingidae.org" PROTECTEDTITLECACHE="true" DOUBTFUL="false" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false"  UNPLACED="false" EXCLUDED="false" NAME_ID="5" PUBLISH="true"/>
......
168 165
  <TAXONBASE DTYPE="Taxon" ID="40" SEC_ID="2" CREATED="2008-12-10 09:56:07.0" UUID="a9f42927-e507-433a-9629-62073a908aaf" UPDATED="2008-12-10 09:56:07.253" TITLECACHE="Picris asplenioides L. subsp. asplenioides sec. cate-sphingidae.org" PROTECTEDTITLECACHE="true" DOUBTFUL="false" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false"  UNPLACED="false" EXCLUDED="false" NAME_ID="40" PUBLISH="true"/>
169 166
  <TAXONBASE DTYPE="Taxon" ID="41" SEC_ID="3" CREATED="2008-12-10 09:56:07.0" UUID="2fb85004-bdf3-4660-be25-ab6dadfe20ef" UPDATED="2008-12-10 09:56:07.253" TITLECACHE="Ricris asplenioides L. subsp. asplenioides sec. cdm test" PROTECTEDTITLECACHE="true" DOUBTFUL="false" USENAMECACHE="false" TAXONSTATUSUNKNOWN="false"  UNPLACED="false" EXCLUDED="false" NAME_ID="41" PUBLISH="true"/>
170 167

  
171

  
172
  <TAXONNAMEBASE DTYPE="ZoologicalName" ID="1" CREATED="2008-12-10 09:56:07.0" UUID="a49a3963-c4ea-4047-8588-2f8f15352730" UPDATED="2008-12-10 09:56:07.238" TITLECACHE="" PROTECTEDTITLECACHE="true" PARSINGPROBLEM="0" FULLTITLECACHE="" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="true" AUTHORSHIPCACHE="" NAMECACHE="Aus" PROTECTEDAUTHORSHIPCACHE="true" PROTECTEDNAMECACHE="true" ANAMORPHIC="false" BINOMHYBRID="false" HYBRIDFORMULA="false" MONOMHYBRID="false" TRINOMHYBRID="false" HOMOTYPICALGROUP_ID="1" RANK_ID="774" GENUSORUNINOMIAL="Aus" NOMENCLATURALREFERENCE_ID="1"/>
173
  <TAXONNAMEBASE DTYPE="BotanicalName" ID="2" CREATED="2008-12-10 09:56:07.0" UUID="05a438d6-065f-49ef-84db-c7dc2c259975" UPDATED="2008-12-10 09:56:07.253" TITLECACHE=" " PROTECTEDTITLECACHE="true" PARSINGPROBLEM="0" FULLTITLECACHE=" " PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="true" AUTHORSHIPCACHE="" NAMECACHE="Aus aus" PROTECTEDAUTHORSHIPCACHE="true" PROTECTEDNAMECACHE="true" ANAMORPHIC="false" BINOMHYBRID="false" HYBRIDFORMULA="false" MONOMHYBRID="false" TRINOMHYBRID="false" HOMOTYPICALGROUP_ID="2" RANK_ID="765" GENUSORUNINOMIAL="Aus" SPECIFICEPITHET="aus"  NOMENCLATURALREFERENCE_ID="1"/>
174 168
  <TAXONNAMEBASE DTYPE="ZoologicalName" ID="3" CREATED="2008-12-10 09:56:07.0" UUID="9640a158-2bdb-4cbc-bff6-8f77e781f86b" UPDATED="2008-12-10 09:56:07.238" TITLECACHE="Sphingidae Linnaeus, 1758" PROTECTEDTITLECACHE="true" PARSINGPROBLEM="0" FULLTITLECACHE="" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="true" AUTHORSHIPCACHE="Linnaeus, 1758" NAMECACHE="Sphingidae" PROTECTEDAUTHORSHIPCACHE="true" PROTECTEDNAMECACHE="true" ANAMORPHIC="false"  BINOMHYBRID="false" HYBRIDFORMULA="false" MONOMHYBRID="false" TRINOMHYBRID="false" HOMOTYPICALGROUP_ID="3" RANK_ID="782" GENUSORUNINOMIAL="Sphingidae" NOMENCLATURALREFERENCE_ID="1"/>
175 169
  <TAXONNAMEBASE DTYPE="ZoologicalName" ID="4" CREATED="2008-12-10 09:56:07.0" UUID="446d8d76-e206-49e1-b6da-d06ce1f296e1" UPDATED="2008-12-10 09:56:07.238" TITLECACHE="Lathoe Fabricius, 1807" PROTECTEDTITLECACHE="true" PARSINGPROBLEM="0" FULLTITLECACHE="" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="true" AUTHORSHIPCACHE="Fabricius, 1807" NAMECACHE="Laothoe" PROTECTEDAUTHORSHIPCACHE="true" PROTECTEDNAMECACHE="true" ANAMORPHIC="false"  BINOMHYBRID="false" HYBRIDFORMULA="false" MONOMHYBRID="false" TRINOMHYBRID="false" HOMOTYPICALGROUP_ID="4" RANK_ID="774" GENUSORUNINOMIAL="Laothoe" NOMENCLATURALREFERENCE_ID="1"/>
176 170
  <TAXONNAMEBASE DTYPE="ZoologicalName" ID="5" CREATED="2008-12-10 09:56:07.0" UUID="3d0b9061-fc9d-4de5-9dc1-341e10eb139e" UPDATED="2008-12-10 09:56:07.238" TITLECACHE="Smerinthus Latreille, 1802" PROTECTEDTITLECACHE="true" PARSINGPROBLEM="0" FULLTITLECACHE="" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="true" AUTHORSHIPCACHE="Latreille, 1802" NAMECACHE="Smerinthus" PROTECTEDAUTHORSHIPCACHE="true" PROTECTEDNAMECACHE="true" ANAMORPHIC="false"  BINOMHYBRID="false" HYBRIDFORMULA="false" MONOMHYBRID="false" TRINOMHYBRID="false" HOMOTYPICALGROUP_ID="5" RANK_ID="774" GENUSORUNINOMIAL="Smerinthus" NOMENCLATURALREFERENCE_ID="1"/>
......
220 214
  <TAXONNODE ID="8" CREATED="2009-06-18 13:47:59.0" UUID="17ff1a4e-9bbd-4911-91a9-0376ee419fef" COUNTCHILDREN="0" TAXON_ID="17" CLASSIFICATION_ID="1"/>
221 215
  <TAXONNODE ID="9" CREATED="2009-06-18 13:47:59.0" UUID="9741d098-d090-4544-8712-2310c3cf6792" COUNTCHILDREN="0" TAXON_ID="41" CLASSIFICATION_ID="1"/>
222 216
  <TAXONNODE ID="10" CREATED="2009-06-18 13:47:59.0" UUID="5b9559b1-9b1f-41bc-9e16-f4512146a26d" COUNTCHILDREN="0" TAXON_ID="[null]" CLASSIFICATION_ID="2"/>
223
 
224
  <TAXONNODE_AUD ID="1" REV="1025" REVTYPE="0" CREATED="2009-06-18 13:47:59.0" UUID="6d6b43aa-3a77-4be5-91d0-00b702fc5d6e" COUNTCHILDREN="0" TAXON_ID="[null]" CLASSIFICATION_ID="1"/>
225
  <TAXONNODE_AUD ID="2" REV="1025" REVTYPE="0" CREATED="2009-06-18 13:47:59.0" UUID="0b5846e5-b8d2-4ca9-ac51-099286ea4adc" COUNTCHILDREN="0" TAXON_ID="19" CLASSIFICATION_ID="1"/>
226
  <TAXONNODE_AUD ID="3" REV="1025" REVTYPE="0" CREATED="2009-06-18 13:47:59.0" UUID="770239f6-4fa8-496b-8738-fe8f7b2ad519" COUNTCHILDREN="0" TAXON_ID="18" CLASSIFICATION_ID="1"/>
227
  <TAXONNODE_AUD ID="4" REV="1025" REVTYPE="0" CREATED="2009-06-18 13:47:59.0" UUID="44a51ccc-1517-4a43-a9f1-ec296ad90982" COUNTCHILDREN="0" TAXON_ID="39" CLASSIFICATION_ID="2"/>
228
  <TAXONNODE_AUD ID="5" REV="1025" REVTYPE="0" CREATED="2009-06-18 13:47:59.0" UUID="8f58324e-1528-4de2-a65e-8993a7ddf2c5" COUNTCHILDREN="0" TAXON_ID="38" CLASSIFICATION_ID="2"/>
229
  <TAXONNODE_AUD ID="6" REV="1025" REVTYPE="0" CREATED="2009-06-18 13:47:59.0" UUID="98e8411f-f022-4222-9879-43d69549e467" COUNTCHILDREN="0" TAXON_ID="40" CLASSIFICATION_ID="2"/>
230
  <TAXONNODE_AUD ID="7" REV="1025" REVTYPE="0" CREATED="2009-06-18 13:47:59.0" UUID="aa7d9156-6ff1-4c76-827c-9798de5d04bf" COUNTCHILDREN="0" TAXON_ID="38" CLASSIFICATION_ID="1"/>
231
  <TAXONNODE_AUD ID="8" REV="1025" REVTYPE="0" CREATED="2009-06-18 13:47:59.0" UUID="17ff1a4e-9bbd-4911-91a9-0376ee419fef" COUNTCHILDREN="0" TAXON_ID="17" CLASSIFICATION_ID="1"/>
232
  <TAXONNODE_AUD ID="9" REV="1025" REVTYPE="0" CREATED="2009-06-18 13:47:59.0" UUID="9741d098-d090-4544-8712-2310c3cf6792" COUNTCHILDREN="0" TAXON_ID="41" CLASSIFICATION_ID="1"/>
233
  <TAXONNODE_AUD ID="10" REV="1025" REVTYPE="0" CREATED="2009-06-18 13:47:59.0" UUID="5b9559b1-9b1f-41bc-9e16-f4512146a26d" COUNTCHILDREN="0" TAXON_ID="[null]" CLASSIFICATION_ID="2"/>
234
 
235 217

  
236 218
  <CLASSIFICATION ID="1" CREATED="2009-06-18 13:47:59.0" UUID="aeee7448-5298-4991-b724-8d5b75a0a7a9" PROTECTEDTITLECACHE="false" TITLECACHE="TestBaum" NAME_ID="1" ROOTNODE_ID="1"/>
237
  <CLASSIFICATION_AUD ID="1" REV="1025" REVTYPE="0" CREATED="2009-06-18 13:47:59.0" UUID="aeee7448-5298-4991-b724-8d5b75a0a7a9" PROTECTEDTITLECACHE="false" TITLECACHE="TestBaum" NAME_ID="1" ROOTNODE_ID="1"/>
238

  
239 219
  <CLASSIFICATION ID="2" CREATED="2009-06-18 13:47:59.0" UUID="080181d0-416e-447c-b48f-7700ea439277" PROTECTEDTITLECACHE="false" TITLECACHE="TestBaum2" NAME_ID="6" ROOTNODE_ID="10"/>
240
  <CLASSIFICATION_AUD ID="2" REV="1025" REVTYPE="0" CREATED="2009-06-18 13:47:59.0" UUID="080181d0-416e-447c-b48f-7700ea439277" PROTECTEDTITLECACHE="false" TITLECACHE="TestBaum2" NAME_ID="6" ROOTNODE_ID="10"/>
241

  
242
  <TAXONRELATIONSHIP ID="1" CREATED="2009-06-18 13:47:59.0" UUID="1e7afe1f-306c-4b9f-8e30-4b05f7478822" RELATEDFROM_ID="39" RELATEDTO_ID="19" DOUBTFUL="false" TYPE_ID="888"/>
243
  <TAXONRELATIONSHIP_AUD ID="1" REV="1025" CREATED="2009-06-18 13:47:59.0" UUID="1e7afe1f-306c-4b9f-8e30-4b05f7478822" RELATEDFROM_ID="39" RELATEDTO_ID="19" DOUBTFUL="false" TYPE_ID="888"/>
244

  
245
  <TAXONRELATIONSHIP ID="2" CREATED="2009-06-18 13:47:59.0" UUID="8d50cecd-c59c-4567-b6f3-4595550c49fa" RELATEDFROM_ID="1" RELATEDTO_ID="19" DOUBTFUL="false" TYPE_ID="888"/>
246
  <TAXONRELATIONSHIP_AUD ID="2" REV="1025" REVTYPE="0" CREATED="2009-06-18 13:47:59.0" UUID="8d50cecd-c59c-4567-b6f3-4595550c49fa" RELATEDFROM_ID="1" RELATEDTO_ID="19" DOUBTFUL="false" TYPE_ID="888"/>
247

  
248
  <TAXONRELATIONSHIP ID="3" CREATED="2009-06-18 13:47:59.0" UUID="f802fd48-26cf-4aec-8d15-6ff542711829" RELATEDFROM_ID="20" RELATEDTO_ID="21" DOUBTFUL="false" TYPE_ID="888"/>
249
  <TAXONRELATIONSHIP_AUD ID="3" REV="1025" REVTYPE="0" CREATED="2009-06-18 13:47:59.0" UUID="f802fd48-26cf-4aec-8d15-6ff542711829" RELATEDFROM_ID="20" RELATEDTO_ID="21" DOUBTFUL="false" TYPE_ID="888"/>
250

  
251

  
252
   <SYNONYMRELATIONSHIP ID="1" CREATED="2009-06-18 13:47:59.0" UUID="a49aebbb-f24d-4136-a98f-eb88678aa884" RELATEDFROM_ID="27" RELATEDTO_ID="13" DOUBTFUL="false" PARTIAL="false" PROPARTE="false" TYPE_ID="846"/>
253
  <SYNONYMRELATIONSHIP_AUD ID="1" REV="1025" REVTYPE="0" CREATED="2009-06-18 13:47:59.0" UUID="a49aebbb-f24d-4136-a98f-eb88678aa884" RELATEDFROM_ID="27" RELATEDTO_ID="13" DOUBTFUL="false" PARTIAL="false" PROPARTE="false" TYPE_ID="846"/>
220
  <SYNONYMRELATIONSHIP ID="1" CREATED="2009-06-18 13:47:59.0" UUID="a49aebbb-f24d-4136-a98f-eb88678aa884" RELATEDFROM_ID="27" RELATEDTO_ID="13" DOUBTFUL="false" PARTIAL="false" PROPARTE="false" TYPE_ID="846"/>
254 221
  <SYNONYMRELATIONSHIP ID="2" CREATED="2009-06-18 13:47:59.0" UUID="3d81351f-933e-4e00-a1ea-02ced158b41d" RELATEDFROM_ID="28" RELATEDTO_ID="13" DOUBTFUL="false" PARTIAL="false" PROPARTE="false" TYPE_ID="846"/>
255
  <SYNONYMRELATIONSHIP_AUD ID="2" REV="1025" REVTYPE="0" CREATED="2009-06-18 13:47:59.0" UUID="3d81351f-933e-4e00-a1ea-02ced158b41d" RELATEDFROM_ID="28" RELATEDTO_ID="13" DOUBTFUL="false" PARTIAL="false" PROPARTE="false" TYPE_ID="846"/>
256

  
257 222
</dataset>

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)