Remove ". " from year only nom-refs
authorAndreas Müller <a.mueller@bgbm.org>
Wed, 9 Jul 2014 22:13:50 +0000 (22:13 +0000)
committerAndreas Müller <a.mueller@bgbm.org>
Wed, 9 Jul 2014 22:13:50 +0000 (22:13 +0000)
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/NomRefDefaultCacheStrategyBase.java
cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/GenericDefaultCacheStrategyTest.java

index 5198f0a82a3071f83070d53e7e17f2680cd131c9..fa1e79908e867b7f143b07dd954b6d091ba7713d 100644 (file)
@@ -129,6 +129,9 @@ public abstract class NomRefDefaultCacheStrategyBase extends StrategyBase implem
                        microReference = getBeforeMicroReference() + microReference;\r
                }\r
                result = result.replaceAll(INomenclaturalReference.MICRO_REFERENCE_TOKEN, microReference);\r
+               if (result.startsWith(". ")){\r
+                       result = result.substring(2);\r
+               }\r
                return result;\r
        }\r
 \r
index 1e386389ef2816de33f23ffba0692decafd892e4..edd6fc19ad6cbc3a924fc6200471623efc34f1de 100644 (file)
@@ -110,6 +110,7 @@ public class GenericDefaultCacheStrategyTest {
                generic1.setAuthorTeam(team1);\r
                generic1.setTitleCache(null);  //reset cache in case aspectJ is not enabled\r
                Assert.assertEquals("Unexpected title cache.", "Authorteam", generic1.getTitleCache());\r
+               Assert.assertEquals("", generic1.getNomenclaturalCitation(null));\r
        }\r
        \r
        @Test\r
@@ -117,7 +118,8 @@ public class GenericDefaultCacheStrategyTest {
                generic1.setAuthorTeam(team1);\r
                generic1.setDatePublished(TimePeriodParser.parseString("1792"));\r
                generic1.setTitleCache(null);  //reset cache in case aspectJ is not enabled\r
-               Assert.assertEquals("Unexpected title cache.", "Authorteam, 1792", generic1.getTitleCache());\r
+               Assert.assertEquals("Unexpected title cache.", "Authorteam, 1792", generic1.getTitleCache());   \r
+               Assert.assertEquals("1792", generic1.getNomenclaturalCitation(null));\r
        }\r
 \r
 \r