Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorUwe Stieber2014-01-27 11:51:19 -0500
committerUwe Stieber2014-01-27 11:51:19 -0500
commit21bab56355113d480445e1ac10fec996093969e2 (patch)
tree3f0dda1e4cf5d13f60d63c3c585d674a3d39b2ed /tests
parent3c7690eb0b0fd01876c0d67fb4d2a182458e1820 (diff)
downloadorg.eclipse.tcf-21bab56355113d480445e1ac10fec996093969e2.tar.gz
org.eclipse.tcf-21bab56355113d480445e1ac10fec996093969e2.tar.xz
org.eclipse.tcf-21bab56355113d480445e1ac10fec996093969e2.zip
Tests: Move test execution of test plug-in's into "tests" profile
Diffstat (limited to 'tests')
-rw-r--r--tests/plugins/org.eclipse.tcf.debug.test/pom.xml340
-rw-r--r--tests/pom-tests.xml54
2 files changed, 173 insertions, 221 deletions
diff --git a/tests/plugins/org.eclipse.tcf.debug.test/pom.xml b/tests/plugins/org.eclipse.tcf.debug.test/pom.xml
index a9d7cc0ef..6778c3296 100644
--- a/tests/plugins/org.eclipse.tcf.debug.test/pom.xml
+++ b/tests/plugins/org.eclipse.tcf.debug.test/pom.xml
@@ -4,176 +4,182 @@
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.tcf</groupId>
- <artifactId>tcf-tests.maven-master</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../../pom-tests.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>org.eclipse.tcf</groupId>
+ <artifactId>tcf-tests.maven-master</artifactId>
+ <version>1.2.0-SNAPSHOT</version>
+ <relativePath>../../pom-tests.xml</relativePath>
+ </parent>
- <version>1.2.0.qualifier</version>
- <artifactId>org.eclipse.tcf.debug.test</artifactId>
- <packaging>eclipse-test-plugin</packaging>
+ <version>1.2.0.qualifier</version>
+ <artifactId>org.eclipse.tcf.debug.test</artifactId>
+ <packaging>eclipse-test-plugin</packaging>
- <properties>
- <jacoco.append>true</jacoco.append>
-
- <sdk-version>3.8.0</sdk-version>
- <tcf-version>1.2.0</tcf-version>
-
- <ui.test.vmargs>-Xmx512m -XX:MaxPermSize=256m</ui.test.vmargs>
- </properties>
+ <properties>
+ <jacoco.append>true</jacoco.append>
+
+ <sdk-version>3.8.2</sdk-version>
+ <tcf-version>1.2.0</tcf-version>
+
+ <ui.test.vmargs>-Xmx512m -XX:MaxPermSize=256m</ui.test.vmargs>
+ </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <includes>
- <include>**/BreakpointsTest.*</include>
- <include>**/TransactionTests.*</include>
- <include>**/BreakpointDetailPaneTest.*</include>
- <include>**/BreakpointsViewTest.*</include>
- <include>**/RunControlCMTest.*</include>
- <include>**/StackTraceCMTest.*</include>
- <include>**/SampleTest.*</include>
- <include>**/CacheTests.*</include>
- <include>**/QueryTests.*</include>
- <include>**/RangeCacheTests.*</include>
- </includes>
- <!--
- <debugPort>8003</debugPort>
- -->
- <useUIHarness>true</useUIHarness>
- <useUIThread>false</useUIThread>
- <product>org.eclipse.platform.ide</product>
- <argLine>${tycho.testArgLine} ${ui.test.vmargs}</argLine>
- <application>org.eclipse.ui.ide.workbench</application>
- <dependencies>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.sdk.feature.group</artifactId>
- <version>${sdk-version}</version>
- </dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.tcf.te.tcf.feature.feature.group</artifactId>
- <version>${tcf-version}</version>
- </dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.tcf.te.tests</artifactId>
- <version>${tcf-version}</version>
- </dependency>
- </dependencies>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <executions>
- <execution>
- <phase>validate</phase>
- <goals>
- <goal>execute</goal>
- </goals>
- <configuration>
- <source>
- project.properties['qualified.bundle.version'] = project.properties['unqualifiedVersion'].replace('qualifier', project.properties['buildQualifier'])
- </source>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-report</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <typedef resource="org/jacoco/ant/antlib.xml"/>
- <echo message="Coverage report"/>
- <report>
- <executiondata>
- <fileset dir="${project.build.directory}" includes="jacoco.exec"/>
- </executiondata>
- <structure name="Code Coverage - TCF">
- <group name="org.eclipse.tcf">
- <classfiles>
- <fileset dir="${basedir}/../../../plugins/org.eclipse.tcf/target/classes"/>
- </classfiles>
- <sourcefiles>
- <fileset dir="${basedir}/../../../plugins/org.eclipse.tcf/src"/>
- </sourcefiles>
- </group>
-
- <group name="org.eclipse.tcf.core">
- <classfiles>
- <fileset dir="${basedir}/../../../plugins/org.eclipse.tcf.core/target/classes"/>
- </classfiles>
- <sourcefiles>
- <fileset dir="${basedir}/../../../plugins/org.eclipse.tcf.core/src"/>
- </sourcefiles>
- </group>
-
- <group name="org.eclipse.tcf.debug">
- <classfiles>
- <fileset dir="${basedir}/../../../plugins/org.eclipse.tcf.debug/target/classes"/>
- </classfiles>
- <sourcefiles>
- <fileset dir="${basedir}/../../../plugins/org.eclipse.tcf.debug/src"/>
- </sourcefiles>
- </group>
+ <profiles>
+ <profile>
+ <id>tests</id>
- <group name="org.eclipse.tcf.debug.ui">
- <classfiles>
- <fileset dir="${basedir}/../../../plugins/org.eclipse.tcf.debug.ui/target/classes"/>
- </classfiles>
- <sourcefiles>
- <fileset dir="${basedir}/../../../plugins/org.eclipse.tcf.debug.ui/src"/>
- </sourcefiles>
- </group>
-
- <group name="org.eclipse.tcf.cdt.ui">
- <classfiles>
- <fileset dir="${basedir}/../../../plugins/org.eclipse.tcf.cdt.ui/target/classes"/>
- </classfiles>
- <sourcefiles>
- <fileset dir="${basedir}/../../../plugins/org.eclipse.tcf.cdt.ui/src"/>
- </sourcefiles>
- </group>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <includes>
+ <include>**/BreakpointsTest.*</include>
+ <include>**/TransactionTests.*</include>
+ <include>**/BreakpointDetailPaneTest.*</include>
+ <include>**/BreakpointsViewTest.*</include>
+ <include>**/RunControlCMTest.*</include>
+ <include>**/StackTraceCMTest.*</include>
+ <include>**/SampleTest.*</include>
+ <include>**/CacheTests.*</include>
+ <include>**/QueryTests.*</include>
+ <include>**/RangeCacheTests.*</include>
+ </includes>
+ <!--
+ <debugPort>8003</debugPort>
+ -->
+ <useUIHarness>true</useUIHarness>
+ <useUIThread>false</useUIThread>
+ <product>org.eclipse.platform.ide</product>
+ <argLine>${tycho.testArgLine} ${ui.test.vmargs}</argLine>
+ <application>org.eclipse.ui.ide.workbench</application>
+ <dependencies>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.sdk.feature.group</artifactId>
+ <version>${sdk-version}</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.tcf.te.tcf.feature.feature.group</artifactId>
+ <version>${tcf-version}</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.tcf.te.tests</artifactId>
+ <version>${tcf-version}</version>
+ </dependency>
+ </dependencies>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+ project.properties['qualified.bundle.version'] = project.properties['unqualifiedVersion'].replace('qualifier', project.properties['buildQualifier'])
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>generate-report</id>
+ <phase>post-integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <typedef resource="org/jacoco/ant/antlib.xml"/>
+ <echo message="Coverage report"/>
+ <report>
+ <executiondata>
+ <fileset dir="${project.build.directory}" includes="jacoco.exec"/>
+ </executiondata>
+ <structure name="Code Coverage - TCF">
+ <group name="org.eclipse.tcf">
+ <classfiles>
+ <fileset dir="${basedir}/../../../plugins/org.eclipse.tcf/target/classes"/>
+ </classfiles>
+ <sourcefiles>
+ <fileset dir="${basedir}/../../../plugins/org.eclipse.tcf/src"/>
+ </sourcefiles>
+ </group>
+
+ <group name="org.eclipse.tcf.core">
+ <classfiles>
+ <fileset dir="${basedir}/../../../plugins/org.eclipse.tcf.core/target/classes"/>
+ </classfiles>
+ <sourcefiles>
+ <fileset dir="${basedir}/../../../plugins/org.eclipse.tcf.core/src"/>
+ </sourcefiles>
+ </group>
+
+ <group name="org.eclipse.tcf.debug">
+ <classfiles>
+ <fileset dir="${basedir}/../../../plugins/org.eclipse.tcf.debug/target/classes"/>
+ </classfiles>
+ <sourcefiles>
+ <fileset dir="${basedir}/../../../plugins/org.eclipse.tcf.debug/src"/>
+ </sourcefiles>
+ </group>
- </structure>
-
- <html destdir="${project.build.directory}/coverage"
- footer="Code Coverage Report for TCF ${qualified.bundle.version}"
- locale="de"/>
- <csv destfile="${project.build.directory}/coverage/coverage.csv"/>
- <xml destfile="${project.build.directory}/coverage/coverage.xml"/>
- </report>
- </target>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.jacoco</groupId>
- <artifactId>org.jacoco.ant</artifactId>
- <version>${jacoco-version}</version>
- </dependency>
- </dependencies>
- </plugin>
-
- </plugins>
- </build>
+ <group name="org.eclipse.tcf.debug.ui">
+ <classfiles>
+ <fileset dir="${basedir}/../../../plugins/org.eclipse.tcf.debug.ui/target/classes"/>
+ </classfiles>
+ <sourcefiles>
+ <fileset dir="${basedir}/../../../plugins/org.eclipse.tcf.debug.ui/src"/>
+ </sourcefiles>
+ </group>
+
+ <group name="org.eclipse.tcf.cdt.ui">
+ <classfiles>
+ <fileset dir="${basedir}/../../../plugins/org.eclipse.tcf.cdt.ui/target/classes"/>
+ </classfiles>
+ <sourcefiles>
+ <fileset dir="${basedir}/../../../plugins/org.eclipse.tcf.cdt.ui/src"/>
+ </sourcefiles>
+ </group>
+
+ </structure>
+
+ <html destdir="${project.build.directory}/coverage"
+ footer="Code Coverage Report for TCF ${qualified.bundle.version}"
+ locale="de"/>
+ <csv destfile="${project.build.directory}/coverage/coverage.csv"/>
+ <xml destfile="${project.build.directory}/coverage/coverage.xml"/>
+ </report>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.jacoco</groupId>
+ <artifactId>org.jacoco.ant</artifactId>
+ <version>${jacoco-version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/tests/pom-tests.xml b/tests/pom-tests.xml
deleted file mode 100644
index cd1a871d7..000000000
--- a/tests/pom-tests.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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.tcf</groupId>
- <artifactId>org.eclipse.tcf.maven-build</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <relativePath>../admin/pom-build.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.tcf</groupId>
- <artifactId>tcf-tests.maven-master</artifactId>
- <version>1.2.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>TCF Unit Tests, Master</name>
-
- <modules>
- <!-- The modules the test module depends on -->
- <module>../pom.xml</module>
- <module>../target_explorer/plugins/org.eclipse.tcf.te.tests</module>
-
- <!-- The test module executing the tests -->
- <module>plugins/org.eclipse.tcf.debug.test</module>
- </modules>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <includes>
- <include>org.eclipse.tcf*</include>
- </includes>
- <excludes>
- <exclude>org.eclipse.tcf.debug.test*</exclude>
- <exclude>org.eclipse.tcf.te.*</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>

Back to the top