Project

General

Profile

« Previous | Next » 

Revision 7316cc00

Added by Andreas Müller over 2 years ago

ref #824 rename Rank.getByNameXXX to getByLatinNameXXX

View differences:

cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/RankTest.java
530 530
		NomenclaturalCode zoo = NomenclaturalCode.ICZN;
531 531
		try {
532 532
			assertEquals(Rank.VARIETY(), Rank.getRankByIdInVoc("var."));
533
			assertEquals(Rank.GENUS(), Rank.getRankByName("genus"));
533
			assertEquals(Rank.GENUS(), Rank.getRankByLatinName("genus"));
534 534

  
535 535
			assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByIdInVoc("sect."));
536 536
			assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByIdInVoc("sect.", false));
......
539 539
			assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByIdInVoc("sect.", bot, false));
540 540
			assertEquals(Rank.SECTION_ZOOLOGY(), Rank.getRankByIdInVoc("sect.", zoo, false));
541 541

  
542
			assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByName("Sectio"));
543
			assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByName("Sectio", false));
544
			assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByName("Sectio", bot));
545
			assertEquals(Rank.SECTION_ZOOLOGY(), Rank.getRankByName("Sectio", zoo));
542
			assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByLatinName("Sectio"));
543
			assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByLatinName("Sectio", false));
544
			assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByLatinName("Sectio", bot));
545
			assertEquals(Rank.SECTION_ZOOLOGY(), Rank.getRankByLatinName("Sectio", zoo));
546 546
			assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByName("Sectio", bot, false));
547 547
			assertEquals(Rank.SECTION_ZOOLOGY(), Rank.getRankByName("Sectio", zoo, false));
548 548

  
549
			assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByNameOrIdInVoc("Subsectio"));
550
			assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByNameOrIdInVoc("subsect."));
551
			assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByNameOrIdInVoc("Subsectio", false));
552
			assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByNameOrIdInVoc("subsect.", false));
553
			assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByNameOrIdInVoc("Subsectio", bot));
554
			assertEquals(Rank.SUBSECTION_ZOOLOGY(), Rank.getRankByNameOrIdInVoc("subsect.", zoo));
555
			assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByNameOrIdInVoc("Subsectio", bot, false));
556
			assertEquals(Rank.SUBSECTION_ZOOLOGY(), Rank.getRankByNameOrIdInVoc("subsect.", zoo, false));
549
			assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByLatinNameOrIdInVoc("Subsectio"));
550
			assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByLatinNameOrIdInVoc("subsect."));
551
			assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByLatinNameOrIdInVoc("Subsectio", false));
552
			assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByLatinNameOrIdInVoc("subsect.", false));
553
			assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByLatinNameOrIdInVoc("Subsectio", bot));
554
			assertEquals(Rank.SUBSECTION_ZOOLOGY(), Rank.getRankByLatinNameOrIdInVoc("subsect.", zoo));
555
			assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByLatinNameOrIdInVoc("Subsectio", bot, false));
556
			assertEquals(Rank.SUBSECTION_ZOOLOGY(), Rank.getRankByLatinNameOrIdInVoc("subsect.", zoo, false));
557 557

  
558 558
		} catch (UnknownCdmTypeException e) {
559 559
			fail();
......
574 574
	@Test
575 575
	public void testGetRankByName() {
576 576
		try {
577
			assertEquals(Rank.SPECIES(), Rank.getRankByName("species"));
577
			assertEquals(Rank.SPECIES(), Rank.getRankByLatinName("species"));
578 578
			// TODO: Cleanup Rank label names and rank to name mapping
579 579
			//assertEquals(Rank.SUBFAMILY(), Rank.getRankByName("subfamily"));
580 580
		} catch (UnknownCdmTypeException e) {

Also available in: Unified diff