Project

General

Profile

« Previous | Next » 

Revision e6d7b501

Added by Andreas Müller almost 7 years ago

ref #6368 remove TaxonNameBase subclasses

View differences:

cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.java
49 49
import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
50 50
import eu.etaxonomy.cdm.model.description.TaxonDescription;
51 51
import eu.etaxonomy.cdm.model.description.TextData;
52
import eu.etaxonomy.cdm.model.name.BotanicalName;
53 52
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
53
import eu.etaxonomy.cdm.model.name.IBotanicalName;
54 54
import eu.etaxonomy.cdm.model.name.INonViralName;
55 55
import eu.etaxonomy.cdm.model.name.NameRelationship;
56 56
import eu.etaxonomy.cdm.model.name.NameRelationshipType;
......
1198 1198
            descrUUID = descr.getUuid();
1199 1199
            descrElementUUID = descr.getElements().iterator().next().getUuid();
1200 1200
        }
1201
        BotanicalName taxonName = (BotanicalName) nameService.find(SPECIES1_NAME_UUID);
1201
        IBotanicalName taxonName = nameService.find(SPECIES1_NAME_UUID);
1202 1202
        assertNotNull(taxonName);
1203 1203

  
1204 1204
        TaxonDeletionConfigurator config = new TaxonDeletionConfigurator();
......
1214 1214
        }
1215 1215
        commitAndStartNewTransaction(null);
1216 1216

  
1217
        taxonName = (BotanicalName) nameService.find(SPECIES1_NAME_UUID);
1217
        taxonName = nameService.find(SPECIES1_NAME_UUID);
1218 1218
        Taxon taxon = (Taxon)service.find(SPECIES1_UUID);
1219 1219

  
1220 1220
        //descriptionService.find(descrUUID);
......
1305 1305
        Taxon speciesTaxon2 = (Taxon)service.find(SPECIES2_UUID);
1306 1306
        speciesTaxon.addTaxonRelation(speciesTaxon2, TaxonRelationshipType.MISAPPLIED_NAME_FOR(), null, null);
1307 1307

  
1308
        BotanicalName taxonName = (BotanicalName) nameService.find(SPECIES1_NAME_UUID);
1308
        IBotanicalName taxonName = nameService.find(SPECIES1_NAME_UUID);
1309 1309
        assertNotNull(taxonName);
1310 1310

  
1311 1311
        TaxonDeletionConfigurator config = new TaxonDeletionConfigurator();
......
1321 1321
        }
1322 1322
        commitAndStartNewTransaction(null);
1323 1323

  
1324
        taxonName = (BotanicalName) nameService.find(SPECIES1_NAME_UUID);
1324
        taxonName = nameService.find(SPECIES1_NAME_UUID);
1325 1325
        Taxon taxon = (Taxon)service.find(SPECIES1_UUID);
1326 1326

  
1327 1327

  
......
1405 1405

  
1406 1406
        Taxon speciesTaxon = (Taxon)service.find(SPECIES1_UUID);
1407 1407

  
1408
        BotanicalName taxonName = (BotanicalName) nameService.find(SPECIES1_NAME_UUID);
1408
        IBotanicalName taxonName = nameService.find(SPECIES1_NAME_UUID);
1409 1409
        assertNotNull(taxonName);
1410
        BotanicalName fromName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1410
        TaxonNameBase fromName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1411 1411
        taxonName.addRelationshipFromName(fromName, NameRelationshipType.VALIDATED_BY_NAME(), null);
1412 1412

  
1413 1413
        TaxonDeletionConfigurator config = new TaxonDeletionConfigurator();
......
1418 1418
        }
1419 1419
        commitAndStartNewTransaction(null);
1420 1420

  
1421
        taxonName = (BotanicalName) nameService.find(SPECIES1_NAME_UUID);
1421
        taxonName = nameService.find(SPECIES1_NAME_UUID);
1422 1422
        Taxon taxon = (Taxon)service.find(SPECIES1_UUID);
1423 1423
        //because of the namerelationship the name cannot be deleted
1424 1424
        assertNotNull(taxonName);
......
1707 1707
        Taxon tax = (Taxon)service.find(uuid);
1708 1708
        assertNotNull(tax);
1709 1709
        tax = (Taxon)service.find(misappliedNameUUID);
1710
        BotanicalName name = (BotanicalName) nameService.find(misNameUUID);
1710
        IBotanicalName name = nameService.find(misNameUUID);
1711 1711

  
1712 1712
        assertNull(tax);
1713 1713
        assertNull(name);
......
1916 1916
            citationRef.setTitleCache("Sp. lunarum", true);
1917 1917

  
1918 1918
            //genus taxon with Name, combinationAuthor,
1919
            BotanicalName botName = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
1919
            IBotanicalName botName = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
1920 1920
            botName.setTitleCache("Hieracium L.", true);
1921 1921
            botName.setGenusOrUninomial("Hieracium");
1922 1922
            botName.setCombinationAuthorship(Person.NewInstance());
......
1926 1926
            genusTaxon.setUuid(GENUS_UUID);
1927 1927
            service.save(genusTaxon);
1928 1928
            //a name that is the basionym of genusTaxon's name
1929
            BotanicalName basionym = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
1929
            TaxonNameBase basionym = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
1930 1930
            basionym.setTitleCache("Hieracilla DC.", true);
1931 1931
            basionym.setGenusOrUninomial("Hieracilla");
1932 1932
            basionym.setCombinationAuthorship(deCandolle);
......
1934 1934
            botName.addBasionym(basionym, null, null,"216");
1935 1935
            nameService.saveOrUpdate(basionym);
1936 1936
            //species taxon that is the child of genus taxon
1937
            BotanicalName botSpecies = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1937
            IBotanicalName botSpecies = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1938 1938
            botSpecies.setTitleCache("Hieracium asturianum Pau", true);
1939 1939
            botSpecies.setGenusOrUninomial("Hieracium");
1940 1940
            botSpecies.setSpecificEpithet("asturianum");
......
1952 1952
//            childTaxon.setTaxonomicParent(genusTaxon, citationRef, "456");
1953 1953
            classificationService.save(classification);
1954 1954
            //homotypic synonym of childTaxon1
1955
            BotanicalName botSpecies4= TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1955
            IBotanicalName botSpecies4= TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1956 1956
            botSpecies4.setTitleCache("Hieracium gueri DC.", true);
1957 1957
            botSpecies4.setGenusOrUninomial("Hieracium");
1958 1958
            botSpecies4.setSpecificEpithet("gueri");
......
1963 1963
            service.saveOrUpdate(childTaxon);
1964 1964

  
1965 1965
            //2nd child species taxon that is the child of genus taxon
1966
            BotanicalName botSpecies2= TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1966
            IBotanicalName botSpecies2= TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1967 1967
            botSpecies2.setTitleCache("Hieracium wolffii Zahn", true);
1968 1968
            botSpecies2.setGenusOrUninomial("Hieracium");
1969 1969
            botSpecies2.setSpecificEpithet("wolffii");
......
1976 1976
            //childTaxon2.setTaxonomicParent(genusTaxon, citationRef, "499");
1977 1977
            service.saveOrUpdate(childTaxon2);
1978 1978
            //heterotypic synonym of childTaxon2
1979
            BotanicalName botSpecies3= TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1979
            IBotanicalName botSpecies3= TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1980 1980
            botSpecies3.setTitleCache("Hieracium lupium DC.", true);
1981 1981
            botSpecies3.setGenusOrUninomial("Hieracium");
1982 1982
            botSpecies3.setSpecificEpithet("lupium");
......
1986 1986
            childTaxon2.addSynonym(heteroSynonym, SynonymType.HETEROTYPIC_SYNONYM_OF());
1987 1987
            service.saveOrUpdate(childTaxon2);
1988 1988
            //missaplied Name for childTaxon2
1989
            BotanicalName missName= TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1989
            IBotanicalName missName= TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
1990 1990
            missName.setTitleCache("Hieracium lupium DC.", true);
1991 1991
            missName.setGenusOrUninomial("Hieracium");
1992 1992
            missName.setSpecificEpithet("lupium");
......
2026 2026
        public Classification getTestClassification(String name){
2027 2027
            return Classification.NewInstance(name);
2028 2028
        }
2029

  
2030

  
2031

  
2032

  
2033 2029
}
2034

  
2035

  
2036

  

Also available in: Unified diff