diff --git a/js-test/build/build.xml b/js-test/build/build.xml
index 2feefd59ce2804c3d4bdaebf326dfd5d2c611f72..fd6c937a2db348261d39695b02eac28964a7f6ed 100644
--- a/js-test/build/build.xml
+++ b/js-test/build/build.xml
@@ -2,8 +2,6 @@
<import file="../../build_resources/ant/build-common.xml" />
<project-classpath name="ecp" classes="${classes}" />
- <project-classpath name="eclipse.cp" classes="${targets}/classes" />
- <project-classpath name="ecp.gwt" classes="${targets}/www/WEB-INF/classes" />
<!--
Parameters:
@@ -34,7 +32,9 @@
<target name="create-webapp" depends="prepare-gwt, compile-javascript">
<delete includeemptydirs="yes" removeNotFollowedSymlinks="true" failonerror="true">
- <fileset dir="servers/${js-test.suite.name}/openBIS-server/targets" followsymlinks="no" erroronmissingdir="false" />
+ <fileset dir="servers/${js-test.suite.name}/openBIS-server/targets"
+ followsymlinks="no"
+ erroronmissingdir="false" />
</delete>
<mkdir dir="servers/${js-test.suite.name}/openBIS-server/targets/www/${js-test.webapp.name}/WEB-INF" />
@@ -56,7 +56,7 @@
* js-test.suite.name
* js-test.suite.class
-->
- <target name="run-webapp">
+ <target name="run-webapp" depends="_plain-compile-sources">
<java classname="${js-test.suite.class}"
dir="servers/${js-test.suite.name}/openBIS-server"
fork="true">
@@ -69,12 +69,11 @@
<jvmarg value="-Dch.systemsx.cisd.openbis.test.TestDatabase.clean=true" />
<classpath>
<pathelement path="servers/${js-test.suite.name}/openBIS-server/etc" />
- <!--<pathelement path="${eclipse.cp}" />-->
<pathelement path="${ecp}" />
</classpath>
</java>
</target>
-
+
<target name="create-webapp-common">
<antcall target="create-webapp">
<param name="js-test.project.name" value="screening" />
@@ -82,7 +81,7 @@
<param name="js-test.suite.name" value="common" />
</antcall>
</target>
-
+
<target name="create-webapp-dsu">
<antcall target="create-webapp">
<param name="js-test.project.name" value="openbis" />
@@ -90,7 +89,7 @@
<param name="js-test.suite.name" value="dsu" />
</antcall>
</target>
-
+
<target name="create-webapp-novartis">
<antcall target="create-webapp">
<param name="js-test.project.name" value="openbis" />
@@ -98,7 +97,7 @@
<param name="js-test.suite.name" value="novartis" />
</antcall>
</target>
-
+
<target name="create-webapp-basynthec">
<antcall target="create-webapp">
<param name="js-test.project.name" value="openbis" />
@@ -106,7 +105,7 @@
<param name="js-test.suite.name" value="basynthec" />
</antcall>
</target>
-
+
<target name="create-webapp-yeastlab">
<antcall target="create-webapp">
<param name="js-test.project.name" value="openbis" />
@@ -114,43 +113,48 @@
<param name="js-test.suite.name" value="yeastlab" />
</antcall>
</target>
-
+
<target name="run-webapp-common">
<antcall target="run-webapp">
<param name="js-test.suite.name" value="common" />
- <param name="js-test.suite.class" value="ch.systemsx.cisd.openbis.jstest.suite.common.JsTestCommon" />
- </antcall>
+ <param name="js-test.suite.class"
+ value="ch.systemsx.cisd.openbis.jstest.suite.common.JsTestCommon" />
+ </antcall>
</target>
<target name="run-webapp-dsu">
<antcall target="run-webapp">
<param name="js-test.suite.name" value="dsu" />
- <param name="js-test.suite.class" value="ch.systemsx.cisd.openbis.jstest.suite.dsu.JsTestDsu" />
+ <param name="js-test.suite.class"
+ value="ch.systemsx.cisd.openbis.jstest.suite.dsu.JsTestDsu" />
</antcall>
</target>
-
+
<target name="run-webapp-novartis">
<antcall target="run-webapp">
<param name="js-test.suite.name" value="novartis" />
- <param name="js-test.suite.class" value="ch.systemsx.cisd.openbis.jstest.suite.novartis.JsTestNovartis" />
+ <param name="js-test.suite.class"
+ value="ch.systemsx.cisd.openbis.jstest.suite.novartis.JsTestNovartis" />
</antcall>
</target>
-
+
<target name="run-webapp-basynthec">
<antcall target="run-webapp">
<param name="js-test.suite.name" value="basynthec" />
- <param name="js-test.suite.class" value="ch.systemsx.cisd.openbis.jstest.suite.basynthec.JsTestBasynthec" />
+ <param name="js-test.suite.class"
+ value="ch.systemsx.cisd.openbis.jstest.suite.basynthec.JsTestBasynthec" />
</antcall>
</target>
-
+
<target name="run-webapp-yeastlab">
<antcall target="run-webapp">
<param name="js-test.suite.name" value="yeastlab" />
- <param name="js-test.suite.class" value="ch.systemsx.cisd.openbis.jstest.suite.yeastlab.JsTestYeastlab" />
+ <param name="js-test.suite.class"
+ value="ch.systemsx.cisd.openbis.jstest.suite.yeastlab.JsTestYeastlab" />
</antcall>
</target>
-
- <target name="run-automated-tests-on-new-server" depends="compile-tests">
+
+ <target name="run-automated-tests-on-new-server" depends="_plain-compile-sources">
<delete dir="${output.test}" />
<testng workingDir="servers/common/openBIS-server"
outputdir="${output.test}"
@@ -165,7 +169,6 @@
<jvmarg value="-Dui-test.start-page=http://localhost:20000/openbis" />
<classpath>
<pathelement path="servers/common/openBIS-server/etc" />
- <!--<pathelement path="${eclipse.cp}" />-->
<pathelement path="${ecp}" />
</classpath>
</testng>
@@ -180,8 +183,8 @@
<fail if="${tests.failed}" />
</target>
-
- <target name="run-automated-tests-on-existing-server" depends="compile-tests">
+
+ <target name="run-automated-tests-on-existing-server" depends="_plain-compile-sources">
<delete dir="${output.test}" />
<testng workingDir="servers/common/openBIS-server"
outputdir="${output.test}"
@@ -195,7 +198,6 @@
<jvmarg value="-Dui-test.dss-url2=http://localhost:20002" />
<jvmarg value="-Dui-test.start-page=http://localhost:20000/openbis" />
<classpath>
- <!--<pathelement path="${eclipse.cp}" />-->
<pathelement path="${ecp}" />
</classpath>
</testng>
diff --git a/js-test/source/java/ch/systemsx/cisd/openbis/jstest/server/JsTestDataStoreServer.java b/js-test/source/java/ch/systemsx/cisd/openbis/jstest/server/JsTestDataStoreServer.java
index c6f7124f016b26ad668b7366176e3c0990f6b176..e2c424108d86ed7be245462a0de9974eea878b99 100644
--- a/js-test/source/java/ch/systemsx/cisd/openbis/jstest/server/JsTestDataStoreServer.java
+++ b/js-test/source/java/ch/systemsx/cisd/openbis/jstest/server/JsTestDataStoreServer.java
@@ -26,18 +26,6 @@ public abstract class JsTestDataStoreServer extends TestDataStoreServer
@Override
protected String getCommand()
- {
- return getLinuxCommand();
- /*
- * return "java -ea -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=" +
- * getDebugPort() +
- * " -Dpython.path=../../../../libraries/jython/jython-lib -Dfile.encoding=UTF-8 -classpath ./etc:../../../../screening/targets/www/WEB-INF/classes:../../../../rtd_phosphonetx/targets/www/WEB-INF/classes:../../../../datastore_server/targets/classes:../../../../common/targets/classes:../../../../libraries/log4j/log4j.jar:../../../../libraries/testng/testng-jdk15.jar:../../../../libraries/commons-lang/commons-lang.jar:../../../../libraries/commons-io/commons-io.jar:../../../../libraries/mail/mail.jar:../../../../libraries/jmock/jmock.jar:../../../../libraries/activation/activation.jar:../../../../libraries/commons-codec/commons-codec.jar:../../../../libraries/restrictionchecker/restrictions.jar:../../../../libraries/cglib/cglib-nodep.jar:../../../../libraries/jmock/hamcrest/hamcrest-core.jar:../../../../libraries/jmock/objenesis/objenesis-1.0.jar:../../../../libraries/jmock/hamcrest/hamcrest-library.jar:../../../../libraries/unix:../../../../libraries/cisd-base/cisd-base.jar:../../../../libraries/fast-md5/fast-md5.jar:../../../../libraries/jython/jython.jar:../../../../libraries/commons-httpclient/commons-httpclient.jar:../../../../libraries/commons-logging/commons-logging.jar:../../../../libraries/jaxb/jaxb-api.jar:../../../../libraries/jaxb/jsr173_1.0_api.jar:../../../../libraries/jaxb/jaxb-impl.jar:../../../../libraries/classycle/classycle.jar:../../../../libraries/commons-collections/commons-collections.jar:../../../../libraries/spring/spring-core.jar:../../../../libraries/spring/spring-context.jar:../../../../libraries/spring/spring-aop.jar:../../../../libraries/spring/third-party/aopalliance.jar:../../../../libraries/cisd-args4j/cisd-args4j.jar:../../../../libraries/jetty8/lib/server/servlet-api-3.0.jar:../../../../libraries/spring/spring.jar:../../../../libraries/spring/webmvc/spring-webmvc.jar:../../../../libraries/gwt2.4/gwt-servlet.jar:../../../../libraries/spring/third-party/stream-supporting-httpinvoker.jar:../../../../libraries/cisd-jhdf5/hdf5-linux-intel.jar:../../../../libraries/cisd-jhdf5/hdf5-macosx-intel.jar:../../../../libraries/cisd-jhdf5/hdf5-windows-intel.jar:../../../../libraries/poi/poi-ooxml-schemas.jar:../../../../libraries/poi/poi-ooxml.jar:../../../../libraries/poi/poi.jar:../../../../openbis/targets/www/WEB-INF/classes:../../../../authentication/targets/classes:../../../../libraries/jmock/jmock-legacy.jar:../../../../libraries/jline/jline.jar:../../../../openbis-common/targets/classes:../../../../libraries/hibernate-search/jms.jar:../../../../libraries/eodsql/eodsql.jar:../../../../libraries/hibernate-search/jsr250-api.jar:../../../../libraries/spring/spring-beans.jar:../../../../libraries/spring/spring-web.jar:../../../../libraries/spring/spring-jdbc.jar:../../../../libraries/hibernate-core/hibernate-core.jar:../../../../libraries/jetty8/lib/common/jetty-http.jar:../../../../libraries/jetty8/lib/common/jetty-io.jar:../../../../libraries/jetty8/lib/common/jetty-util.jar:../../../../libraries/jetty8/lib/server/jetty-continuation.jar:../../../../libraries/jetty8/lib/server/jetty-security.jar:../../../../libraries/jetty8/lib/server/jetty-server.jar:../../../../libraries/jetty8/lib/server/jetty-servlet.jar:../../../../libraries/jmock/hamcrest/hamcrest-integration.jar:../../../../libraries/dom4j/dom4j.jar:../../../../libraries/javassist/javassist.jar:../../../../libraries/reflections/lib/gson-1.4.jar:../../../../libraries/reflections/lib/guava-r08.jar:../../../../libraries/reflections/lib/jboss-vfs-3.0.0.CR5.jar:../../../../libraries/reflections/lib/xml-apis-1.0.b2.jar:../../../../libraries/reflections/reflections.jar:../../../../libraries/slf4j/slf4j.jar:../../../../libraries/jackson/jackson-annotations.jar:../../../../libraries/jackson/jackson-core.jar:../../../../libraries/jackson/jackson-databind.jar:../../../../libraries/jsonrpc4j/jsonrpc4j.jar:../../../../libraries/cisd-jhdf5/cisd-jhdf5-core.jar:../../../../libraries/cisd-jhdf5/cisd-jhdf5-tools.jar:../../../../openbis_api/targets/classes:../../../../dbmigration/targets/classes:../../../../libraries/commons-dbcp/commons-dbcp.jar:../../../../libraries/postgresql/postgresql.jar:../../../../libraries/h2/h2.jar:../../../../libraries/commons-pool/commons-pool.jar:../../../../libraries/apgdiff/apgdiff.jar:../../../../libraries/hibernate-validator/hibernate-validator.jar:../../../../libraries/antlr/antlr.jar:../../../../libraries/slf4j/log4j12/slf4j-log4j12.jar:../../../../libraries/spring/test/spring-test.jar:../../../../libraries/junit/junit.jar:../../../../libraries/hibernate-search/hibernate-search.jar:../../../../libraries/ehcache/ehcache.jar:../../../../libraries/lucene/lucene-core.jar:../../../../libraries/commons-fileupload/commons-fileupload.jar:../../../../libraries/lucene-highlighter/lucene-highlighter.jar:../../../../libraries/fastutil/fastutil.jar:../../../../libraries/gwt-debug-panel/gwt-debug-panel.jar:../../../../libraries/gwt-image-loader/gwt-image-loader.jar:../../../../libraries/gwt2.4/gwt-user.jar:../../../../libraries/gxt2.2.5/gxt.jar:../../../../libraries/gwt2.4/validation-api-1.0.0.GA.jar:../../../../libraries/gwt2.4/validation-api-1.0.0.GA-sources.jar:../../../../libraries/hibernate-commons-annotations/hibernate-commons-annotations.jar:../../../../libraries/jta/jta.jar:../../../../libraries/hibernate-jpa-2.0-api/hibernate-jpa-2.0-api.jar:../../../../libraries/validation-api/validation-api.jar:../../../../libraries/jetty8/lib/server/jetty-deploy.jar:../../../../libraries/jetty8/lib/server/jetty-webapp.jar:../../../../libraries/csv/csv.jar:../../../../libraries/imagej/ij.jar:../../../../libraries/jfreechart/jcommon-1.0.16.jar:../../../../libraries/jfreechart/jfreechart-1.0.13.jar:../../../../libraries/jai/jai_codec.jar:../../../../libraries/jai/jai_core.jar:../../../../libraries/cifex/cifex.jar:../../../../libraries/truezip/truezip.jar:../../../../libraries/cisd-image_readers/cisd-image_readers-bioformats.jar:../../../../libraries/cisd-image_readers/cisd-image_readers-jai.jar:../../../../libraries/cisd-image_readers/cisd-image_readers.jar:../../../../libraries/cisd-image_readers/cisd-image_readers-imagej.jar:../../../../libraries/poi/ooxml-lib/dom4j-1.6.1.jar:../../../../libraries/poi/ooxml-lib/geronimo-stax-api_1.0_spec-1.0.jar:../../../../libraries/poi/ooxml-lib/xmlbeans-2.3.0.jar:../../../../libraries/ftpserver/ftpserver-core.jar:../../../../libraries/mina/mina-core.jar:../../../../libraries/pngj/pngj.jar:../../../../libraries/gwt2.4/gwt-isserializable.jar:../../../../libraries/sshd/sshd-core.jar:etc/log.xml:../../../../libraries/cisd-hotdeploy/cisd-hotdeploy.jar ch.systemsx.cisd.openbis.dss.generic.DataStoreServer"
- * ;
- */
- }
-
- @Override
- protected String getLinuxCommand()
{
return "java -ea -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address="
+ getDebugPort()
diff --git a/js-test/source/java/ch/systemsx/cisd/openbis/jstest/suite/common/JsTestCommonSelenium.java b/js-test/source/java/ch/systemsx/cisd/openbis/jstest/suite/common/JsTestCommonSelenium.java
index 4c39ecbbf7e945060eb648ef28501424e90b246d..9d27c2223c9c8db583f15a44b68e83d10f84a4ac 100644
--- a/js-test/source/java/ch/systemsx/cisd/openbis/jstest/suite/common/JsTestCommonSelenium.java
+++ b/js-test/source/java/ch/systemsx/cisd/openbis/jstest/suite/common/JsTestCommonSelenium.java
@@ -96,7 +96,7 @@ public class JsTestCommonSelenium extends SeleniumTest
File report =
new File("targets/dist/" + this.getClass().getSimpleName() + "/" + method
- + "/report.xml");
+ + "/TEST-" + method + ".xml");
FileUtilities.writeToFile(report, webapp.getJunitReport());
Assert.assertEquals(0, failedCount);
diff --git a/js-test/source/java/ch/systemsx/cisd/openbis/test/server/TestDataStoreServer.java b/js-test/source/java/ch/systemsx/cisd/openbis/test/server/TestDataStoreServer.java
index 706848a3ba11bc4945a47b13574bb6ac0a533a52..971aa6272ab54f5c78ce00fbb71fa4e97f0c2146 100644
--- a/js-test/source/java/ch/systemsx/cisd/openbis/test/server/TestDataStoreServer.java
+++ b/js-test/source/java/ch/systemsx/cisd/openbis/test/server/TestDataStoreServer.java
@@ -26,8 +26,6 @@ import java.util.List;
import java.util.StringTokenizer;
import java.util.concurrent.LinkedBlockingQueue;
-import com.sun.jna.Platform;
-
/**
* @author anttil
*/
@@ -48,26 +46,13 @@ public abstract class TestDataStoreServer
protected abstract String getCommand();
- protected abstract String getLinuxCommand();
-
public String start() throws Exception
{
TestDatabase.restoreDumps(getDumpsPath());
- System.out.println("STARTING DATA STORE " + getName());
-
- String command;
- if (Platform.isLinux())
- {
- command = getLinuxCommand();
- } else
- {
- command = getCommand();
- }
-
- System.out.println("DATA STORE " + getName() + " COMMAND " + command.toString());
+ System.out.println("STARTING DATA STORE: " + getName() + " COMMAND: " + getCommand());
- ProcessHandler p = new ProcessHandler(command.toString(), getRootPath());
+ ProcessHandler p = new ProcessHandler(getCommand(), getRootPath());
p.addListener(new Listener()
{