diff options
| author | Mickael Istria | 2016-01-26 13:53:57 +0000 |
|---|---|---|
| committer | Mickael Istria | 2016-01-26 17:52:43 +0000 |
| commit | 9a1396bdf6350a3a8818f2b548352c3731100631 (patch) | |
| tree | 3c0967550bea732e17e1c14315dd97ad469242c5 | |
| parent | 5e2a28dd0ce41f60eb7d81257024a0b0f83066de (diff) | |
| download | eclipse.platform.resources-9a1396bdf6350a3a8818f2b548352c3731100631.tar.gz eclipse.platform.resources-9a1396bdf6350a3a8818f2b548352c3731100631.tar.xz eclipse.platform.resources-9a1396bdf6350a3a8818f2b548352c3731100631.zip | |
Bug 417026 - Get tests to run with SurefireI20160126-2000
Added the necessary dependencies for tests to run with a
"mvn clean verify -Pbuild-individual-bundles"
Signed-off-by: Mickael Istria <mistria@redhat.com>
Change-Id: Ib0b2000c727dfcd06cb49e63d9ed857b7f17f9f3
12 files changed, 220 insertions, 6 deletions
@@ -71,6 +71,7 @@ <module>bundles/org.eclipse.core.resources.win32.x86</module> <module>bundles/org.eclipse.core.resources.win32.x86_64</module> + <module>tests/org.eclipse.core.tests.filesystem.feature</module> <module>tests/org.eclipse.core.tests.resources</module> <module>tests/org.eclipse.core.tests.resources.saveparticipant</module> <module>tests/org.eclipse.core.tests.resources.saveparticipant1</module> diff --git a/tests/org.eclipse.core.tests.filesystem.feature/.project b/tests/org.eclipse.core.tests.filesystem.feature/.project new file mode 100644 index 000000000..2e95adb59 --- /dev/null +++ b/tests/org.eclipse.core.tests.filesystem.feature/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.eclipse.core.tests.filesystem.feature</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.pde.FeatureBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.pde.FeatureNature</nature> + </natures> +</projectDescription> diff --git a/tests/org.eclipse.core.tests.filesystem.feature/build.properties b/tests/org.eclipse.core.tests.filesystem.feature/build.properties new file mode 100644 index 000000000..5fe2a06c2 --- /dev/null +++ b/tests/org.eclipse.core.tests.filesystem.feature/build.properties @@ -0,0 +1,12 @@ +############################################################################### +# Copyright (c) 2016 Red Hat Inc. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Mickael Istria (Red Hat Inc.) - initial API and implementation +############################################################################### +bin.includes = feature.xml,\ + feature.properties
\ No newline at end of file diff --git a/tests/org.eclipse.core.tests.filesystem.feature/feature.properties b/tests/org.eclipse.core.tests.filesystem.feature/feature.properties new file mode 100644 index 000000000..1a60aa646 --- /dev/null +++ b/tests/org.eclipse.core.tests.filesystem.feature/feature.properties @@ -0,0 +1,36 @@ +############################################################################### +# Copyright (c) 2016 Red Hat Inc. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# Mickael Istria (Red Hat Inc.) +############################################################################### +# feature.properties +# contains externalized strings for feature.xml +# "%foo" in feature.xml corresponds to the key "foo" in this file +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# This file should be translated. + +# "featureName" property - name of the feature +featureName=Eclipse Test feature containing all FS-specific fragments + +# "providerName" property - name of the company that provides the feature +providerName=Eclipse Platform Project + +# "description" property - description of the feature +description=Common OS-independent base of the Eclipse platform. (Binary runtime and user documentation.) + +# "copyright" property - text of the "Feature Update Copyright" +copyright=\ +Copyright (c) 2016 Eclipse contributors and others.\n\ +All rights reserved. This program and the accompanying materials\n\ +are made available under the terms of the Eclipse Public License v1.0\n\ +which accompanies this distribution, and is available at\n\ +http://www.eclipse.org/legal/epl-v10.html\n\ +\n\ +Contributors:\n\ + Mickael Istria (Red Hat Inc.) +################ end of copyright property ####################################
\ No newline at end of file diff --git a/tests/org.eclipse.core.tests.filesystem.feature/feature.xml b/tests/org.eclipse.core.tests.filesystem.feature/feature.xml new file mode 100644 index 000000000..1c0eded62 --- /dev/null +++ b/tests/org.eclipse.core.tests.filesystem.feature/feature.xml @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.eclipse.core.tests.filesystem.feature" + label="%featureName" + version="4.6.0.qualifier" + provider-name="%providerName" + license-feature="org.eclipse.license" + license-feature-version="0.0.0"> + + <description> + %description + </description> + + <copyright> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <!--plugin + id="org.eclipse.core.filesystem.java7" + download-size="0" + install-size="0" + version="0.0.0" + fragment="true" + unpack="false"/--> + + <plugin + id="org.eclipse.core.filesystem.linux.x86_64" + os="linux" + arch="x86_64" + download-size="0" + install-size="0" + version="0.0.0" + fragment="true" + unpack="false"/> + + <plugin + id="org.eclipse.core.filesystem.linux.x86" + os="linux" + arch="x86" + download-size="0" + install-size="0" + version="0.0.0" + fragment="true" + unpack="false"/> + + <plugin + id="org.eclipse.core.filesystem.win32.x86_64" + os="win32" + arch="x86_64" + download-size="0" + install-size="0" + version="0.0.0" + fragment="true" + unpack="false"/> + + <plugin + id="org.eclipse.core.filesystem.win32.x86" + os="win32" + arch="x86" + download-size="0" + install-size="0" + version="0.0.0" + fragment="true" + unpack="false"/> + + <plugin + id="org.eclipse.core.filesystem.macosx" + os="macosx" + download-size="0" + install-size="0" + version="0.0.0" + fragment="true" + unpack="false"/> + +</feature> diff --git a/tests/org.eclipse.core.tests.filesystem.feature/pom.xml b/tests/org.eclipse.core.tests.filesystem.feature/pom.xml new file mode 100644 index 000000000..785c4ffc0 --- /dev/null +++ b/tests/org.eclipse.core.tests.filesystem.feature/pom.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2016 Red Hat Inc. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Distribution License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/org/documents/edl-v10.php + + Contributors: + Mickael Istria (Red Hat Inc.) - initial implementation +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>eclipse.platform.resources</artifactId> + <groupId>eclipse.platform.resources</groupId> + <version>4.6.0-SNAPSHOT</version> + <relativePath>../../</relativePath> + </parent> + <artifactId>org.eclipse.core.tests.filesystem.feature</artifactId> + <version>4.6.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> +</project> diff --git a/tests/org.eclipse.core.tests.resources.saveparticipant/pom.xml b/tests/org.eclipse.core.tests.resources.saveparticipant/pom.xml index d31683303..46e133b3d 100644 --- a/tests/org.eclipse.core.tests.resources.saveparticipant/pom.xml +++ b/tests/org.eclipse.core.tests.resources.saveparticipant/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2012, 2015 Eclipse Foundation and others. + Copyright (c) 2012, 2016 Eclipse Foundation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v1.0 which accompanies this distribution, and is available at @@ -8,6 +8,7 @@ Contributors: Igor Fedorenko - initial implementation + Mickael Istria (Red Hat Inc.) - explicit skip tests --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -16,6 +17,12 @@ <groupId>eclipse.platform.resources</groupId> <version>4.6.0-SNAPSHOT</version> </parent> + + <properties> + <!-- This tests aren't run by legacy build --> + <skipTests>true</skipTests> + </properties> + <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.tests.resources.saveparticipant</artifactId> <version>3.3.0-SNAPSHOT</version> diff --git a/tests/org.eclipse.core.tests.resources.saveparticipant1/pom.xml b/tests/org.eclipse.core.tests.resources.saveparticipant1/pom.xml index e6facf70f..88c17c4c7 100644 --- a/tests/org.eclipse.core.tests.resources.saveparticipant1/pom.xml +++ b/tests/org.eclipse.core.tests.resources.saveparticipant1/pom.xml @@ -19,5 +19,5 @@ <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.tests.resources.saveparticipant1</artifactId> <version>3.3.0-SNAPSHOT</version> - <packaging>eclipse-test-plugin</packaging> + <packaging>eclipse-plugin</packaging> </project> diff --git a/tests/org.eclipse.core.tests.resources.saveparticipant2/pom.xml b/tests/org.eclipse.core.tests.resources.saveparticipant2/pom.xml index 0f8988ab6..b4c5b879a 100644 --- a/tests/org.eclipse.core.tests.resources.saveparticipant2/pom.xml +++ b/tests/org.eclipse.core.tests.resources.saveparticipant2/pom.xml @@ -19,5 +19,5 @@ <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.tests.resources.saveparticipant2</artifactId> <version>3.3.0-SNAPSHOT</version> - <packaging>eclipse-test-plugin</packaging> + <packaging>eclipse-plugin</packaging> </project> diff --git a/tests/org.eclipse.core.tests.resources.saveparticipant3/pom.xml b/tests/org.eclipse.core.tests.resources.saveparticipant3/pom.xml index 4cca76ba1..8f6cdf6d8 100644 --- a/tests/org.eclipse.core.tests.resources.saveparticipant3/pom.xml +++ b/tests/org.eclipse.core.tests.resources.saveparticipant3/pom.xml @@ -19,5 +19,5 @@ <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.tests.resources.saveparticipant3</artifactId> <version>3.3.0-SNAPSHOT</version> - <packaging>eclipse-test-plugin</packaging> + <packaging>eclipse-plugin</packaging> </project> diff --git a/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF b/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF index 66f47b1f3..3db4aac81 100644 --- a/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.core.tests.resources/META-INF/MANIFEST.MF @@ -35,7 +35,8 @@ Require-Bundle: org.eclipse.osgi.services, org.eclipse.test.performance, org.eclipse.core.filesystem, org.eclipse.core.runtime, - org.eclipse.core.expressions + org.eclipse.core.expressions, + org.eclipse.pde.junit.runtime;bundle-version="3.5.0" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.core.tests.internal.resources.TestActivator Bundle-RequiredExecutionEnvironment: JavaSE-1.7 diff --git a/tests/org.eclipse.core.tests.resources/pom.xml b/tests/org.eclipse.core.tests.resources/pom.xml index f91b9c50f..ec4b34a86 100644 --- a/tests/org.eclipse.core.tests.resources/pom.xml +++ b/tests/org.eclipse.core.tests.resources/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2012, 2015 Eclipse Foundation and others. + Copyright (c) 2016, 2015 Eclipse Foundation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v1.0 which accompanies this distribution, and is available at @@ -8,6 +8,7 @@ Contributors: Igor Fedorenko - initial implementation + Mickael Istria (Red Hat Inc.) - Settings to enable tests with surefire --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -25,4 +26,41 @@ <testSuite>${project.artifactId}</testSuite> <testClass>org.eclipse.core.tests.resources.AutomatedTests</testClass> </properties> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho.version}</version> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <versionRange>0.0.0</versionRange> + <type>eclipse-feature</type> + <id>org.eclipse.core.tests.filesystem.feature</id> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> + + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho.version}</version> + <configuration> + <useUIHarness>false</useUIHarness> + <useUIThread>false</useUIThread> + <dependencies> + <dependency> + <artifactId>org.eclipse.core.tests.filesystem.feature</artifactId> + <type>eclipse-feature</type> + </dependency> + </dependencies> + </configuration> + </plugin> + </plugins> + </build> </project> |