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