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-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonNodeTest.java
77 77 
		viewName1 = "Greuther, 1993";
78 78 
		classification1 = Classification.NewInstance(viewName1);
79 79 
		classification2 = Classification.NewInstance("Test View 2");
80 
		taxonName1 = BotanicalName.NewInstance(Rank.SPECIES());
81 
		taxonName1 = BotanicalName.NewInstance(Rank.SUBSPECIES());
82 
		taxonName3 = BotanicalName.NewInstance(Rank.SPECIES());
80 
		taxonName1 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
81 
		taxonName1 = TaxonNameBase.NewBotanicalInstance(Rank.SUBSPECIES());
82 
		taxonName3 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
83 83 
		ref1 = ReferenceFactory.newJournal();
84 84 
		ref2 = ReferenceFactory.newBook();
85 85 
		ref3 = ReferenceFactory.newGeneric();
......
327 327 
    	 *   `- Pinus pampa subsp. persicifolia
328 328 
    	 */
329 329 
    	Classification classification = Classification.NewInstance("Classification");
330 
    	BotanicalName pinusName = BotanicalName.NewInstance(null);
330 
    	BotanicalName pinusName = TaxonNameBase.NewBotanicalInstance(null);
331 331 
    	pinusName.setGenusOrUninomial("Pinus");
332 332 
    	Taxon pinus = Taxon.NewInstance(pinusName, null);
333 
    	BotanicalName pinusPampaName = BotanicalName.NewInstance(null);
333 
    	BotanicalName pinusPampaName = TaxonNameBase.NewBotanicalInstance(null);
334 334 
    	pinusPampaName.setGenusOrUninomial("Pinus");
335 335 
    	pinusPampaName.setSpecificEpithet("pampa");
336 336 
    	Taxon pinusPampa = Taxon.NewInstance(pinusPampaName, null);
337 
    	BotanicalName pinusPampaSubName = BotanicalName.NewInstance(null);
337 
    	BotanicalName pinusPampaSubName = TaxonNameBase.NewBotanicalInstance(null);
338 338 
    	pinusPampaSubName.setGenusOrUninomial("Pinus");
339 339 
    	pinusPampaSubName.setSpecificEpithet("pampa");
340 340 
    	pinusPampaSubName.setInfraSpecificEpithet("persicifolia");

Also available in: Unified diff