Fix test environment for webapp test

diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java
index 177638db1f8460cd725afb73bb7b8b2279196145..99396b4c8e7b00373e85c0baafdf1d18bb9442f0 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/BaseRemotingTest.java
@@ -14,7 +14,6 @@ import java.util.Map;
 import net.sf.ehcache.CacheManager;
 
 import org.apache.log4j.Logger;
 import net.sf.ehcache.CacheManager;
 
 import org.apache.log4j.Logger;

-import org.junit.Assert;

 import org.junit.BeforeClass;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.junit.BeforeClass;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;


@@ -34,7 +33,6 @@ import eu.etaxonomy.taxeditor.remoting.cache.CdmRemoteCacheManager;
 import eu.etaxonomy.taxeditor.remoting.cache.CdmTransientEntityCacher;
 import eu.etaxonomy.taxeditor.remoting.source.CdmPersistentRemoteSource;
 import eu.etaxonomy.taxeditor.remoting.source.CdmRemoteSource;
 import eu.etaxonomy.taxeditor.remoting.cache.CdmTransientEntityCacher;
 import eu.etaxonomy.taxeditor.remoting.source.CdmPersistentRemoteSource;
 import eu.etaxonomy.taxeditor.remoting.source.CdmRemoteSource;

-import eu.etaxonomy.taxeditor.remoting.source.CdmRemoteSourceException;

 import eu.etaxonomy.taxeditor.remoting.source.ICdmRemoteSource;
 import eu.etaxonomy.taxeditor.session.CdmEntitySession;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;
 import eu.etaxonomy.taxeditor.remoting.source.ICdmRemoteSource;
 import eu.etaxonomy.taxeditor.session.CdmEntitySession;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;


@@ -101,11 +99,7 @@ public abstract class BaseRemotingTest extends ThreadedTest {
                         null);
         CdmApplicationState.setCurrentAppConfig(remoteApplicationController);
         CdmApplicationState.setCdmServiceCacher(new CdmServiceCacher());
                         null);
         CdmApplicationState.setCurrentAppConfig(remoteApplicationController);
         CdmApplicationState.setCdmServiceCacher(new CdmServiceCacher());

-        try {
-            remotePersistentSource = CdmPersistentRemoteSource.NewInstance(sourceName);
-        } catch (CdmRemoteSourceException e) {
-            Assert.fail("Default Remote Persistent Source failed to load. Reason : " + e.getMessage());
-        }
+

         cdmEntitySessionManager = getRemoteApplicationController().getCdmEntitySessionManager();
 
         CdmApplicationState.setCurrentDataChangeService(new CdmDataChangeService());
         cdmEntitySessionManager = getRemoteApplicationController().getCdmEntitySessionManager();
 
         CdmApplicationState.setCurrentDataChangeService(new CdmDataChangeService());

diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/TestConfig.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/TestConfig.java
index 4e28075861c2a453704d1496d89ffa4fbe218d0f..4f6598de4a08577868424439d03ea7c59cba76d2 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/TestConfig.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/TestConfig.java
@@ -27,7 +27,7 @@ import org.unitils.UnitilsJUnit4;
  * @date 11 Nov 2015
  *
  */
  * @date 11 Nov 2015
  *
  */

-public class TestConfig extends UnitilsJUnit4 {
+public abstract class TestConfig extends UnitilsJUnit4 {

 
     private static final Logger logger = Logger.getLogger(TestConfig.class);
 
 
     private static final Logger logger = Logger.getLogger(TestConfig.class);
 

diff --git a/eu.etaxonomy.taxeditor.test/src/test/resources/.cdmLibrary/writableResources/cdm.datasources.xml b/eu.etaxonomy.taxeditor.test/src/test/resources/.cdmLibrary/writableResources/cdm.datasources.xml
index a7dbcd7734d9d9cbb1011a07c80f9457ea02dc0a..be23b82da42abfc1cf3c2279d62414a6d83604ce 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/resources/.cdmLibrary/writableResources/cdm.datasources.xml
+++ b/eu.etaxonomy.taxeditor.test/src/test/resources/.cdmLibrary/writableResources/cdm.datasources.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>

-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation="http://www.springframework.org/schema/beans      http://www.springframework.org/schema/beans/spring-beans-2.5.xsd     http://www.springframework.org/schema/context     http://www.springframework.org/schema/context/spring-context-2.5.xsd">ls 
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation="http://www.springframework.org/schema/beans      http://www.springframework.org/schema/beans/spring-beans-2.5.xsd     http://www.springframework.org/schema/context     http://www.springframework.org/schema/context/spring-context-2.5.xsd">
+  ls

   <bean id="cdmTestDataSource" class="eu.etaxonomy.cdm.database.LocalH2" lazy-init="true">
     <property name="driverClassName" value="org.h2.Driver" />
     <property name="url" value="jdbc:h2:file:./target/classes/h2/cdmTest;AUTO_SERVER=TRUE" />
   <bean id="cdmTestDataSource" class="eu.etaxonomy.cdm.database.LocalH2" lazy-init="true">
     <property name="driverClassName" value="org.h2.Driver" />
     <property name="url" value="jdbc:h2:file:./target/classes/h2/cdmTest;AUTO_SERVER=TRUE" />

diff --git a/eu.etaxonomy.taxeditor.webapp/lib/cdmlib-remote-webapp.war b/eu.etaxonomy.taxeditor.webapp/lib/cdmlib-remote-webapp.war
deleted file mode 100644 (file)
index 2e93af3..0000000
Binary files a/eu.etaxonomy.taxeditor.webapp/lib/cdmlib-remote-webapp.war and /dev/null differ