minor

[cdmlib.git] / cdmlib-model / src / test / java / eu / etaxonomy / cdm / strategy / cache / name / BotanicNameCacheStrategyTest.java

diff --git a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/BotanicNameCacheStrategyTest.java b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/BotanicNameCacheStrategyTest.java
index 46b5e19b5e6a91bda32b535b1d4eae257ab5bd5a..3fa367680c0a1a7fb7dbd691eb693653c7c642d3 100644 (file)
--- a/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/BotanicNameCacheStrategyTest.java
+++ b/cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/BotanicNameCacheStrategyTest.java
@@ -13,10 +13,8 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;\r
 import static org.junit.Assert.assertNull;\r
 \r
-import java.lang.reflect.InvocationTargetException;\r
 import java.lang.reflect.Method;\r
 import java.util.GregorianCalendar;\r
-import java.util.List;\r
 \r
 import org.apache.log4j.Logger;\r
 import org.junit.Before;\r
@@ -34,13 +32,12 @@ import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.name.Rank;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceFactory;\r
-import eu.etaxonomy.cdm.strategy.cache.TaggedText;\r
 \r
 /**\r
  * @author a.mueller\r
  *\r
  */\r
-public class BotanicNameCacheStrategyTest {\r
+public class BotanicNameCacheStrategyTest extends NameCacheStrategyTestBase{\r
        private static final Logger logger = Logger.getLogger(BotanicNameCacheStrategyTest.class);\r
        \r
        private static final String familyNameString = "Familia";\r
@@ -64,7 +61,7 @@ public class BotanicNameCacheStrategyTest {
        private INomenclaturalAuthor exAuthor;\r
        private INomenclaturalAuthor basAuthor;\r
        private INomenclaturalAuthor exBasAuthor;\r
-       private Reference citationRef;\r
+       private Reference<?> citationRef;\r
        ReferenceFactory refFactory;\r
        \r
        /**\r
@@ -108,7 +105,7 @@ public class BotanicNameCacheStrategyTest {
                citationRef.setVolume("1");\r
                citationRef.setEdition("ed. 8");\r
                GregorianCalendar testDate = new GregorianCalendar();\r
-               testDate.set(1768, 3, 2);\r
+               testDate.set(1968, 3, 2);\r
                \r
                TimePeriod period = TimePeriod.NewInstance(testDate);\r
                \r
@@ -134,7 +131,7 @@ public class BotanicNameCacheStrategyTest {
         */\r
        @Test\r
        public final void testNewInstance() {\r
-               BotanicNameDefaultCacheStrategy cacheStrategy = BotanicNameDefaultCacheStrategy.NewInstance();\r
+               BotanicNameDefaultCacheStrategy<?> cacheStrategy = BotanicNameDefaultCacheStrategy.NewInstance();\r
                assertNotNull(cacheStrategy);\r
        }\r
 \r
@@ -188,7 +185,7 @@ public class BotanicNameCacheStrategyTest {
        public final void testGetFullTitleCache() {\r
                assertNull("Full title cache of null object should return null", strategy.getFullTitleCache(null));\r
                //NOTE: Unclear if the date part should contain the full date or only the year. Undefined Behaviour.\r
-               assertEquals("Abies alba app phrase, Gard. Dict., ed. 8, 1. 2.4.1768, nom. illeg.", strategy.getFullTitleCache(speciesName));\r
+               assertEquals("Abies alba app phrase, Gard. Dict., ed. 8, 1. 2.4.1968, nom. illeg.", strategy.getFullTitleCache(speciesName));\r
                \r
 //             assertNull(subSpeciesNameString, strategy.getFullTitleCache(null));\r
 //             assertEquals("Abies alba app phrase L. Gard. Dict. ed. 8, 1. 1768, nom. illeg.", strategy.getFullTitleCache(speciesName));\r
@@ -276,22 +273,7 @@ public class BotanicNameCacheStrategyTest {
                }\r
                return method;\r
        }\r
-       \r
-       protected String getStringValue(Method method, Object object,Object parameter){\r
-               try {\r
-                       List<TaggedText> list = (List<TaggedText>)method.invoke(object, parameter);\r
-                       return NonViralNameDefaultCacheStrategy.createString(list);\r
-               } catch (IllegalArgumentException e) {\r
-                       logger.error("IllegalArgumentException " + e.getMessage());\r
-                       return null;\r
-               } catch (IllegalAccessException e) {\r
-                       logger.error("IllegalAccessException " + e.getMessage());\r
-                       return null;\r
-               } catch (InvocationTargetException e) {\r
-                       logger.error("InvocationTargetException " + e.getMessage());\r
-                       return null;\r
-               }\r
-       }\r
+\r
 \r
 \r
 }\r