Revision fe34a9eb
Added by Andreas Müller about 7 years ago
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTaxaAndNamesTest.java | ||
---|---|---|
42 | 42 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
43 | 43 |
import eu.etaxonomy.cdm.model.name.Rank; |
44 | 44 |
import eu.etaxonomy.cdm.model.name.TaxonNameBase; |
45 |
import eu.etaxonomy.cdm.model.name.TaxonNameFactory; |
|
45 | 46 |
import eu.etaxonomy.cdm.model.reference.Reference; |
46 | 47 |
import eu.etaxonomy.cdm.model.reference.ReferenceFactory; |
47 | 48 |
import eu.etaxonomy.cdm.model.taxon.Classification; |
... | ... | |
689 | 690 |
referenceService.save(sec); |
690 | 691 |
referenceService.save(sec_sensu); |
691 | 692 |
|
692 |
BotanicalName n_abies = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
|
|
693 |
BotanicalName n_abies = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
|
|
693 | 694 |
n_abies.setNameCache("Abies", true); |
694 | 695 |
Taxon t_abies = Taxon.NewInstance(n_abies, sec); |
695 | 696 |
taxonService.save(t_abies); |
696 | 697 |
|
697 |
BotanicalName n_abies_alba = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
698 |
BotanicalName n_abies_alba = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
698 | 699 |
n_abies_alba.setNameCache("Abies alba", true); |
699 | 700 |
Taxon t_abies_alba = Taxon.NewInstance(n_abies_alba, sec); |
700 | 701 |
t_abies_alba.setUuid(UUID.fromString(ABIES_ALBA_UUID)); |
701 | 702 |
taxonService.save(t_abies_alba); |
702 | 703 |
|
703 |
BotanicalName n_abies_subalpina = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
704 |
BotanicalName n_abies_subalpina = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
704 | 705 |
n_abies_subalpina.setNameCache("Abies subalpina", true); |
705 | 706 |
Synonym s_abies_subalpina = Synonym.NewInstance(n_abies_subalpina, sec); |
706 | 707 |
taxonService.save(s_abies_subalpina); |
707 | 708 |
|
708 |
BotanicalName n_abies_balsamea = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
709 |
BotanicalName n_abies_balsamea = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
709 | 710 |
n_abies_balsamea.setNameCache("Abies balsamea", true); |
710 | 711 |
Taxon t_abies_balsamea = Taxon.NewInstance(n_abies_balsamea, sec); |
711 | 712 |
t_abies_balsamea.setUuid(UUID.fromString(ABIES_BALSAMEA_UUID)); |
712 | 713 |
t_abies_balsamea.addSynonym(s_abies_subalpina, SynonymType.SYNONYM_OF()); |
713 | 714 |
taxonService.save(t_abies_balsamea); |
714 | 715 |
|
715 |
BotanicalName n_abies_grandis = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
716 |
BotanicalName n_abies_grandis = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
716 | 717 |
n_abies_grandis.setNameCache("Abies grandis", true); |
717 | 718 |
Taxon t_abies_grandis = Taxon.NewInstance(n_abies_grandis, sec); |
718 | 719 |
taxonService.save(t_abies_grandis); |
719 | 720 |
|
720 |
BotanicalName n_abies_kawakamii = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
721 |
BotanicalName n_abies_kawakamii = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
721 | 722 |
n_abies_kawakamii.setNameCache("Abies kawakamii", true); |
722 | 723 |
Taxon t_abies_kawakamii = Taxon.NewInstance(n_abies_kawakamii, sec); |
723 | 724 |
t_abies_kawakamii.getTitleCache(); |
... | ... | |
732 | 733 |
t_abies_kawakamii_sensu_komarov.addTaxonRelation(t_abies_balsamea, TaxonRelationshipType.MISAPPLIED_NAME_FOR(), null, null); |
733 | 734 |
taxonService.saveOrUpdate(t_abies_kawakamii_sensu_komarov); |
734 | 735 |
|
735 |
BotanicalName n_abies_lasiocarpa = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
736 |
BotanicalName n_abies_lasiocarpa = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
736 | 737 |
n_abies_lasiocarpa.setNameCache("Abies lasiocarpa", true); |
737 | 738 |
Taxon t_abies_lasiocarpa = Taxon.NewInstance(n_abies_lasiocarpa, sec); |
738 | 739 |
taxonService.save(t_abies_lasiocarpa); |
... | ... | |
746 | 747 |
// |
747 | 748 |
// 2 Names without taxa |
748 | 749 |
// |
749 |
BotanicalName n_abies_borisiiregis = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
750 |
BotanicalName n_abies_borisiiregis = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
750 | 751 |
n_abies_borisiiregis.setNameCache("Abies borisii-regis", true); |
751 | 752 |
nameService.save(n_abies_borisiiregis); |
752 | 753 |
|
753 |
BotanicalName n_abies_lasio = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
754 |
BotanicalName n_abies_lasio = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
754 | 755 |
n_abies_lasio.setNameCache("Abies lasio", true); |
755 | 756 |
nameService.save(n_abies_lasio); |
756 | 757 |
|
757 | 758 |
// A hybrid name not from Abies |
758 |
BotanicalName n_abies_millefolium_x_Achillea_nobilis = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
|
|
759 |
BotanicalName n_abies_millefolium_x_Achillea_nobilis = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
|
|
759 | 760 |
n_abies_millefolium_x_Achillea_nobilis.setNameCache("Achillea millefolium × Achillea nobilis", true); |
760 | 761 |
Taxon t_abies_millefolium_x_Achillea_nobilis = Taxon.NewInstance(n_abies_millefolium_x_Achillea_nobilis, sec); |
761 | 762 |
taxonService.save(t_abies_millefolium_x_Achillea_nobilis); |
Also available in: Unified diff
ref #6365 use TaxonNameFactory for botanical names