corrected merge to latest snapshot version

[taxeditor.git] / eu.etaxonomy.taxeditor.test / src / test / java / eu / etaxonomy / taxeditor / httpinvoker / CdmServerTest.java

diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CdmServerTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CdmServerTest.java
index 816b18b0560bee3ea86d9161c6178ba077ac6f05..bca8d3530f4e6f16e2eb4e77e6afe482b823b2f5 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CdmServerTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CdmServerTest.java
@@ -9,14 +9,12 @@
 */
 package eu.etaxonomy.taxeditor.httpinvoker;
 
-import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.unitils.UnitilsJUnit4;
 
-import eu.etaxonomy.taxeditor.lazyloading.AbstractLazyInitializerTest;
+import eu.etaxonomy.taxeditor.remoting.server.CDMServerException;
 
 /**
  * @author cmathew
@@ -27,13 +25,17 @@ public class CdmServerTest extends UnitilsJUnit4 {
     private static final Logger logger = Logger.getLogger(CdmServerTest.class);
 
 
+    @Test
+    public void startCdmServer() throws CDMServerException {
+        CDMServer.getInstance().start();
+    }
+
     @Test
     public void stopCdmServer() {
-        Logger.getRootLogger().setLevel(Level.INFO);
-        CDMServer.getInstance().setKeepServerRunning(false);
         try {
             CDMServer.getInstance().stop(true);
         } catch (Exception e) {
+            e.printStackTrace();
             Assert.fail("Server could not be stopped. Reason : " + e.getMessage());
         }
     }