Replaced Spring Java configs with XML configs.
Change-Id: Ia0d1001b0537f81ef4afb8c51451c7448e477c0e
diff --git a/core/src/test/java/de/ids_mannheim/korap/config/AppTestConfigBase.java b/core/src/test/java/de/ids_mannheim/korap/config/AppTestConfigBase.java
deleted file mode 100644
index 76db69e..0000000
--- a/core/src/test/java/de/ids_mannheim/korap/config/AppTestConfigBase.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package de.ids_mannheim.korap.config;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Properties;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class AppTestConfigBase {
-
- private static String mainConfigurationFile = "kustvakt-test.conf";
-
- @Bean(name = ContextHolder.KUSTVAKT_CONFIG)
- public KustvaktConfiguration getConfig () {
-
- KustvaktConfiguration c = null;
-
- InputStream s = ConfigLoader.loadConfigStream(mainConfigurationFile);
-
- if (s != null){
- Properties p = new Properties();
- try {
- p.load(s);
- c = new KustvaktConfiguration(p);
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- }
- else {
- System.out.println("No properties found!");
- System.exit(-1);
- }
- return c;
- }
-
-}
diff --git a/core/src/test/java/de/ids_mannheim/korap/config/BeanConfigBaseTest.java b/core/src/test/java/de/ids_mannheim/korap/config/BeanConfigBaseTest.java
index 09bcee8..06cefe3 100644
--- a/core/src/test/java/de/ids_mannheim/korap/config/BeanConfigBaseTest.java
+++ b/core/src/test/java/de/ids_mannheim/korap/config/BeanConfigBaseTest.java
@@ -3,13 +3,11 @@
import static org.junit.Assert.assertNotNull;
import org.apache.log4j.Logger;
-import org.junit.Before;
import org.junit.runner.RunWith;
import org.junit.runner.notification.RunNotifier;
import org.junit.runners.model.InitializationError;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -23,14 +21,14 @@
*/
@NotThreadSafe
@RunWith(BeanConfigBaseTest.SpringExtendedSetupListener.class)
-@ContextConfiguration(classes = AppTestConfigBase.class)
+@ContextConfiguration("classpath:test-config.xml")
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
public abstract class BeanConfigBaseTest {
private static Logger jlog = Logger.getLogger(BeanConfigBaseTest.class);
@Autowired
protected ApplicationContext context;
-
+
public void init () throws Exception {
assertNotNull("Application context must not be null!", this.context);
jlog.debug("running one-time before init for class "
@@ -40,27 +38,14 @@
initMethod();
}
+ protected abstract ContextHolder getContext();
- protected abstract ContextHolder getContext ();
-
-
+ public abstract void initMethod () throws KustvaktException;
+
public void close () {
BeansFactory.closeApplication();
}
- public abstract void initMethod () throws KustvaktException;
-
-
-// protected TestHelper helper () {
-// try {
-// return TestHelper.newInstance(this.context);
-// }
-// catch (Exception e) {
-// return null;
-// }
-// }
-
-
public static class SpringExtendedSetupListener extends
SpringJUnit4ClassRunner {
@@ -89,10 +74,9 @@
@Override
public void run (RunNotifier notifier) {
super.run(notifier);
- if (instanceSetupListener != null)
+ if (instanceSetupListener != null){
instanceSetupListener.close();
+ }
}
-
-
}
}
diff --git a/core/src/test/java/de/ids_mannheim/korap/web/service/FastJerseyBaseTest.java b/core/src/test/java/de/ids_mannheim/korap/web/service/FastJerseyBaseTest.java
index 625be6a..345ec96 100644
--- a/core/src/test/java/de/ids_mannheim/korap/web/service/FastJerseyBaseTest.java
+++ b/core/src/test/java/de/ids_mannheim/korap/web/service/FastJerseyBaseTest.java
@@ -1,5 +1,14 @@
package de.ids_mannheim.korap.web.service;
+import java.net.URI;
+
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriBuilder;
+
+import org.junit.After;
+import org.junit.BeforeClass;
+import org.springframework.web.context.ContextLoaderListener;
+
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.WebResource;
import com.sun.jersey.api.core.DefaultResourceConfig;
@@ -9,24 +18,12 @@
import com.sun.jersey.test.framework.LowLevelAppDescriptor;
import com.sun.jersey.test.framework.WebAppDescriptor;
import com.sun.jersey.test.framework.spi.container.TestContainer;
-import com.sun.jersey.test.framework.spi.container.TestContainerException;
import com.sun.jersey.test.framework.spi.container.TestContainerFactory;
import com.sun.jersey.test.framework.spi.container.grizzly.GrizzlyTestContainerFactory;
import com.sun.jersey.test.framework.spi.container.grizzly.web.GrizzlyWebTestContainerFactory;
+
import de.ids_mannheim.korap.config.BeanConfigBaseTest;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.springframework.web.context.ContextLoaderListener;
-
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.UriBuilder;
-import java.io.IOException;
-import java.net.BindException;
-import java.net.URI;
-
/**
* @author hanl
* @date 29/07/2015
@@ -100,7 +97,7 @@
ad = new WebAppDescriptor.Builder(classPackages)
.servletClass(SpringServlet.class)
.contextListenerClass(ContextLoaderListener.class)
- .contextParam("contextConfigLocation", "classpath:test-default-config.xml")
+ .contextParam("contextConfigLocation", "classpath:test-config.xml")
.build();
TestContainerFactory tcf = testContainerFactory;
@@ -119,12 +116,9 @@
}
}
-
-
-
-
@After
public void stopServer () {
+
testContainer.stop();
testContainer = null;
client = null;