Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMat Booth2020-03-02 13:36:33 +0000
committerMat Booth2020-03-02 13:36:33 +0000
commit7ff178e0245f419856471b13478c1dcff7df35fd (patch)
treef435efa01c0f126fd8b34c704ca79ea4c6100f39
parent770bb146331575696b5c572c539d20131a2c0df6 (diff)
downloadorg.eclipse.ecf-7ff178e0245f419856471b13478c1dcff7df35fd.tar.gz
org.eclipse.ecf-7ff178e0245f419856471b13478c1dcff7df35fd.tar.xz
org.eclipse.ecf-7ff178e0245f419856471b13478c1dcff7df35fd.zip
Bug 560648 - Get filetransfer tests to run during the tycho build
Add the filetransfer tests to the tycho build Change-Id: Ia9f0e9cc81d0c6110ab981f0193fc79d24dccc62 Signed-off-by: Mat Booth <mat.booth@redhat.com>
-rw-r--r--pom.xml6
-rw-r--r--releng/features/org.eclipse.ecf.tests.filetransfer.feature/feature.xml2
-rw-r--r--releng/features/org.eclipse.ecf.tests.filetransfer.feature/pom.xml15
-rw-r--r--releng/org.eclipse.ecf.releng.target/ecf-2019-03.target36
-rw-r--r--releng/org.eclipse.ecf.releng.target/ecf-2019-09.target6
-rw-r--r--tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/pom.xml14
-rw-r--r--tests/bundles/org.eclipse.ecf.tests.filetransfer.httpserver/pom.xml15
-rw-r--r--tests/bundles/org.eclipse.ecf.tests.filetransfer/pom.xml15
-rw-r--r--tests/bundles/org.eclipse.ecf.tests.provider.xmpp/pom.xml5
9 files changed, 93 insertions, 21 deletions
diff --git a/pom.xml b/pom.xml
index a7eb209e9..7cfd47860 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,8 +86,6 @@
<tycho.baseline>fail</tycho.baseline>
<tycho.baseline.replace>all</tycho.baseline.replace>
<tycho.baseline.comparison>fail</tycho.baseline.comparison>
- <!-- Skip tests by default because they take a long time -->
- <skipTests>true</skipTests>
</properties>
<pluginRepositories>
@@ -206,7 +204,10 @@
<module>server-side/features/org.eclipse.ecf.server.generic.feature</module>
<module>tests/bundles/org.eclipse.ecf.tests</module>
+ <module>tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server</module>
<module>tests/bundles/org.eclipse.ecf.tests.datashare</module>
+ <module>tests/bundles/org.eclipse.ecf.tests.filetransfer</module>
+ <module>tests/bundles/org.eclipse.ecf.tests.filetransfer.httpserver</module>
<module>tests/bundles/org.eclipse.ecf.tests.presence</module>
<module>tests/bundles/org.eclipse.ecf.tests.protocol.msn</module>
<module>tests/bundles/org.eclipse.ecf.tests.provider.datashare.nio</module>
@@ -258,6 +259,7 @@
<module>releng/features/org.eclipse.ecf.remoteservice.soap.feature</module>
<module>releng/features/org.eclipse.ecf.sharedobject.feature</module>
<module>releng/features/org.eclipse.ecf.tests.feature</module>
+ <module>releng/features/org.eclipse.ecf.tests.filetransfer.feature</module>
<module>releng/features/org.eclipse.ecf.xmpp.feature</module>
<module>releng/org.eclipse.ecf.releng.target</module>
diff --git a/releng/features/org.eclipse.ecf.tests.filetransfer.feature/feature.xml b/releng/features/org.eclipse.ecf.tests.filetransfer.feature/feature.xml
index 058e38d2e..0e30df075 100644
--- a/releng/features/org.eclipse.ecf.tests.filetransfer.feature/feature.xml
+++ b/releng/features/org.eclipse.ecf.tests.filetransfer.feature/feature.xml
@@ -8,7 +8,7 @@
license-feature-version="0.0.0">
<description url="http://www.eclipse.org/ecf">
- TODO: Write something here!
+ Eclipse Communications Framework Filetransfer Tests
</description>
<copyright>
diff --git a/releng/features/org.eclipse.ecf.tests.filetransfer.feature/pom.xml b/releng/features/org.eclipse.ecf.tests.filetransfer.feature/pom.xml
new file mode 100644
index 000000000..150119252
--- /dev/null
+++ b/releng/features/org.eclipse.ecf.tests.filetransfer.feature/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.ecf</groupId>
+ <artifactId>ecf-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../../</relativePath>
+ </parent>
+ <groupId>org.eclipse.ecf</groupId>
+ <artifactId>org.eclipse.ecf.tests.filetransfer.feature</artifactId>
+ <version>1.0.200-SNAPSHOT</version>
+ <packaging>eclipse-feature</packaging>
+</project>
diff --git a/releng/org.eclipse.ecf.releng.target/ecf-2019-03.target b/releng/org.eclipse.ecf.releng.target/ecf-2019-03.target
index bcce80039..dfe583386 100644
--- a/releng/org.eclipse.ecf.releng.target/ecf-2019-03.target
+++ b/releng/org.eclipse.ecf.releng.target/ecf-2019-03.target
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="2019-03" sequenceNumber="25">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="2019-03" sequenceNumber="26">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
@@ -7,13 +9,15 @@
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.apache.hadoop.zookeeper" version="3.3.3.v201105210832"/>
<unit id="org.apache.hadoop.zookeeper.source" version="3.3.3.v201105210832"/>
+<unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+<unit id="org.apache.commons.httpclient.source" version="3.1.0.v201012070820"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.sun.syndication" version="0.9.0.v200803061811"/>
<unit id="com.sun.syndication.source" version="0.9.0.v200803061811"/>
-<unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>
-<unit id="org.apache.commons.codec.source" version="1.10.0.v20180409-1845"/>
+<unit id="org.apache.commons.codec" version="1.13.0.v20200108-0001"/>
+<unit id="org.apache.commons.codec.source" version="1.13.0.v20200108-0001"/>
<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.commons.logging.source" version="1.2.0.v20180409-1502"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
@@ -23,19 +27,19 @@
<unit id="org.json" version="1.0.0.v201011060100"/>
<unit id="org.xbill.dns" version="2.0.8.v201112050911"/>
<unit id="org.xbill.dns.source" version="2.0.8.v201112050911"/>
-<unit id="org.objectweb.asm" version="6.2.1.v20181030-2244"/>
-<unit id="org.objectweb.asm.source" version="6.2.1.v20181030-2244"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository"/>
- <unit id="org.apache.httpcomponents.httpclient" version="4.5.6.v20190213-1430"/>
- <unit id="org.apache.httpcomponents.httpclient.source" version="4.5.6.v20190213-1430"/>
- <unit id="org.apache.httpcomponents.httpclient.win" version="4.5.6.v20190213-1947"/>
- <unit id="org.apache.httpcomponents.httpclient.win.source" version="4.5.6.v20190213-1947"/>
- <unit id="org.apache.httpcomponents.httpcore" version="4.4.10.v20190123-2214"/>
- <unit id="org.apache.httpcomponents.httpcore.source" version="4.4.10.v20190123-2214"/>
- <unit id="com.sun.jna" version="4.5.1.v20180403-1933"/>
- <unit id="com.sun.jna.platform" version="4.5.1.v20180403-1933"/>
- <unit id="com.sun.jna.platform.source" version="4.5.1.v20180403-1933"/>
- <unit id="com.sun.jna.source" version="4.5.1.v20180403-1933"/>
+<unit id="org.objectweb.asm" version="7.2.0.v20191010-1910"/>
+<unit id="org.objectweb.asm.source" version="7.2.0.v20191010-1910"/>
+<unit id="org.apache.httpcomponents.httpclient" version="4.5.10.v20200114-1512"/>
+<unit id="org.apache.httpcomponents.httpclient.source" version="4.5.10.v20200114-1512"/>
+<unit id="org.apache.httpcomponents.httpclient.win" version="4.5.10.v20200113-2105"/>
+<unit id="org.apache.httpcomponents.httpclient.win.source" version="4.5.10.v20200113-2105"/>
+<unit id="org.apache.httpcomponents.httpcore" version="4.4.12.v20200108-1212"/>
+<unit id="org.apache.httpcomponents.httpcore.source" version="4.4.12.v20200108-1212"/>
+<unit id="com.sun.jna" version="4.5.1.v20190425-1842"/>
+<unit id="com.sun.jna.platform" version="4.5.1.v20190425-1842"/>
+<unit id="com.sun.jna.platform.source" version="4.5.1.v20190425-1842"/>
+<unit id="com.sun.jna.source" version="4.5.1.v20190425-1842"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20200224183213/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.edit.ui.feature.group" version="2.16.0.v20181104-0733"/>
diff --git a/releng/org.eclipse.ecf.releng.target/ecf-2019-09.target b/releng/org.eclipse.ecf.releng.target/ecf-2019-09.target
index e1131fb62..e052acf99 100644
--- a/releng/org.eclipse.ecf.releng.target/ecf-2019-09.target
+++ b/releng/org.eclipse.ecf.releng.target/ecf-2019-09.target
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
-<target name="2019-09" sequenceNumber="25">
+<target name="2019-09" sequenceNumber="26">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
@@ -9,6 +9,8 @@
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.apache.hadoop.zookeeper" version="3.3.3.v201105210832"/>
<unit id="org.apache.hadoop.zookeeper.source" version="3.3.3.v201105210832"/>
+<unit id="org.apache.commons.httpclient" version="3.1.0.v201012070820"/>
+<unit id="org.apache.commons.httpclient.source" version="3.1.0.v201012070820"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -37,7 +39,7 @@
<unit id="com.sun.jna.platform" version="4.5.1.v20190425-1842"/>
<unit id="com.sun.jna.platform.source" version="4.5.1.v20190425-1842"/>
<unit id="com.sun.jna.source" version="4.5.1.v20190425-1842"/>
-<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20200128200239/repository"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/S20200224183213/repository"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.edit.ui.feature.group" version="2.17.0.v20190323-1059"/>
diff --git a/tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/pom.xml b/tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/pom.xml
new file mode 100644
index 000000000..eae935b4e
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.apache.httpclient.server/pom.xml
@@ -0,0 +1,14 @@
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.ecf</groupId>
+ <artifactId>ecf-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../../</relativePath>
+ </parent>
+ <groupId>org.eclipse.ecf</groupId>
+ <artifactId>org.eclipse.ecf.tests.apache.httpclient.server</artifactId>
+ <version>3.0.100-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
+</project> \ No newline at end of file
diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpserver/pom.xml b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpserver/pom.xml
new file mode 100644
index 000000000..1710f6be3
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer.httpserver/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.ecf</groupId>
+ <artifactId>ecf-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../../</relativePath>
+ </parent>
+ <groupId>org.eclipse.ecf</groupId>
+ <artifactId>org.eclipse.ecf.tests.filetransfer.httpserver</artifactId>
+ <version>1.0.101-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
+</project>
diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/pom.xml b/tests/bundles/org.eclipse.ecf.tests.filetransfer/pom.xml
new file mode 100644
index 000000000..2a2d58087
--- /dev/null
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/pom.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.eclipse.ecf</groupId>
+ <artifactId>ecf-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../../</relativePath>
+ </parent>
+ <groupId>org.eclipse.ecf</groupId>
+ <artifactId>org.eclipse.ecf.tests.filetransfer</artifactId>
+ <version>2.0.301-SNAPSHOT</version>
+ <packaging>eclipse-test-plugin</packaging>
+</project>
diff --git a/tests/bundles/org.eclipse.ecf.tests.provider.xmpp/pom.xml b/tests/bundles/org.eclipse.ecf.tests.provider.xmpp/pom.xml
index 87fc9c23d..c25811eb8 100644
--- a/tests/bundles/org.eclipse.ecf.tests.provider.xmpp/pom.xml
+++ b/tests/bundles/org.eclipse.ecf.tests.provider.xmpp/pom.xml
@@ -13,6 +13,11 @@
<version>2.0.101-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
+ <properties>
+ <!-- Always skip these tests for now, requires an the external service -->
+ <skipTests>true</skipTests>
+ </properties>
+
<build>
<plugins>
<plugin>

Back to the top