Project

General

Profile

« Previous | Next » 

Revision 892efc69

Added by Andreas Kohlbecker almost 14 years ago

merging /branches/cdmlib/SPRINT-Chichorieae1/ to trunk

View differences:

cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/init/TermLoaderTest.java
22 22

  
23 23
import eu.etaxonomy.cdm.model.common.DefinedTermBase;
24 24
import eu.etaxonomy.cdm.model.common.TermVocabulary;
25
import eu.etaxonomy.cdm.model.common.VocabularyEnum;
25 26
import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;
26 27
import eu.etaxonomy.cdm.model.name.Rank;
27 28

  
......
56 57
	 */
57 58
	@Test
58 59
	public void testLoadRanks() {
59
        TermVocabulary<Rank> defaultRanks = termLoader.loadTerms(Rank.class, terms);
60
		
61
        TermVocabulary<Rank> defaultRanks = termLoader.loadTerms(VocabularyEnum.Rank, terms);
60 62
		assertNotNull(defaultRanks.findTermByUuid(uuidGenus));
61 63
		assertTrue(terms.containsKey(uuidGenus));
62 64
	}
63 65

  
64 66
	@Test
65 67
	public void testLoadNameTypeDesignationStatus() {
66
        TermVocabulary<NameTypeDesignationStatus> defaultStatus = termLoader.loadTerms(NameTypeDesignationStatus.class, terms);
68
        TermVocabulary<NameTypeDesignationStatus> defaultStatus = termLoader.loadTerms(VocabularyEnum.NameTypeDesignationStatus, terms);
67 69
		assertNotNull(defaultStatus.findTermByUuid(uuidTautonymy));
68 70
		assertTrue(terms.containsKey(uuidTautonymy));
69 71
	}

Also available in: Unified diff