NomenclaturalCode bot = NomenclaturalCode.ICNAFP;\r
NomenclaturalCode zoo = NomenclaturalCode.ICZN;\r
try {\r
- assertEquals(Rank.VARIETY(), Rank.getRankByAbbreviation("var."));\r
+ assertEquals(Rank.VARIETY(), Rank.getRankByIdInVoc("var."));\r
assertEquals(Rank.GENUS(), Rank.getRankByName("genus"));\r
\r
- assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByAbbreviation("sect."));\r
- assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByAbbreviation("sect.", false));\r
- assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByAbbreviation("sect.", bot));\r
- assertEquals(Rank.SECTION_ZOOLOGY(), Rank.getRankByAbbreviation("sect.", zoo));\r
- assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByAbbreviation("sect.", bot, false));\r
- assertEquals(Rank.SECTION_ZOOLOGY(), Rank.getRankByAbbreviation("sect.", zoo, false));\r
+ assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByIdInVoc("sect."));\r
+ assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByIdInVoc("sect.", false));\r
+ assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByIdInVoc("sect.", bot));\r
+ assertEquals(Rank.SECTION_ZOOLOGY(), Rank.getRankByIdInVoc("sect.", zoo));\r
+ assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByIdInVoc("sect.", bot, false));\r
+ assertEquals(Rank.SECTION_ZOOLOGY(), Rank.getRankByIdInVoc("sect.", zoo, false));\r
\r
assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByName("Sectio"));\r
assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByName("Sectio", false));\r
assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByName("Sectio", bot, false));\r
assertEquals(Rank.SECTION_ZOOLOGY(), Rank.getRankByName("Sectio", zoo, false));\r
\r
- assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByNameOrAbbreviation("Subsectio"));\r
- assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByNameOrAbbreviation("subsect."));\r
- assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByNameOrAbbreviation("Subsectio", false));\r
- assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByNameOrAbbreviation("subsect.", false));\r
- assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByNameOrAbbreviation("Subsectio", bot));\r
- assertEquals(Rank.SUBSECTION_ZOOLOGY(), Rank.getRankByNameOrAbbreviation("subsect.", zoo));\r
- assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByNameOrAbbreviation("Subsectio", bot, false));\r
- assertEquals(Rank.SUBSECTION_ZOOLOGY(), Rank.getRankByNameOrAbbreviation("subsect.", zoo, false));\r
+ assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByNameOrIdInVoc("Subsectio"));\r
+ assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByNameOrIdInVoc("subsect."));\r
+ assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByNameOrIdInVoc("Subsectio", false));\r
+ assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByNameOrIdInVoc("subsect.", false));\r
+ assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByNameOrIdInVoc("Subsectio", bot));\r
+ assertEquals(Rank.SUBSECTION_ZOOLOGY(), Rank.getRankByNameOrIdInVoc("subsect.", zoo));\r
+ assertEquals(Rank.SUBSECTION_BOTANY(), Rank.getRankByNameOrIdInVoc("Subsectio", bot, false));\r
+ assertEquals(Rank.SUBSECTION_ZOOLOGY(), Rank.getRankByNameOrIdInVoc("subsect.", zoo, false));\r
\r
} catch (UnknownCdmTypeException e) {\r
fail();\r
@Test\r
public void testGetRankByAbbreviation() {\r
try {\r
- assertEquals(Rank.SPECIES(), Rank.getRankByAbbreviation("sp."));\r
+ assertEquals(Rank.SPECIES(), Rank.getRankByIdInVoc("sp."));\r
} catch (UnknownCdmTypeException e) {\r
fail();\r
}\r