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/ClassificationTest.java
98 98 
		treeName1 = "Greuther, 1993";
99 99 
		//refFactory = ReferenceFactory.newInstance();
100 100 
		classification1 = Classification.NewInstance(treeName1);
101 
		taxonName12 = BotanicalName.NewInstance(Rank.SPECIES());
102 
		taxonName121 = BotanicalName.NewInstance(Rank.SUBSPECIES());
103 
		taxonName1 = BotanicalName.NewInstance(Rank.GENUS());
101 
		taxonName12 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
102 
		taxonName121 = TaxonNameBase.NewBotanicalInstance(Rank.SUBSPECIES());
103 
		taxonName1 = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
104 104 
		taxonName2 = TaxonNameBase.NewZoologicalInstance(Rank.GENUS());
105 
		taxonName3 = BotanicalName.NewInstance(Rank.SPECIES());
105 
		taxonName3 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
106 106 
		ref1 = ReferenceFactory.newJournal();
107 107 
		ref2 = ReferenceFactory.newJournal();
108 108 
		ref3 = ReferenceFactory.newJournal();
......
129 129 
	 */
130 130 
	@Test
131 131 
	public void testAddRoot() {
132 
		TaxonNameBase<?,?> synonymName = BotanicalName.NewInstance(Rank.SPECIES());
132 
		TaxonNameBase<?,?> synonymName = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
133 133 
		Synonym synonym = Synonym.NewInstance(synonymName, ref1);
134 134 
		TaxonNode taxonNode1 = classification1.addChildTaxon(taxon1, null, null);
135 135 
		taxonNode1.setSynonymToBeUsed(synonym);
......
230 230 
	@Test
231 231 
	public void testAddParentChild() {
232 232 

  		




  233
  
  
    
		TaxonNameBase<?,?> synonymName = BotanicalName.NewInstance(Rank.SPECIES());


  		




  
  233
  
    
		TaxonNameBase<?,?> synonymName = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());


  		




  234
  234
  
    
		Synonym synonym = Synonym.NewInstance(synonymName, ref1);


  		




  235
  235
  
    
		TaxonNode rootNode = classification1.addChildTaxon(taxon1, null, null);


  		




  236
  236
  
    
		rootNode.setSynonymToBeUsed(synonym);


  		




  ......




  346
  346
  
    
		//genericDao.getCdmBasesByFieldAndClass(clazz, field.getName(), value);


  		




  347
  347
  
    

  		




  348
  348
  
    

  		




  349
  
  
    
		BotanicalName name = BotanicalName.NewInstance(Rank.GENUS());


  		




  
  349
  
    
		BotanicalName name = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());


  		




  350
  350
  
    
		name.setTitleCache("A dummy name", true);


  		




  351
  351
  
    
		result.add(name);


  		




  352
  352
  
    
		Reference ref = ReferenceFactory.newBook();


  		












Also available in:  Unified diff