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/TaxonNodeServiceImplTest.java
33 33
import eu.etaxonomy.cdm.model.common.CdmBase;
34 34
import eu.etaxonomy.cdm.model.description.PolytomousKey;
35 35
import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
36
import eu.etaxonomy.cdm.model.name.BotanicalName;
37 36
import eu.etaxonomy.cdm.model.name.IBotanicalName;
38 37
import eu.etaxonomy.cdm.model.name.NameRelationshipType;
39 38
import eu.etaxonomy.cdm.model.name.Rank;
......
467 466
        assertNotNull(t1);
468 467
        newTaxon = (Taxon)taxonService.load(taxUUID);
469 468
        assertNull(newTaxon);
470
        BotanicalName name = (BotanicalName)nameService.load(nameUUID);
469
        IBotanicalName name = nameService.load(nameUUID);
471 470
        assertNull(name);
472 471

  
473 472

  
......
895 894
        Classification checklist = Classification.NewInstance("Checklist");
896 895
        checklist.setUuid(classificationUuid);
897 896

  
898
        BotanicalName abiesName = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
897
        IBotanicalName abiesName = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
899 898
        abiesName.setGenusOrUninomial("Abies");
900 899
        Taxon abies = Taxon.NewInstance(abiesName, null);
901 900
        abies.setUuid(abiesUuid);
902 901

  
903
        BotanicalName abiesAlbaName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
902
        IBotanicalName abiesAlbaName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
904 903
        abiesAlbaName.setGenusOrUninomial("Abies");
905 904
        abiesAlbaName.setSpecificEpithet("alba");
906 905
        Taxon abiesAlba = Taxon.NewInstance(abiesAlbaName, null);
907 906
        abiesAlba.setUuid(abiesAlbaUuid);
908 907

  
909
        BotanicalName abiesAlbaSubBrotaName = TaxonNameFactory.NewBotanicalInstance(Rank.SUBSPECIES());
908
        IBotanicalName abiesAlbaSubBrotaName = TaxonNameFactory.NewBotanicalInstance(Rank.SUBSPECIES());
910 909
        abiesAlbaSubBrotaName.setGenusOrUninomial("Abies");
911 910
        abiesAlbaSubBrotaName.setSpecificEpithet("alba");
912 911
        abiesAlbaSubBrotaName.setInfraSpecificEpithet("brota");
913 912
        Taxon abiesAlbaSubBrota = Taxon.NewInstance(abiesAlbaSubBrotaName, null);
914 913
        abiesAlbaSubBrota.setUuid(abiesAlbaSubBrotaUuid);
915 914

  
916
        BotanicalName abiesPalmaName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
915
        IBotanicalName abiesPalmaName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
917 916
        abiesPalmaName.setGenusOrUninomial("Abies");
918 917
        abiesPalmaName.setSpecificEpithet("palma");
919 918
        Taxon abiesPalma = Taxon.NewInstance(abiesPalmaName, null);
920 919
        abiesPalma.setUuid(abiesPalmaUuid);
921 920

  
922
        BotanicalName pinusName = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
921
        IBotanicalName pinusName = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
923 922
        pinusName.setGenusOrUninomial("Pinus");
924 923
        Taxon pinus = Taxon.NewInstance(pinusName, null);
925 924
        pinus.setUuid(pinusUuid);

Also available in: Unified diff