diff options
| author | Lars Vogel | 2014-08-18 13:03:22 +0000 |
|---|---|---|
| committer | Lars Vogel | 2014-08-18 14:54:29 +0000 |
| commit | 5d5a1152b7006e99f59615459760c74914a9a3f4 (patch) | |
| tree | 3e84244fea924295ec271049e756ddf894525efc | |
| parent | ad4e8a05691e2a4c426778bb3ce9f2985a373d0a (diff) | |
| download | eclipse.platform.ui-5d5a1152b7006e99f59615459760c74914a9a3f4.tar.gz eclipse.platform.ui-5d5a1152b7006e99f59615459760c74914a9a3f4.tar.xz eclipse.platform.ui-5d5a1152b7006e99f59615459760c74914a9a3f4.zip | |
Bug 441877 - Include all test suites in org.eclipse.ui.tests in the
Tycho test scope
This runs the JFace and UiTestSuite via Maven. I get several failures, 5
of them I can also reproduce by runnnig the UitestSuite manually but
JFace shows 6 additional errors. Will investigate via a separate bug.
Change-Id: Ifbfb448951fb069d9cad191d2758f5dcad5ec0ce
Signed-off-by: Lars Vogel <Lars.Vogel@gmail.com>
| -rw-r--r-- | tests/org.eclipse.ui.tests/pom.xml | 63 |
1 files changed, 28 insertions, 35 deletions
diff --git a/tests/org.eclipse.ui.tests/pom.xml b/tests/org.eclipse.ui.tests/pom.xml index 8dc1086ca4d..73bc21960b8 100644 --- a/tests/org.eclipse.ui.tests/pom.xml +++ b/tests/org.eclipse.ui.tests/pom.xml @@ -8,6 +8,7 @@ Contributors: Igor Fedorenko - initial implementation + Lars Vogel <Lars.Vogel@gmail.com> - Bug 441877 --> <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> @@ -22,8 +23,8 @@ <packaging>eclipse-test-plugin</packaging> <properties> - <testSuite>${project.artifactId}</testSuite> - <testClass>org.eclipse.jface.tests.AllTests</testClass> + <testSuiteUITests>**/org/eclipse/ui/tests/UiTestSuite.java</testSuiteUITests> + <testSuiteJFace>**/org/eclipse/jface/tests/AllTests.java</testSuiteJFace> </properties> <build> @@ -32,39 +33,31 @@ <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire-plugin</artifactId> <version>${tycho.version}</version> - <executions> - <!-- Default execution is kept with ${testClass} in UI Thread --> - <execution> - <id>nouithread-tests</id> - <phase>verify</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <testClass>org.eclipse.ui.tests.UiTestSuite</testClass> - <work>${project.build.directory}/work-nouithread</work> - <useUIHarness>false</useUIHarness> - <useUIThread>false</useUIThread> - <dependencies> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.equinox.event</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.osgi.compatibility.state</artifactId> - <version>0.0.0</version> - </dependency> - <dependency> - <type>eclipse-plugin</type> - <artifactId>org.eclipse.jdt.ui</artifactId> - <version>0.0.0</version> - </dependency> - </dependencies> - </configuration> - </execution> - </executions> + <configuration> + <includes> + <include>${testSuiteJFace}</include> + <include>${testSuiteUITests}</include> + </includes> + <useUIHarness>true</useUIHarness> + <useUIThread>true</useUIThread> + <dependencies> + <dependency> + <type>eclipse-plugin</type> + <artifactId>org.eclipse.equinox.event</artifactId> + <version>0.0.0</version> + </dependency> + <dependency> + <type>eclipse-plugin</type> + <artifactId>org.eclipse.osgi.compatibility.state</artifactId> + <version>0.0.0</version> + </dependency> + <dependency> + <type>eclipse-plugin</type> + <artifactId>org.eclipse.jdt.ui</artifactId> + <version>0.0.0</version> + </dependency> + </dependencies> + </configuration> </plugin> </plugins> </build> |