Project

General

Profile

« Previous | Next » 

Revision fe34a9eb

Added by Andreas Müller about 7 years ago

ref #6365 use TaxonNameFactory for botanical names

View differences:

cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/ClassificationTest.java
99 99
		treeName1 = "Greuther, 1993";
100 100
		//refFactory = ReferenceFactory.newInstance();
101 101
		classification1 = Classification.NewInstance(treeName1);
102
		taxonName12 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
103
		taxonName121 = TaxonNameBase.NewBotanicalInstance(Rank.SUBSPECIES());
104
		taxonName1 = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
102
		taxonName12 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
103
		taxonName121 = TaxonNameFactory.NewBotanicalInstance(Rank.SUBSPECIES());
104
		taxonName1 = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
105 105
		taxonName2 = TaxonNameFactory.NewZoologicalInstance(Rank.GENUS());
106
		taxonName3 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
106
		taxonName3 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
107 107
		ref1 = ReferenceFactory.newJournal();
108 108
		ref2 = ReferenceFactory.newJournal();
109 109
		ref3 = ReferenceFactory.newJournal();
......
130 130
	 */
131 131
	@Test
132 132
	public void testAddRoot() {
133
		TaxonNameBase<?,?> synonymName = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
133
		TaxonNameBase<?,?> synonymName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
134 134
		Synonym synonym = Synonym.NewInstance(synonymName, ref1);
135 135
		TaxonNode taxonNode1 = classification1.addChildTaxon(taxon1, null, null);
136 136
		taxonNode1.setSynonymToBeUsed(synonym);
......
231 231
	@Test
232 232
	public void testAddParentChild() {
233 233

  
234
		TaxonNameBase<?,?> synonymName = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
234
		TaxonNameBase<?,?> synonymName = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
235 235
		Synonym synonym = Synonym.NewInstance(synonymName, ref1);
236 236
		TaxonNode rootNode = classification1.addChildTaxon(taxon1, null, null);
237 237
		rootNode.setSynonymToBeUsed(synonym);
......
347 347
		//genericDao.getCdmBasesByFieldAndClass(clazz, field.getName(), value);
348 348

  
349 349

  
350
		BotanicalName name = TaxonNameBase.NewBotanicalInstance(Rank.GENUS());
350
		BotanicalName name = TaxonNameFactory.NewBotanicalInstance(Rank.GENUS());
351 351
		name.setTitleCache("A dummy name", true);
352 352
		result.add(name);
353 353
		Reference ref = ReferenceFactory.newBook();

Also available in: Unified diff