rename getRankByAbbrev methods to getRankByIdInVoc #3479

[cdmlib.git] / cdmlib-model / src / test / java / eu / etaxonomy / cdm / model / name / RankTest.java

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/RankTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/RankTest.java
index 3ab18d677c735d7f2cbfd419e221ad423b1d9e52..a78f8d5d5aec2a479ca90af75665f6796ee88b36 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/RankTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/RankTest.java
@@ -521,15 +521,15 @@ public class RankTest extends EntityTestBase {
                NomenclaturalCode bot = NomenclaturalCode.ICNAFP;\r
                NomenclaturalCode zoo = NomenclaturalCode.ICZN;\r
                try {\r
                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.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
                        \r
                        assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByName("Sectio"));\r
                        assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByName("Sectio", false));\r


@@ -538,14 +538,14 @@ public class RankTest extends EntityTestBase {
                        assertEquals(Rank.SECTION_BOTANY(), Rank.getRankByName("Sectio", bot, false));\r
                        assertEquals(Rank.SECTION_ZOOLOGY(), Rank.getRankByName("Sectio", zoo, false));\r
                        \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
                                                \r
                } catch (UnknownCdmTypeException e) {\r
                        fail();\r


@@ -556,7 +556,7 @@ public class RankTest extends EntityTestBase {
        @Test\r
        public void testGetRankByAbbreviation() {\r
                try {\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
                } catch (UnknownCdmTypeException e) {\r
                        fail();\r
                }\r