fix parser bugs, due to cache strategy changes

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplTest.java
index 60f2f69e4e5f93dd05c05d876939ff50b711da3a..02c06a023ee15a012f5b5060981a4cc35accb7ba 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplTest.java
@@ -867,7 +867,7 @@ public class NonViralNameParserImplTest {
                assertEquals(null, ((IBook)(nameNoVolume.getNomenclaturalReference())).getEdition());\r
 \r
                //no volume, edition\r
-               strNoVolume = "Abies alba Mill., Sp. Pl. ed. 3: 455. 1987";\r
+               strNoVolume = "Abies alba Mill., Sp. Pl., ed. 3: 455. 1987";\r
                nameNoVolume = parser.parseReferencedName(strNoVolume, null, Rank.SPECIES());\r
                assertFalse(nameNoVolume.hasProblem());\r
                assertEquals(strNoVolume, nameNoVolume.getFullTitleCache());\r
@@ -878,7 +878,7 @@ public class NonViralNameParserImplTest {
                strNoVolume = "Abies alba Mill., Sp. Pl. ed. 3, 4(5): 455. 1987";\r
                nameNoVolume = parser.parseReferencedName(strNoVolume, null, Rank.SPECIES());\r
                assertFalse(nameNoVolume.hasProblem());\r
-               assertEquals(strNoVolume, nameNoVolume.getFullTitleCache());\r
+               assertEquals(strNoVolume.replace(" ed.", ", ed."), nameNoVolume.getFullTitleCache());\r
                assertEquals("4(5)", ((IVolumeReference)(nameNoVolume.getNomenclaturalReference())).getVolume());\r
                assertEquals("3", ((IBook)(nameNoVolume.getNomenclaturalReference())).getEdition());\r
                \r
@@ -964,7 +964,7 @@ public class NonViralNameParserImplTest {
                NonViralName<?> nameBookSection2 = \r
                        parser.parseReferencedName(strBookSection2, null, null);\r
                assertFalse(nameBookSection2.hasProblem());\r
-               assertEquals(strBookSection2NoComma, nameBookSection2.getFullTitleCache());\r
+               assertEquals(strBookSection2NoComma.replace(" ed.", ", ed."), nameBookSection2.getFullTitleCache());\r
                assertEquals(-1, nameBookSection2.getProblemStarts()); \r
                assertEquals(-1, nameBookSection2.getProblemEnds());\r
                assertNull((nameBookSection2.getNomenclaturalReference()).getDatePublished().getStart());\r
@@ -975,7 +975,7 @@ public class NonViralNameParserImplTest {
                NonViralName<?> nameBookSection = \r
                        parser.parseReferencedName(strBookSection, null, null);\r
                assertFalse(nameBookSection.hasProblem());\r
-               assertEquals(strBookSection, nameBookSection.getFullTitleCache());\r
+               assertEquals(strBookSection.replace(" ed.", ", ed."), nameBookSection.getFullTitleCache());\r
                assertEquals(-1, nameBookSection.getProblemStarts()); \r
                assertEquals(-1, nameBookSection.getProblemEnds());\r
                assertNull(((IBookSection)nameBookSection.getNomenclaturalReference()).getInBook().getDatePublished().getStart());\r