ref #9359 upgrade TaxEditor to log4j2

[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 2989821be9f0936e42c0383106ae668a0eddaf2c..ab1f024c0dabdb19d5cce56fcf99e527887fe492 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
@@ -13,7 +13,7 @@ import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Platform;
 import org.junit.Assert;
@@ -21,46 +21,48 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.osgi.framework.Bundle;
 
-import eu.etaxonomy.taxeditor.remoting.server.CDMServerUtils;
-import eu.etaxonomy.taxeditor.webapp.CDMEmbeddedServerException;
-import eu.etaxonomy.taxeditor.webapp.CDMServer;
-import eu.etaxonomy.taxeditor.webapp.ICDMServerError;
+import eu.etaxonomy.taxeditor.local.CdmServer;
+import eu.etaxonomy.taxeditor.remoting.server.CdmServerUtils;
+import eu.etaxonomy.taxeditor.workbench.datasource.CdmEmbeddedServerException;
+import eu.etaxonomy.taxeditor.workbench.datasource.ICdmServerError;
 
 
 /**
  * @author cmathew
  * @date 6 Oct 2014
- *
  */
 public class CdmServerTest extends TestConfig {
-    private static final Logger logger = Logger.getLogger(CdmServerTest.class);
-
 
+       @SuppressWarnings("unused")
+       private static final Logger logger = LogManager.getLogger(CdmServerTest.class);
 
     @Test
     public void generateConfigFile() throws IOException {
         String mgdServerConfigFileName = "test.mgd.datasources.xml";
-        String config = CDMServerUtils.convertEditorToServerConfig();
-        CDMServerUtils.writeManagedServerConfig(config, mgdServerConfigFileName);
+        String config = CdmServerUtils.convertEditorToServerConfig();
+        CdmServerUtils.writeManagedServerConfig(config, mgdServerConfigFileName);
     }
 
     @Test
     @Ignore
     //FIXME: remove @ignore and fix test #5632
-    public void manageCdmServer() throws IOException, URISyntaxException, CDMEmbeddedServerException {
+    public void manageCdmServer() throws IOException, URISyntaxException, CdmEmbeddedServerException {
         Bundle bundle = Platform.getBundle("eu.etaxonomy.taxeditor.test");
         URL mgdDatasourcesConfigURL = bundle.getEntry("src/test/resources/.cdmLibrary/writableResources/mgd.datasources.xml");
         File mgdDatasourcesConfigFile = new File(FileLocator.resolve(mgdDatasourcesConfigURL).toURI());
-        CDMServer cdmServer = new CDMServer("cdmTest", mgdDatasourcesConfigFile);
-        cdmServer.start(new ICDMServerError() {
-            @Override
-            public void handleError(Throwable t) {
-                Assert.fail("Error starting server. Reason : " + t.getMessage());
-            }
-        });
-        try {
+        try{
+            CdmServer cdmServer = new CdmServer("cdmTest", mgdDatasourcesConfigFile);
+            cdmServer.start(new ICdmServerError() {
+                @Override
+                public void handleError(Throwable t) {
+                    Assert.fail("Error starting server. Reason : " + t.getMessage());
+                }
+            });
             cdmServer.stop();
-        } catch (Exception e) {
+        }catch( CdmEmbeddedServerException cese){
+           cese.printStackTrace();
+           Assert.fail("Error instantiating server. Reason: " + cese.getMessage());
+        }catch (Exception e) {
             e.printStackTrace();
             Assert.fail("Error stopping server. Reason : " + e.getMessage());
         }