From: Cherian Mathew <c.mathew@bgbm.org>
Date: Mon, 24 Aug 2015 15:17:55 +0000 (+0200)
Subject: Correct properties file load and server info test
X-Git-Tag: remoting-3.9.0~57
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/da3cc7e3af700d060825f4beaf3a18365a570b9b

Correct properties file load and server info 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 b8559b1eb..18d151ac0 100644
--- 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
@@ -111,7 +111,8 @@ public abstract class BaseRemotingTest extends UnitilsJUnit4 {
             logger.info("Setting user.home to " + userHomeDirPath);
             System.setProperty(userHomeKey, userHomeDirPath);
 
-            cdmServer = new CDMServer("cdmTest");
+
+            cdmServer = new CDMServer("cdmTest", serverPropertiesURL);
 
 
             if(prop.getProperty("user") != null) {
diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CDMServer.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CDMServer.java
index be4bd1e82..2453912f4 100644
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CDMServer.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CDMServer.java
@@ -33,8 +33,6 @@ import javax.sql.DataSource;
 
 import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.Bundle;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.unitils.database.annotations.TestDataSource;
@@ -92,21 +90,17 @@ public class CDMServer {
     private File dataSourcesFile;
     private final String dataSourceName;
 
-    public CDMServer(String dataSourceName) throws CDMServerException {
+    public CDMServer(String dataSourceName, URL serverPropertiesURL) throws CDMServerException {
         this.dataSourceName = dataSourceName;
         Properties prop = new Properties();
 
-        Bundle bundle = Platform.getBundle("eu.etaxonomy.taxeditor.cdmlib");
-        URL serverPropertiesURL = bundle.getEntry("src/test/resources/server.properties");
-
         try {
             File serverPropertiesFile = new File(FileLocator.resolve(serverPropertiesURL).toURI());
             InputStream inputStream = new FileInputStream(serverPropertiesFile);
 
-            if (inputStream != null) {
-                prop.load(inputStream);
-                inputStream.close();
-            }
+            prop.load(inputStream);
+            inputStream.close();
+
         } catch (FileNotFoundException e) {
             throw new CDMServerException(e);
         } catch (URISyntaxException e) {
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 ca7e11c8a..ae8b755de 100644
--- 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,9 +9,13 @@
 */
 package eu.etaxonomy.taxeditor.httpinvoker;
 
+import java.net.URL;
+
 import org.apache.log4j.Logger;
+import org.eclipse.core.runtime.Platform;
 import org.junit.Assert;
 import org.junit.Test;
+import org.osgi.framework.Bundle;
 import org.unitils.UnitilsJUnit4;
 
 import eu.etaxonomy.taxeditor.remoting.server.CDMServerException;
@@ -27,7 +31,9 @@ public class CdmServerTest extends UnitilsJUnit4 {
 
     @Test
     public void startCdmServer() throws CDMServerException {
-        CDMServer cdmServer = new CDMServer("cdmTest");
+        Bundle bundle = Platform.getBundle("eu.etaxonomy.taxeditor.test");
+        URL serverPropertiesURL = bundle.getEntry("src/test/resources/server.properties");
+        CDMServer cdmServer = new CDMServer("cdmTest", serverPropertiesURL);
         cdmServer .start();
         try {
             cdmServer.stop(true);
diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/dialogs/CdmServerInfoTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/dialogs/CdmServerInfoTest.java
index 273e492e1..3cc887d97 100644
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/dialogs/CdmServerInfoTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/dialogs/CdmServerInfoTest.java
@@ -12,7 +12,6 @@ package eu.etaxonomy.taxeditor.ui.dialogs;
 import java.util.List;
 
 import org.junit.Assert;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.unitils.UnitilsJUnit4;
 
@@ -36,12 +35,10 @@ public class CdmServerInfoTest extends UnitilsJUnit4 {
         }
     }
 
-    // FIXME:Remoting this is an integration test and should be run against a
-    //  cdmserver
-    @Ignore
+
     @Test
     public void pingInstancesTest() {
-        CdmServerInfo csii = new CdmServerInfo("localhost", "localhost", 8080);
+        CdmServerInfo csii = new CdmServerInfo("edit-test", "test.e-taxonomy.eu", 8080);
         try {
             csii.refreshInstances();
             List<CdmInstanceInfo> instances = csii.getInstances();
@@ -67,7 +64,7 @@ public class CdmServerInfoTest extends UnitilsJUnit4 {
 
     @Test
     public void refreshInstancesTest() throws CDMServerException {
-        CdmServerInfo cdmServerInfo = new CdmServerInfo(CdmServerInfo.NAME_LOCALHOST_MGD, CdmServerInfo.SERVER_LOCALHOST,8080);
+        CdmServerInfo cdmServerInfo = new CdmServerInfo("edit-test", "test.e-taxonomy.eu", 8080);
         cdmServerInfo.refreshInstances();
         List<CdmInstanceInfo> instances = cdmServerInfo.getInstances();
         Assert.assertTrue(instances != null && !instances.isEmpty());