Project

General

Profile

« Previous | Next » 

Revision da39aca0

Added by Andreas Müller about 7 years ago

ref #6365 merge static methods from BotanicaName to TaxonNameBase

View differences:

cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.java
167 167
        TaxonBase<?> actualTaxon = service.find(uuid);
168 168
        assertEquals(expectedTaxon, actualTaxon);
169 169

  
170
        actualTaxon.setName(BotanicalName.NewInstance(Rank.SPECIES()));
170
        actualTaxon.setName(TaxonNameBase.NewBotanicalInstance(Rank.SPECIES()));
171 171
        try{
172 172
            service.saveOrUpdate(actualTaxon);
173 173
        }catch(Exception e){
......
179 179
     */
180 180
    @Test
181 181
    public final void testRemoveTaxon() {
182
        Taxon taxon = Taxon.NewInstance(BotanicalName.NewInstance(Rank.UNKNOWN_RANK()), null);
182
        Taxon taxon = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.UNKNOWN_RANK()), null);
183 183
        UUID uuid = service.save(taxon).getUuid();
184 184
       // try {
185 185
			service.deleteTaxon(taxon.getUuid(), null, null);
......
522 522
        Rank rank = Rank.SPECIES();
523 523
        Reference ref1 = ReferenceFactory.newGeneric();
524 524
        //HomotypicalGroup group = HomotypicalGroup.NewInstance();
525
        Taxon taxon1 = Taxon.NewInstance(BotanicalName.NewInstance(rank, "Test3", null, null, null, null, null, null, null), null);
526
        Synonym synonym0 = Synonym.NewInstance(BotanicalName.NewInstance(rank, "Test2", null, null, null, null, null, null, null), null);
527
        Synonym synonym1 = Synonym.NewInstance(BotanicalName.NewInstance(rank, "Test2", null, null, null, null, null, null, null), null);
528
        Synonym synonym2 = Synonym.NewInstance(BotanicalName.NewInstance(rank, "Test4", null, null, null, null, null, null, null), null);
525
        Taxon taxon1 = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test3", null, null, null, null, null, null, null), null);
526
        Synonym synonym0 = Synonym.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test2", null, null, null, null, null, null, null), null);
527
        Synonym synonym1 = Synonym.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test2", null, null, null, null, null, null, null), null);
528
        Synonym synonym2 = Synonym.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test4", null, null, null, null, null, null, null), null);
529 529
        synonym0.getName().setHomotypicalGroup(taxon1.getHomotypicGroup());
530 530
        synonym2.getName().setHomotypicalGroup(synonym1.getHomotypicGroup());
531 531
        //tax2.addHeterotypicSynonymName(synonym.getName());
......
556 556
        Rank rank = Rank.SPECIES();
557 557
        Reference ref1 = ReferenceFactory.newGeneric();
558 558
        //HomotypicalGroup group = HomotypicalGroup.NewInstance();
559
        Taxon taxon1 = Taxon.NewInstance(BotanicalName.NewInstance(rank, "Test3", null, null, null, null, null, null, null), null);
560
        Synonym synonym0 = Synonym.NewInstance(BotanicalName.NewInstance(rank, "Test2", null, null, null, null, null, null, null), null);
561
        Synonym synonym1 = Synonym.NewInstance(BotanicalName.NewInstance(rank, "Test2", null, null, null, null, null, null, null), null);
562
        Synonym synonym2 = Synonym.NewInstance(BotanicalName.NewInstance(rank, "Test4", null, null, null, null, null, null, null), null);
559
        Taxon taxon1 = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test3", null, null, null, null, null, null, null), null);
560
        Synonym synonym0 = Synonym.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test2", null, null, null, null, null, null, null), null);
561
        Synonym synonym1 = Synonym.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test2", null, null, null, null, null, null, null), null);
562
        Synonym synonym2 = Synonym.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test4", null, null, null, null, null, null, null), null);
563 563
        synonym0.getName().setHomotypicalGroup(taxon1.getHomotypicGroup());
564 564
        synonym2.getName().setHomotypicalGroup(synonym1.getHomotypicGroup());
565 565
        //tax2.addHeterotypicSynonymName(synonym.getName());
......
1189 1189
        assertNotNull(taxonName);
1190 1190
        assertNull(taxon);
1191 1191
        config.setDeleteNameIfPossible(true);
1192
        Taxon newTaxon = Taxon.NewInstance(BotanicalName.NewInstance(Rank.SPECIES()), null);
1192
        Taxon newTaxon = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.SPECIES()), null);
1193 1193
        service.save(newTaxon);
1194 1194
        result = service.deleteTaxon(newTaxon.getUuid()
1195 1195
        		, config, null);
......
1251 1251

  
1252 1252

  
1253 1253
        config.setDeleteNameIfPossible(true);
1254
        Taxon newTaxon = Taxon.NewInstance(BotanicalName.NewInstance(Rank.SPECIES()), null);
1254
        Taxon newTaxon = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.SPECIES()), null);
1255 1255
        service.save(newTaxon);
1256 1256
        result = service.deleteTaxon(newTaxon.getUuid()
1257 1257
                , config, null);
......
1315 1315

  
1316 1316
        BotanicalName taxonName = (BotanicalName) nameService.find(SPECIES1_NAME_UUID);
1317 1317
        assertNotNull(taxonName);
1318
        BotanicalName fromName = BotanicalName.NewInstance(Rank.SPECIES());
1318
        BotanicalName fromName = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
1319 1319
        taxonName.addRelationshipFromName(fromName, NameRelationshipType.VALIDATED_BY_NAME(), null);
1320 1320

  
1321 1321
        TaxonDeletionConfigurator config = new TaxonDeletionConfigurator();
......
1416 1416
        Taxon testTaxon = getTestTaxon();
1417 1417
        UUID uuid = service.save(testTaxon).getUuid();
1418 1418

  
1419
        Taxon topMost = Taxon.NewInstance(BotanicalName.NewInstance(Rank.FAMILY()), null);
1419
        Taxon topMost = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.FAMILY()), null);
1420 1420

  
1421 1421
        Iterator<TaxonNode> nodes = testTaxon.getTaxonNodes().iterator();
1422 1422
        TaxonNode node =nodes.next();
......
1454 1454
        Taxon testTaxon = getTestTaxon();
1455 1455
        UUID uuid = service.save(testTaxon).getUuid();
1456 1456

  
1457
        Taxon topMost = Taxon.NewInstance(BotanicalName.NewInstance(Rank.FAMILY()), null);
1457
        Taxon topMost = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.FAMILY()), null);
1458 1458

  
1459 1459
        Iterator<TaxonNode> nodes = testTaxon.getTaxonNodes().iterator();
1460 1460
        TaxonNode node =nodes.next();
......
1494 1494
        Taxon testTaxon = getTestTaxon();
1495 1495
        UUID uuid = service.save(testTaxon).getUuid();
1496 1496

  
1497
        Taxon topMost = Taxon.NewInstance(BotanicalName.NewInstance(Rank.FAMILY()), null);
1497
        Taxon topMost = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.FAMILY()), null);
1498 1498

  
1499 1499
        Iterator<TaxonNode> nodes = testTaxon.getTaxonNodes().iterator();
1500 1500
        TaxonNode node =nodes.next();
......
1533 1533
        Taxon testTaxon = getTestTaxon();
1534 1534
        UUID uuid = service.save(testTaxon).getUuid();
1535 1535

  
1536
        Taxon misappliedName = Taxon.NewInstance(BotanicalName.NewInstance(Rank.GENUS()), null);
1536
        Taxon misappliedName = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.GENUS()), null);
1537 1537

  
1538 1538
        Iterator<TaxonNode> nodes = testTaxon.getTaxonNodes().iterator();
1539 1539
        TaxonNode node =nodes.next();
......
1562 1562
        Taxon testTaxon = getTestTaxon();
1563 1563
        UUID uuid = service.save(testTaxon).getUuid();
1564 1564

  
1565
        Taxon misappliedName = Taxon.NewInstance(BotanicalName.NewInstance(Rank.GENUS()), null);
1565
        Taxon misappliedName = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.GENUS()), null);
1566 1566

  
1567 1567
        Iterator<TaxonNode> nodes = testTaxon.getTaxonNodes().iterator();
1568 1568
        TaxonNode node =nodes.next();
......
1592 1592
        Taxon testTaxon = getTestTaxon();
1593 1593
        UUID uuid = service.save(testTaxon).getUuid();
1594 1594

  
1595
        Taxon misappliedNameTaxon = Taxon.NewInstance(BotanicalName.NewInstance(Rank.GENUS()), null);
1595
        Taxon misappliedNameTaxon = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(Rank.GENUS()), null);
1596 1596

  
1597 1597
        Iterator<TaxonNode> nodes = testTaxon.getTaxonNodes().iterator();
1598 1598
        TaxonNode node =nodes.next();
......
1787 1787
    public void createTestDataSet() throws FileNotFoundException {
1788 1788
    	Rank rank = Rank.SPECIES();
1789 1789

  
1790
        taxWithoutSyn = Taxon.NewInstance(BotanicalName.NewInstance(rank, "Test1", null, null, null, null, null, null, null), null);
1791
        taxWithSyn = Taxon.NewInstance(BotanicalName.NewInstance(rank, "Test3", null, null, null, null, null, null, null), null);
1792
        tax2WithSyn = Taxon.NewInstance(BotanicalName.NewInstance(rank, "Test5", null, null, null, null, null, null, null), null);
1793
        synonym = Synonym.NewInstance(BotanicalName.NewInstance(rank, "Test2", null, null, null, null, null, null, null), null);
1794
        synonym2 = Synonym.NewInstance(BotanicalName.NewInstance(rank, "Test4", null, null, null, null, null, null, null), null);
1790
        taxWithoutSyn = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test1", null, null, null, null, null, null, null), null);
1791
        taxWithSyn = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test3", null, null, null, null, null, null, null), null);
1792
        tax2WithSyn = Taxon.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test5", null, null, null, null, null, null, null), null);
1793
        synonym = Synonym.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test2", null, null, null, null, null, null, null), null);
1794
        synonym2 = Synonym.NewInstance(TaxonNameBase.NewBotanicalInstance(rank, "Test4", null, null, null, null, null, null, null), null);
1795 1795
        synonym2.getName().setHomotypicalGroup(synonym.getHomotypicGroup());
1796 1796

  
1797 1797
        taxWithSyn.addSynonym(synonym, SynonymType.HETEROTYPIC_SYNONYM_OF());
......
1824 1824
            citationRef.setTitleCache("Sp. lunarum", true);
1825 1825

  
1826 1826
            //genus taxon with Name, combinationAuthor,
1827
            BotanicalName botName = BotanicalName.NewInstance(Rank.GENUS());
1827
            BotanicalName botName = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
1828 1828
            botName.setTitleCache("Hieracium L.", true);
1829 1829
            botName.setGenusOrUninomial("Hieracium");
1830 1830
            botName.setCombinationAuthorship(Person.NewInstance());
......
1834 1834
            genusTaxon.setUuid(GENUS_UUID);
1835 1835
            service.save(genusTaxon);
1836 1836
            //a name that is the basionym of genusTaxon's name
1837
            BotanicalName basionym = BotanicalName.NewInstance(Rank.GENUS());
1837
            BotanicalName basionym = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
1838 1838
            basionym.setTitleCache("Hieracilla DC.", true);
1839 1839
            basionym.setGenusOrUninomial("Hieracilla");
1840 1840
            basionym.setCombinationAuthorship(deCandolle);
......
1842 1842
            botName.addBasionym(basionym, null, null,"216");
1843 1843
            nameService.saveOrUpdate(basionym);
1844 1844
            //species taxon that is the child of genus taxon
1845
            BotanicalName botSpecies = BotanicalName.NewInstance(Rank.SPECIES());
1845
            BotanicalName botSpecies = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
1846 1846
            botSpecies.setTitleCache("Hieracium asturianum Pau", true);
1847 1847
            botSpecies.setGenusOrUninomial("Hieracium");
1848 1848
            botSpecies.setSpecificEpithet("asturianum");
......
1860 1860
//            childTaxon.setTaxonomicParent(genusTaxon, citationRef, "456");
1861 1861
            classificationService.save(classification);
1862 1862
            //homotypic synonym of childTaxon1
1863
            BotanicalName botSpecies4= BotanicalName.NewInstance(Rank.SPECIES());
1863
            BotanicalName botSpecies4= TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
1864 1864
            botSpecies4.setTitleCache("Hieracium gueri DC.", true);
1865 1865
            botSpecies4.setGenusOrUninomial("Hieracium");
1866 1866
            botSpecies4.setSpecificEpithet("gueri");
......
1871 1871
            service.saveOrUpdate(childTaxon);
1872 1872

  
1873 1873
            //2nd child species taxon that is the child of genus taxon
1874
            BotanicalName botSpecies2= BotanicalName.NewInstance(Rank.SPECIES());
1874
            BotanicalName botSpecies2= TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
1875 1875
            botSpecies2.setTitleCache("Hieracium wolffii Zahn", true);
1876 1876
            botSpecies2.setGenusOrUninomial("Hieracium");
1877 1877
            botSpecies2.setSpecificEpithet("wolffii");
......
1884 1884
            //childTaxon2.setTaxonomicParent(genusTaxon, citationRef, "499");
1885 1885
            service.saveOrUpdate(childTaxon2);
1886 1886
            //heterotypic synonym of childTaxon2
1887
            BotanicalName botSpecies3= BotanicalName.NewInstance(Rank.SPECIES());
1887
            BotanicalName botSpecies3= TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
1888 1888
            botSpecies3.setTitleCache("Hieracium lupium DC.", true);
1889 1889
            botSpecies3.setGenusOrUninomial("Hieracium");
1890 1890
            botSpecies3.setSpecificEpithet("lupium");
......
1894 1894
            childTaxon2.addSynonym(heteroSynonym, SynonymType.HETEROTYPIC_SYNONYM_OF());
1895 1895
            service.saveOrUpdate(childTaxon2);
1896 1896
            //missaplied Name for childTaxon2
1897
            BotanicalName missName= BotanicalName.NewInstance(Rank.SPECIES());
1897
            BotanicalName missName= TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
1898 1898
            missName.setTitleCache("Hieracium lupium DC.", true);
1899 1899
            missName.setGenusOrUninomial("Hieracium");
1900 1900
            missName.setSpecificEpithet("lupium");

Also available in: Unified diff