commit 9e53bb200544137de60bc578ddd13b7a9a9ef767
author margaretha <margaretha@ids-mannheim.de> Fri Sep 14 19:39:15 2018 +0200
committer margaretha <margaretha@ids-mannheim.de> Fri Sep 14 19:39:15 2018 +0200
tree 4916037d499811a99c9d24b04ae0bdc1b805f83f
parent 563aabe34e3ec4fd2a753d4c05dc2f7d0e9f97a3

Fixed SpringJerseyTest, handled VCRef with username, enabled
VCReferenceTest in test suite.

Change-Id: I1e500b85c010496cae5ed809c4cfa6d7e665cb6a

full/src/test/java/de/ids_mannheim/korap/config/NamedVCLoaderTest.java

diff --git a/full/src/test/java/de/ids_mannheim/korap/config/NamedVCLoaderTest.java b/full/src/test/java/de/ids_mannheim/korap/config/NamedVCLoaderTest.java
index b5b218a..3fef08f 100644
--- a/full/src/test/java/de/ids_mannheim/korap/config/NamedVCLoaderTest.java
+++ b/full/src/test/java/de/ids_mannheim/korap/config/NamedVCLoaderTest.java
@@ -10,26 +10,36 @@
 
 import de.ids_mannheim.korap.KrillCollection;
 import de.ids_mannheim.korap.collection.CachedVCData;
+import de.ids_mannheim.korap.dao.VirtualCorpusDao;
+import de.ids_mannheim.korap.entity.VirtualCorpus;
 import de.ids_mannheim.korap.exceptions.KustvaktException;
 import de.ids_mannheim.korap.util.QueryException;
+import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Element;
 
-public class NamedVCLoaderTest extends SpringJerseyTest{
+public class NamedVCLoaderTest extends SpringJerseyTest {
 
     @Autowired
     private NamedVCLoader vcLoader;
-    
-    
+    @Autowired
+    private VirtualCorpusDao dao;
+
     @Test
-    public void testNamedVCLoader () throws IOException, QueryException, KustvaktException {
+    public void testNamedVCLoader ()
+            throws IOException, QueryException, KustvaktException {
+        KrillCollection.cache = CacheManager.newInstance().getCache("named_vc");
         Element element = KrillCollection.cache.get("named-vc1");
-        assertTrue(element==null);
-        
-        vcLoader.loadVCToCache();
+        assertTrue(element == null);
+
+        vcLoader.loadVCToCache("named-vc1", "/vc/named-vc1.jsonld");
 
         element = KrillCollection.cache.get("named-vc1");
         assertNotNull(element);
         CachedVCData cachedData = (CachedVCData) element.getObjectValue();
         assertTrue(cachedData.getDocIdMap().size() > 0);
+        
+        KrillCollection.cache.removeAll();
+        VirtualCorpus vc = dao.retrieveVCByName("named-vc1", "system");
+        dao.deleteVirtualCorpus(vc);
     }
 }

full/src/test/java/de/ids_mannheim/korap/config/SpringJerseyTest.java

diff --git a/full/src/test/java/de/ids_mannheim/korap/config/SpringJerseyTest.java b/full/src/test/java/de/ids_mannheim/korap/config/SpringJerseyTest.java
index 36902b4..959dce2 100644
--- a/full/src/test/java/de/ids_mannheim/korap/config/SpringJerseyTest.java
+++ b/full/src/test/java/de/ids_mannheim/korap/config/SpringJerseyTest.java
@@ -5,14 +5,11 @@
 import java.util.concurrent.ThreadLocalRandom;
 
 import org.junit.runner.RunWith;
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.web.context.support.AbstractRefreshableWebApplicationContext;
+import org.springframework.web.context.support.GenericWebApplicationContext;
 
 import com.sun.jersey.spi.spring.container.servlet.SpringServlet;
 import com.sun.jersey.test.framework.AppDescriptor;
@@ -27,7 +24,7 @@
 public abstract class SpringJerseyTest extends JerseyTest {
 
     public final static String API_VERSION = "v1.0";
-    
+
     @Autowired
     protected GenericApplicationContext applicationContext;
 
@@ -36,7 +33,6 @@
                     "de.ids_mannheim.korap.web.filter",
                     "de.ids_mannheim.korap.web.utils" };
 
-
     @Override
     protected TestContainerFactory getTestContainerFactory ()
             throws TestContainerException {
@@ -46,27 +42,13 @@
     @Override
     public void setUp () throws Exception {
 
-        StaticContextLoaderListener.applicationContext =
-                new AbstractRefreshableWebApplicationContext() {
+        GenericWebApplicationContext genericContext =
+                new GenericWebApplicationContext();
 
-                    ConfigurableListableBeanFactory existingBeanFactory =
-                            applicationContext.getBeanFactory();
+        genericContext.setParent(this.applicationContext);
+        genericContext.setClassLoader(this.applicationContext.getClassLoader());
 
-                    @Override
-                    protected void loadBeanDefinitions (
-                            DefaultListableBeanFactory beanFactory)
-                            throws BeansException, IOException {
-
-                        String[] beanDefinitionNames =
-                                existingBeanFactory.getBeanDefinitionNames();
-                        for (String beanName : beanDefinitionNames) {
-                            beanFactory.registerBeanDefinition(beanName,
-                                    existingBeanFactory
-                                            .getBeanDefinition(beanName));
-                        }
-                    }
-                };
-
+        StaticContextLoaderListener.applicationContext = genericContext;
         super.setUp();
     }
 
@@ -80,7 +62,7 @@
                 // "classpath:test-config.xml")
                 .build();
     }
-    
+
     @Override
     protected int getPort (int defaultPort) {
         int port = ThreadLocalRandom.current().nextInt(5000, 8000 + 1);