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/TaxonServiceSearchTaxaAndNamesTest.java
38 38
import eu.etaxonomy.cdm.model.description.TextData;
39 39
import eu.etaxonomy.cdm.model.location.Country;
40 40
import eu.etaxonomy.cdm.model.location.NamedArea;
41
import eu.etaxonomy.cdm.model.name.BotanicalName;
42
import eu.etaxonomy.cdm.model.name.INonViralName;
43
import eu.etaxonomy.cdm.model.name.NonViralName;
41
import eu.etaxonomy.cdm.model.name.IBotanicalName;
44 42
import eu.etaxonomy.cdm.model.name.Rank;
45 43
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
46 44
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
......
655 653
        if (logger.isDebugEnabled()) {
656 654
            for (int i = 0; i < list.size(); i++) {
657 655
                String nameCache = "";
658
                if (list.get(i) instanceof NonViralName) {
659
                    nameCache = ((INonViralName) list.get(i)).getNameCache();
656
                if (list.get(i) instanceof TaxonNameBase) {
657
                    nameCache = ((TaxonNameBase)list.get(i)).getNameCache();
660 658
                } else if (list.get(i) instanceof TaxonBase) {
661 659
                    TaxonNameBase<?,?> taxonNameBase = ((TaxonBase) list.get(i)).getName();
662 660
                    nameCache = taxonNameBase.getNameCache();
......
691 689
        referenceService.save(sec);
692 690
        referenceService.save(sec_sensu);
693 691

  
694
        BotanicalName n_abies = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
692
        IBotanicalName n_abies = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
695 693
        n_abies.setNameCache("Abies", true);
696 694
        Taxon t_abies = Taxon.NewInstance(n_abies, sec);
697 695
        taxonService.save(t_abies);
698 696

  
699
        BotanicalName n_abies_alba = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
697
        IBotanicalName n_abies_alba = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
700 698
        n_abies_alba.setNameCache("Abies alba", true);
701 699
        Taxon t_abies_alba = Taxon.NewInstance(n_abies_alba, sec);
702 700
        t_abies_alba.setUuid(UUID.fromString(ABIES_ALBA_UUID));
703 701
        taxonService.save(t_abies_alba);
704 702

  
705
        BotanicalName n_abies_subalpina = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
703
        IBotanicalName n_abies_subalpina = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
706 704
        n_abies_subalpina.setNameCache("Abies subalpina", true);
707 705
        Synonym s_abies_subalpina = Synonym.NewInstance(n_abies_subalpina, sec);
708 706
        taxonService.save(s_abies_subalpina);
709 707

  
710
        BotanicalName n_abies_balsamea = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
708
        IBotanicalName n_abies_balsamea = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
711 709
        n_abies_balsamea.setNameCache("Abies balsamea", true);
712 710
        Taxon t_abies_balsamea = Taxon.NewInstance(n_abies_balsamea, sec);
713 711
        t_abies_balsamea.setUuid(UUID.fromString(ABIES_BALSAMEA_UUID));
714 712
        t_abies_balsamea.addSynonym(s_abies_subalpina, SynonymType.SYNONYM_OF());
715 713
        taxonService.save(t_abies_balsamea);
716 714

  
717
        BotanicalName n_abies_grandis = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
715
        IBotanicalName n_abies_grandis = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
718 716
        n_abies_grandis.setNameCache("Abies grandis", true);
719 717
        Taxon t_abies_grandis = Taxon.NewInstance(n_abies_grandis, sec);
720 718
        taxonService.save(t_abies_grandis);
721 719

  
722
        BotanicalName n_abies_kawakamii = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
720
        IBotanicalName n_abies_kawakamii = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
723 721
        n_abies_kawakamii.setNameCache("Abies kawakamii", true);
724 722
        Taxon t_abies_kawakamii = Taxon.NewInstance(n_abies_kawakamii, sec);
725 723
        t_abies_kawakamii.getTitleCache();
......
734 732
        t_abies_kawakamii_sensu_komarov.addTaxonRelation(t_abies_balsamea, TaxonRelationshipType.MISAPPLIED_NAME_FOR(), null, null);
735 733
        taxonService.saveOrUpdate(t_abies_kawakamii_sensu_komarov);
736 734

  
737
        BotanicalName n_abies_lasiocarpa = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
735
        IBotanicalName n_abies_lasiocarpa = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
738 736
        n_abies_lasiocarpa.setNameCache("Abies lasiocarpa", true);
739 737
        Taxon t_abies_lasiocarpa = Taxon.NewInstance(n_abies_lasiocarpa, sec);
740 738
        taxonService.save(t_abies_lasiocarpa);
......
748 746
        //
749 747
        // 2 Names without taxa
750 748
        //
751
        BotanicalName n_abies_borisiiregis = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
749
        TaxonNameBase n_abies_borisiiregis = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
752 750
        n_abies_borisiiregis.setNameCache("Abies borisii-regis", true);
753 751
        nameService.save(n_abies_borisiiregis);
754 752

  
755
        BotanicalName n_abies_lasio = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
753
        TaxonNameBase n_abies_lasio = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
756 754
        n_abies_lasio.setNameCache("Abies lasio", true);
757 755
        nameService.save(n_abies_lasio);
758 756

  
759 757
        // A hybrid name not from Abies
760
        BotanicalName n_abies_millefolium_x_Achillea_nobilis = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
758
        IBotanicalName n_abies_millefolium_x_Achillea_nobilis = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
761 759
        n_abies_millefolium_x_Achillea_nobilis.setNameCache("Achillea millefolium × Achillea nobilis", true);
762 760
        Taxon t_abies_millefolium_x_Achillea_nobilis = Taxon.NewInstance(n_abies_millefolium_x_Achillea_nobilis, sec);
763 761
        taxonService.save(t_abies_millefolium_x_Achillea_nobilis);

Also available in: Unified diff