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/TaxonNodeTest.java
29 29
import eu.etaxonomy.cdm.model.name.BotanicalName;
30 30
import eu.etaxonomy.cdm.model.name.Rank;
31 31
import eu.etaxonomy.cdm.model.name.TaxonNameBase;
32
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
32 33
//import eu.etaxonomy.cdm.model.reference.Book;
33 34
//import eu.etaxonomy.cdm.model.reference.Journal;
34 35
import eu.etaxonomy.cdm.model.reference.Reference;
......
77 78
		viewName1 = "Greuther, 1993";
78 79
		classification1 = Classification.NewInstance(viewName1);
79 80
		classification2 = Classification.NewInstance("Test View 2");
80
		taxonName1 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
81
		taxonName1 = TaxonNameBase.NewBotanicalInstance(Rank.SUBSPECIES());
82
		taxonName3 = TaxonNameBase.NewBotanicalInstance(Rank.SPECIES());
81
		taxonName1 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
82
		taxonName1 = TaxonNameFactory.NewBotanicalInstance(Rank.SUBSPECIES());
83
		taxonName3 = TaxonNameFactory.NewBotanicalInstance(Rank.SPECIES());
83 84
		ref1 = ReferenceFactory.newJournal();
84 85
		ref2 = ReferenceFactory.newBook();
85 86
		ref3 = ReferenceFactory.newGeneric();
......
315 316
		assertEquals("Number of all nodes should be 2", 2, allNodes.size());
316 317
		assertTrue("Taxonomic view should include child", allNodes.contains(child));
317 318
	}
318
	
319 319

  
320
    
320

  
321

  
321 322
    @Test
322 323
    public void testGetAncestors(){
323 324
    	/*
......
327 328
    	 *   `- Pinus pampa subsp. persicifolia
328 329
    	 */
329 330
    	Classification classification = Classification.NewInstance("Classification");
330
    	BotanicalName pinusName = TaxonNameBase.NewBotanicalInstance(null);
331
    	BotanicalName pinusName = TaxonNameFactory.NewBotanicalInstance(null);
331 332
    	pinusName.setGenusOrUninomial("Pinus");
332 333
    	Taxon pinus = Taxon.NewInstance(pinusName, null);
333
    	BotanicalName pinusPampaName = TaxonNameBase.NewBotanicalInstance(null);
334
    	BotanicalName pinusPampaName = TaxonNameFactory.NewBotanicalInstance(null);
334 335
    	pinusPampaName.setGenusOrUninomial("Pinus");
335 336
    	pinusPampaName.setSpecificEpithet("pampa");
336 337
    	Taxon pinusPampa = Taxon.NewInstance(pinusPampaName, null);
337
    	BotanicalName pinusPampaSubName = TaxonNameBase.NewBotanicalInstance(null);
338
    	BotanicalName pinusPampaSubName = TaxonNameFactory.NewBotanicalInstance(null);
338 339
    	pinusPampaSubName.setGenusOrUninomial("Pinus");
339 340
    	pinusPampaSubName.setSpecificEpithet("pampa");
340 341
    	pinusPampaSubName.setInfraSpecificEpithet("persicifolia");
......
344 345
    	TaxonNode pinusPampaNode = classification.addParentChild(pinus, pinusPampa, null, null);
345 346
    	TaxonNode pinusPampaSubNode = classification.addParentChild(pinusPampa, pinusPampaSub, null, null);
346 347
    	TaxonNode rootNode = classification.getRootNode();
347
    	
348

  
348 349
    	Set<TaxonNode> ancestors = pinusPampaSubNode.getAncestors();
349 350
    	assertEquals(3, ancestors.size());
350 351
    	assertTrue(ancestors.contains(pinusPampaNode));
351 352
    	assertTrue(ancestors.contains(pinusNode));
352 353
    	assertTrue(ancestors.contains(rootNode));
353
    	
354

  
354 355
    	Set<TaxonNode> rootAncestors = rootNode.getAncestors();
355 356
    	assertTrue(rootAncestors.isEmpty());
356
    	
357

  
357 358
    }
358 359

  
359 360
    @Test

Also available in: Unified diff