Revision fe34a9eb
Added by Andreas Müller about 7 years ago
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.java | ||
---|---|---|
168 | 168 |
TaxonBase<?> actualTaxon = service.find(uuid); |
169 | 169 |
assertEquals(expectedTaxon, actualTaxon); |
170 | 170 |
|
171 |
actualTaxon.setName(TaxonNameBase.NewBotanicalInstance(Rank.SPECIES()));
|
|
171 |
actualTaxon.setName(TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES()));
|
|
172 | 172 |
try{ |
173 | 173 |
service.saveOrUpdate(actualTaxon); |
174 | 174 |
}catch(Exception e){ |
... | ... | |
180 | 180 |
*/ |
181 | 181 |
@Test |
182 | 182 |
public final void testRemoveTaxon() { |
183 |
Taxon taxon = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.UNKNOWN_RANK()), null);
|
|
183 |
Taxon taxon = Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(Rank.UNKNOWN_RANK()), null);
|
|
184 | 184 |
UUID uuid = service.save(taxon).getUuid(); |
185 | 185 |
// try { |
186 | 186 |
service.deleteTaxon(taxon.getUuid(), null, null); |
... | ... | |
523 | 523 |
Rank rank = Rank.SPECIES(); |
524 | 524 |
Reference ref1 = ReferenceFactory.newGeneric(); |
525 | 525 |
//HomotypicalGroup group = HomotypicalGroup.NewInstance(); |
526 |
Taxon taxon1 = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test3", null, null, null, null, null, null, null), null);
|
|
527 |
Synonym synonym0 = Synonym.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test2", null, null, null, null, null, null, null), null);
|
|
528 |
Synonym synonym1 = Synonym.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test2", null, null, null, null, null, null, null), null);
|
|
529 |
Synonym synonym2 = Synonym.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test4", null, null, null, null, null, null, null), null);
|
|
526 |
Taxon taxon1 = Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(rank, "Test3", null, null, null, null, null, null, null), null);
|
|
527 |
Synonym synonym0 = Synonym.NewInstance(TaxonNameFactory.NewBotanicalInstance(rank, "Test2", null, null, null, null, null, null, null), null);
|
|
528 |
Synonym synonym1 = Synonym.NewInstance(TaxonNameFactory.NewBotanicalInstance(rank, "Test2", null, null, null, null, null, null, null), null);
|
|
529 |
Synonym synonym2 = Synonym.NewInstance(TaxonNameFactory.NewBotanicalInstance(rank, "Test4", null, null, null, null, null, null, null), null);
|
|
530 | 530 |
synonym0.getName().setHomotypicalGroup(taxon1.getHomotypicGroup()); |
531 | 531 |
synonym2.getName().setHomotypicalGroup(synonym1.getHomotypicGroup()); |
532 | 532 |
//tax2.addHeterotypicSynonymName(synonym.getName()); |
... | ... | |
557 | 557 |
Rank rank = Rank.SPECIES(); |
558 | 558 |
Reference ref1 = ReferenceFactory.newGeneric(); |
559 | 559 |
//HomotypicalGroup group = HomotypicalGroup.NewInstance(); |
560 |
Taxon taxon1 = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test3", null, null, null, null, null, null, null), null);
|
|
561 |
Synonym synonym0 = Synonym.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test2", null, null, null, null, null, null, null), null);
|
|
562 |
Synonym synonym1 = Synonym.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test2", null, null, null, null, null, null, null), null);
|
|
563 |
Synonym synonym2 = Synonym.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test4", null, null, null, null, null, null, null), null);
|
|
560 |
Taxon taxon1 = Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(rank, "Test3", null, null, null, null, null, null, null), null);
|
|
561 |
Synonym synonym0 = Synonym.NewInstance(TaxonNameFactory.NewBotanicalInstance(rank, "Test2", null, null, null, null, null, null, null), null);
|
|
562 |
Synonym synonym1 = Synonym.NewInstance(TaxonNameFactory.NewBotanicalInstance(rank, "Test2", null, null, null, null, null, null, null), null);
|
|
563 |
Synonym synonym2 = Synonym.NewInstance(TaxonNameFactory.NewBotanicalInstance(rank, "Test4", null, null, null, null, null, null, null), null);
|
|
564 | 564 |
synonym0.getName().setHomotypicalGroup(taxon1.getHomotypicGroup()); |
565 | 565 |
synonym2.getName().setHomotypicalGroup(synonym1.getHomotypicGroup()); |
566 | 566 |
//tax2.addHeterotypicSynonymName(synonym.getName()); |
... | ... | |
1190 | 1190 |
assertNotNull(taxonName); |
1191 | 1191 |
assertNull(taxon); |
1192 | 1192 |
config.setDeleteNameIfPossible(true); |
1193 |
Taxon newTaxon = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.SPECIES()), null);
|
|
1193 |
Taxon newTaxon = Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES()), null);
|
|
1194 | 1194 |
service.save(newTaxon); |
1195 | 1195 |
result = service.deleteTaxon(newTaxon.getUuid() |
1196 | 1196 |
, config, null); |
... | ... | |
1252 | 1252 |
|
1253 | 1253 |
|
1254 | 1254 |
config.setDeleteNameIfPossible(true); |
1255 |
Taxon newTaxon = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.SPECIES()), null);
|
|
1255 |
Taxon newTaxon = Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES()), null);
|
|
1256 | 1256 |
service.save(newTaxon); |
1257 | 1257 |
result = service.deleteTaxon(newTaxon.getUuid() |
1258 | 1258 |
, config, null); |
... | ... | |
1316 | 1316 |
|
1317 | 1317 |
BotanicalName taxonName = (BotanicalName) nameService.find(SPECIES1_NAME_UUID); |
1318 | 1318 |
assertNotNull(taxonName); |
1319 |
BotanicalName fromName = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
1319 |
BotanicalName fromName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
1320 | 1320 |
taxonName.addRelationshipFromName(fromName, NameRelationshipType.VALIDATED_BY_NAME(), null); |
1321 | 1321 |
|
1322 | 1322 |
TaxonDeletionConfigurator config = new TaxonDeletionConfigurator(); |
... | ... | |
1417 | 1417 |
Taxon testTaxon = getTestTaxon(); |
1418 | 1418 |
UUID uuid = service.save(testTaxon).getUuid(); |
1419 | 1419 |
|
1420 |
Taxon topMost = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.FAMILY()), null);
|
|
1420 |
Taxon topMost = Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(Rank.FAMILY()), null);
|
|
1421 | 1421 |
|
1422 | 1422 |
Iterator<TaxonNode> nodes = testTaxon.getTaxonNodes().iterator(); |
1423 | 1423 |
TaxonNode node =nodes.next(); |
... | ... | |
1455 | 1455 |
Taxon testTaxon = getTestTaxon(); |
1456 | 1456 |
UUID uuid = service.save(testTaxon).getUuid(); |
1457 | 1457 |
|
1458 |
Taxon topMost = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.FAMILY()), null);
|
|
1458 |
Taxon topMost = Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(Rank.FAMILY()), null);
|
|
1459 | 1459 |
|
1460 | 1460 |
Iterator<TaxonNode> nodes = testTaxon.getTaxonNodes().iterator(); |
1461 | 1461 |
TaxonNode node =nodes.next(); |
... | ... | |
1495 | 1495 |
Taxon testTaxon = getTestTaxon(); |
1496 | 1496 |
UUID uuid = service.save(testTaxon).getUuid(); |
1497 | 1497 |
|
1498 |
Taxon topMost = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.FAMILY()), null);
|
|
1498 |
Taxon topMost = Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(Rank.FAMILY()), null);
|
|
1499 | 1499 |
|
1500 | 1500 |
Iterator<TaxonNode> nodes = testTaxon.getTaxonNodes().iterator(); |
1501 | 1501 |
TaxonNode node =nodes.next(); |
... | ... | |
1534 | 1534 |
Taxon testTaxon = getTestTaxon(); |
1535 | 1535 |
UUID uuid = service.save(testTaxon).getUuid(); |
1536 | 1536 |
|
1537 |
Taxon misappliedName = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.GENUS()), null);
|
|
1537 |
Taxon misappliedName = Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(Rank.GENUS()), null);
|
|
1538 | 1538 |
|
1539 | 1539 |
Iterator<TaxonNode> nodes = testTaxon.getTaxonNodes().iterator(); |
1540 | 1540 |
TaxonNode node =nodes.next(); |
... | ... | |
1563 | 1563 |
Taxon testTaxon = getTestTaxon(); |
1564 | 1564 |
UUID uuid = service.save(testTaxon).getUuid(); |
1565 | 1565 |
|
1566 |
Taxon misappliedName = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.GENUS()), null);
|
|
1566 |
Taxon misappliedName = Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(Rank.GENUS()), null);
|
|
1567 | 1567 |
|
1568 | 1568 |
Iterator<TaxonNode> nodes = testTaxon.getTaxonNodes().iterator(); |
1569 | 1569 |
TaxonNode node =nodes.next(); |
... | ... | |
1593 | 1593 |
Taxon testTaxon = getTestTaxon(); |
1594 | 1594 |
UUID uuid = service.save(testTaxon).getUuid(); |
1595 | 1595 |
|
1596 |
Taxon misappliedNameTaxon = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.GENUS()), null);
|
|
1596 |
Taxon misappliedNameTaxon = Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(Rank.GENUS()), null);
|
|
1597 | 1597 |
|
1598 | 1598 |
Iterator<TaxonNode> nodes = testTaxon.getTaxonNodes().iterator(); |
1599 | 1599 |
TaxonNode node =nodes.next(); |
... | ... | |
1788 | 1788 |
public void createTestDataSet() throws FileNotFoundException { |
1789 | 1789 |
Rank rank = Rank.SPECIES(); |
1790 | 1790 |
|
1791 |
taxWithoutSyn = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test1", null, null, null, null, null, null, null), null);
|
|
1792 |
taxWithSyn = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test3", null, null, null, null, null, null, null), null);
|
|
1793 |
tax2WithSyn = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test5", null, null, null, null, null, null, null), null);
|
|
1794 |
synonym = Synonym.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test2", null, null, null, null, null, null, null), null);
|
|
1795 |
synonym2 = Synonym.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test4", null, null, null, null, null, null, null), null);
|
|
1791 |
taxWithoutSyn = Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(rank, "Test1", null, null, null, null, null, null, null), null);
|
|
1792 |
taxWithSyn = Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(rank, "Test3", null, null, null, null, null, null, null), null);
|
|
1793 |
tax2WithSyn = Taxon.NewInstance(TaxonNameFactory.NewBotanicalInstance(rank, "Test5", null, null, null, null, null, null, null), null);
|
|
1794 |
synonym = Synonym.NewInstance(TaxonNameFactory.NewBotanicalInstance(rank, "Test2", null, null, null, null, null, null, null), null);
|
|
1795 |
synonym2 = Synonym.NewInstance(TaxonNameFactory.NewBotanicalInstance(rank, "Test4", null, null, null, null, null, null, null), null);
|
|
1796 | 1796 |
synonym2.getName().setHomotypicalGroup(synonym.getHomotypicGroup()); |
1797 | 1797 |
|
1798 | 1798 |
taxWithSyn.addSynonym(synonym, SynonymType.HETEROTYPIC_SYNONYM_OF()); |
... | ... | |
1825 | 1825 |
citationRef.setTitleCache("Sp. lunarum", true); |
1826 | 1826 |
|
1827 | 1827 |
//genus taxon with Name, combinationAuthor, |
1828 |
BotanicalName botName = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
|
|
1828 |
BotanicalName botName = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
|
|
1829 | 1829 |
botName.setTitleCache("Hieracium L.", true); |
1830 | 1830 |
botName.setGenusOrUninomial("Hieracium"); |
1831 | 1831 |
botName.setCombinationAuthorship(Person.NewInstance()); |
... | ... | |
1835 | 1835 |
genusTaxon.setUuid(GENUS_UUID); |
1836 | 1836 |
service.save(genusTaxon); |
1837 | 1837 |
//a name that is the basionym of genusTaxon's name |
1838 |
BotanicalName basionym = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
|
|
1838 |
BotanicalName basionym = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
|
|
1839 | 1839 |
basionym.setTitleCache("Hieracilla DC.", true); |
1840 | 1840 |
basionym.setGenusOrUninomial("Hieracilla"); |
1841 | 1841 |
basionym.setCombinationAuthorship(deCandolle); |
... | ... | |
1843 | 1843 |
botName.addBasionym(basionym, null, null,"216"); |
1844 | 1844 |
nameService.saveOrUpdate(basionym); |
1845 | 1845 |
//species taxon that is the child of genus taxon |
1846 |
BotanicalName botSpecies = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
1846 |
BotanicalName botSpecies = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
1847 | 1847 |
botSpecies.setTitleCache("Hieracium asturianum Pau", true); |
1848 | 1848 |
botSpecies.setGenusOrUninomial("Hieracium"); |
1849 | 1849 |
botSpecies.setSpecificEpithet("asturianum"); |
... | ... | |
1861 | 1861 |
// childTaxon.setTaxonomicParent(genusTaxon, citationRef, "456"); |
1862 | 1862 |
classificationService.save(classification); |
1863 | 1863 |
//homotypic synonym of childTaxon1 |
1864 |
BotanicalName botSpecies4= TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
1864 |
BotanicalName botSpecies4= TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
1865 | 1865 |
botSpecies4.setTitleCache("Hieracium gueri DC.", true); |
1866 | 1866 |
botSpecies4.setGenusOrUninomial("Hieracium"); |
1867 | 1867 |
botSpecies4.setSpecificEpithet("gueri"); |
... | ... | |
1872 | 1872 |
service.saveOrUpdate(childTaxon); |
1873 | 1873 |
|
1874 | 1874 |
//2nd child species taxon that is the child of genus taxon |
1875 |
BotanicalName botSpecies2= TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
1875 |
BotanicalName botSpecies2= TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
1876 | 1876 |
botSpecies2.setTitleCache("Hieracium wolffii Zahn", true); |
1877 | 1877 |
botSpecies2.setGenusOrUninomial("Hieracium"); |
1878 | 1878 |
botSpecies2.setSpecificEpithet("wolffii"); |
... | ... | |
1885 | 1885 |
//childTaxon2.setTaxonomicParent(genusTaxon, citationRef, "499"); |
1886 | 1886 |
service.saveOrUpdate(childTaxon2); |
1887 | 1887 |
//heterotypic synonym of childTaxon2 |
1888 |
BotanicalName botSpecies3= TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
1888 |
BotanicalName botSpecies3= TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
1889 | 1889 |
botSpecies3.setTitleCache("Hieracium lupium DC.", true); |
1890 | 1890 |
botSpecies3.setGenusOrUninomial("Hieracium"); |
1891 | 1891 |
botSpecies3.setSpecificEpithet("lupium"); |
... | ... | |
1895 | 1895 |
childTaxon2.addSynonym(heteroSynonym, SynonymType.HETEROTYPIC_SYNONYM_OF()); |
1896 | 1896 |
service.saveOrUpdate(childTaxon2); |
1897 | 1897 |
//missaplied Name for childTaxon2 |
1898 |
BotanicalName missName= TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
1898 |
BotanicalName missName= TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
1899 | 1899 |
missName.setTitleCache("Hieracium lupium DC.", true); |
1900 | 1900 |
missName.setGenusOrUninomial("Hieracium"); |
1901 | 1901 |
missName.setSpecificEpithet("lupium"); |
Also available in: Unified diff
ref #6365 use TaxonNameFactory for botanical names