resolving conficts in project versions after hotfixrelease

[cdmlib.git] / cdmlib-persistence / src / test / java / eu / etaxonomy / cdm / persistence / dao / MethodCacheImplTest.java

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/MethodCacheImplTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/MethodCacheImplTest.java
index 3d5d58f93a2024711d7af52d3c126d253b79d343..840aa13854b9216b28229fad3b2f820181a70d6a 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/MethodCacheImplTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/MethodCacheImplTest.java
@@ -1,9 +1,9 @@
 
 package eu.etaxonomy.cdm.persistence.dao;
 
-import java.lang.reflect.Method;
+import static org.junit.Assert.*;
 
-import junitx.framework.Assert;
+import java.lang.reflect.Method;
 
 import org.apache.log4j.Logger;
 import org.junit.Before;
@@ -15,36 +15,36 @@ import eu.etaxonomy.cdm.model.reference.ReferenceFactory;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 
 public class MethodCacheImplTest {
-       private static final Logger logger = Logger
-                       .getLogger(MethodCacheImplTest.class);
-       private Taxon taxon;
-       private BotanicalName botanicalName;
-
-       IMethodCache methodCache;
-       private Reference nomenclaturalReference;
-       
-       @Before
-       public void setUp() throws Exception {
-               methodCache = new MethodCacheImpl();
-               taxon = Taxon.NewInstance(null, null);
-               botanicalName = BotanicalName.NewInstance(null);
-               nomenclaturalReference = ReferenceFactory.newInstance().newBook();
-       }
-
-       /**
-        * Test for a method that is not declared by the class, but by the superclass
-        * also the parameter of the matching method is more generic than the given parameter
-        */
-       @Test
-       public void testGetMethod() {
-               Method method = methodCache.getMethod(taxon.getClass(), "setName", botanicalName.getClass());
-               Assert.assertNotNull("Method should exist", method);
-       }
-       
-       @Test
-       public void testGetMethodWhereMethodParameterIsInterface(){
-               Method method = methodCache.getMethod(botanicalName.getClass(), "setNomenclaturalReference", nomenclaturalReference.getClass());
-               Assert.assertNotNull("Method should exist", method);
-       }
-       
+    @SuppressWarnings("unused")
+       private static final Logger logger = Logger.getLogger(MethodCacheImplTest.class);
+    private Taxon taxon;
+    private BotanicalName botanicalName;
+
+    IMethodCache methodCache;
+    private Reference<?> nomenclaturalReference;
+
+    @Before
+    public void setUp() throws Exception {
+        methodCache = new MethodCacheImpl();
+        taxon = Taxon.NewInstance(null, null);
+        botanicalName = BotanicalName.NewInstance(null);
+        nomenclaturalReference = ReferenceFactory.newBook();
+    }
+
+    /**
+     * Test for a method that is not declared by the class, but by the superclass
+     * also the parameter of the matching method is more generic than the given parameter
+     */
+    @Test
+    public void testGetMethod() {
+        Method method = methodCache.getMethod(taxon.getClass(), "setName", botanicalName.getClass());
+        assertNotNull("Method should exist", method);
+    }
+
+    @Test
+    public void testGetMethodWhereMethodParameterIsInterface(){
+        Method method = methodCache.getMethod(botanicalName.getClass(), "setNomenclaturalReference", nomenclaturalReference.getClass());
+        assertNotNull("Method should exist", method);
+    }
+
 }