diff options
| -rw-r--r-- | target_explorer/plugins/org.eclipse.tcf.te.tests/pom-tests.xml | 288 | ||||
| -rw-r--r-- | target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml | 281 | ||||
| -rw-r--r-- | tests/plugins/org.eclipse.tcf.debug.test/pom.xml | 340 | ||||
| -rw-r--r-- | tests/pom-tests.xml | 54 |
4 files changed, 453 insertions, 510 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tests/pom-tests.xml b/target_explorer/plugins/org.eclipse.tcf.te.tests/pom-tests.xml deleted file mode 100644 index d56deffdb..000000000 --- a/target_explorer/plugins/org.eclipse.tcf.te.tests/pom-tests.xml +++ /dev/null @@ -1,288 +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.te</groupId> - <artifactId>te-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.te.tests</artifactId> - <packaging>eclipse-test-plugin</packaging> - - <properties> - <jacoco.append>true</jacoco.append> - - <sdk-version>3.8.0</sdk-version> - <te-version>1.2.0</te-version> - - <ui.test.vmargs>-Xint -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> - <testSuite>org.eclipse.tcf.te.tests</testSuite> - <testClass>org.eclipse.tcf.te.tests.suites.AllTests</testClass> - <useUIHarness>true</useUIHarness> - <useUIThread>true</useUIThread> -<!-- <debugPort>8003</debugPort> --> - <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.feature.feature.group</artifactId> - <version>${te-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 - Target Explorer"> - <group name="org.eclipse.tcf.te.core"> - <classfiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.core/target/classes"/> - </classfiles> - <sourcefiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.core/src"/> - </sourcefiles> - </group> - - <group name="org.eclipse.tcf.te.core.cdt"> - <classfiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.core.cdt/target/classes"/> - </classfiles> - <sourcefiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.core.cdt/src"/> - </sourcefiles> - </group> - - <group name="org.eclipse.tcf.te.launch.core"> - <classfiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.launch.core/target/classes"/> - </classfiles> - <sourcefiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.launch.core/src"/> - </sourcefiles> - </group> - - <group name="org.eclipse.tcf.te.runtime"> - <classfiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime/target/classes"/> - </classfiles> - <sourcefiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime/src"/> - </sourcefiles> - </group> - - <group name="org.eclipse.tcf.te.runtime.concurrent"> - <classfiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.concurrent/target/classes"/> - </classfiles> - <sourcefiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.concurrent/src"/> - </sourcefiles> - </group> - - <group name="org.eclipse.tcf.te.runtime.model"> - <classfiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.model/target/classes"/> - </classfiles> - <sourcefiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.model/src"/> - </sourcefiles> - </group> - - <group name="org.eclipse.tcf.te.runtime.persistence"> - <classfiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.persistence/target/classes"/> - </classfiles> - <sourcefiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.persistence/src"/> - </sourcefiles> - </group> - - <group name="org.eclipse.tcf.te.runtime.services"> - <classfiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.services/target/classes"/> - </classfiles> - <sourcefiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.services/src"/> - </sourcefiles> - </group> - - <group name="org.eclipse.tcf.te.runtime.statushandler"> - <classfiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.statushandler/target/classes"/> - </classfiles> - <sourcefiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.statushandler/src"/> - </sourcefiles> - </group> - - <group name="org.eclipse.tcf.te.runtime.stepper"> - <classfiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.stepper/target/classes"/> - </classfiles> - <sourcefiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.stepper/src"/> - </sourcefiles> - </group> - - <group name="org.eclipse.tcf.te.tcf.core"> - <classfiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.core/target/classes"/> - </classfiles> - <sourcefiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.core/src"/> - </sourcefiles> - </group> - - <group name="org.eclipse.tcf.te.tcf.core.model"> - <classfiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.core.model/target/classes"/> - </classfiles> - <sourcefiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.core.model/src"/> - </sourcefiles> - </group> - - <group name="org.eclipse.tcf.te.tcf.filesystem.core"> - <classfiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.filesystem.core/target/classes"/> - </classfiles> - <sourcefiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.filesystem.core/src"/> - </sourcefiles> - </group> - - <group name="org.eclipse.tcf.te.tcf.launch.core"> - <classfiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.launch.core/target/classes"/> - </classfiles> - <sourcefiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.launch.core/src"/> - </sourcefiles> - </group> - - <group name="org.eclipse.tcf.te.tcf.locator"> - <classfiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.locator/target/classes"/> - </classfiles> - <sourcefiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.locator/src"/> - </sourcefiles> - </group> - - <group name="org.eclipse.tcf.te.tcf.log.core"> - <classfiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.log.core/target/classes"/> - </classfiles> - <sourcefiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.log.core/src"/> - </sourcefiles> - </group> - - <group name="org.eclipse.tcf.te.tcf.processes.core"> - <classfiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.processes.core/target/classes"/> - </classfiles> - <sourcefiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.processes.core/src"/> - </sourcefiles> - </group> - - <group name="org.eclipse.tcf.te.tcf.services.contexts"> - <classfiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.services.contexts/target/classes"/> - </classfiles> - <sourcefiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.services.contexts/src"/> - </sourcefiles> - </group> - - <group name="org.eclipse.tcf.te.tcf.terminals.core"> - <classfiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.terminals.core/target/classes"/> - </classfiles> - <sourcefiles> - <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.terminals.core/src"/> - </sourcefiles> - </group> - - </structure> - - <html destdir="${project.build.directory}/coverage" - footer="Code Coverage Report for Target Explorer ${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> -</project> diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml b/target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml index b71389d05..60618e3d4 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml +++ b/target_explorer/plugins/org.eclipse.tcf.te.tests/pom.xml @@ -13,5 +13,284 @@ <version>1.2.0.qualifier</version> <artifactId>org.eclipse.tcf.te.tests</artifactId> - <packaging>eclipse-plugin</packaging> + <packaging>eclipse-test-plugin</packaging> + + <properties> + <jacoco.append>true</jacoco.append> + + <sdk-version>3.8.2</sdk-version> + <te-version>1.2.0</te-version> + + <ui.test.vmargs>-Xint -Xmx512m -XX:MaxPermSize=256m</ui.test.vmargs> + </properties> + + <profiles> + <profile> + <id>tests</id> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <testSuite>org.eclipse.tcf.te.tests</testSuite> + <testClass>org.eclipse.tcf.te.tests.suites.AllTests</testClass> + <useUIHarness>true</useUIHarness> + <useUIThread>true</useUIThread> + <!-- + <debugPort>8003</debugPort> + --> + <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.feature.feature.group</artifactId> + <version>${te-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 - Target Explorer"> + <group name="org.eclipse.tcf.te.core"> + <classfiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.core/target/classes"/> + </classfiles> + <sourcefiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.core/src"/> + </sourcefiles> + </group> + + <group name="org.eclipse.tcf.te.core.cdt"> + <classfiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.core.cdt/target/classes"/> + </classfiles> + <sourcefiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.core.cdt/src"/> + </sourcefiles> + </group> + + <group name="org.eclipse.tcf.te.launch.core"> + <classfiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.launch.core/target/classes"/> + </classfiles> + <sourcefiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.launch.core/src"/> + </sourcefiles> + </group> + + <group name="org.eclipse.tcf.te.runtime"> + <classfiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime/target/classes"/> + </classfiles> + <sourcefiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime/src"/> + </sourcefiles> + </group> + + <group name="org.eclipse.tcf.te.runtime.concurrent"> + <classfiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.concurrent/target/classes"/> + </classfiles> + <sourcefiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.concurrent/src"/> + </sourcefiles> + </group> + + <group name="org.eclipse.tcf.te.runtime.model"> + <classfiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.model/target/classes"/> + </classfiles> + <sourcefiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.model/src"/> + </sourcefiles> + </group> + + <group name="org.eclipse.tcf.te.runtime.persistence"> + <classfiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.persistence/target/classes"/> + </classfiles> + <sourcefiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.persistence/src"/> + </sourcefiles> + </group> + + <group name="org.eclipse.tcf.te.runtime.services"> + <classfiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.services/target/classes"/> + </classfiles> + <sourcefiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.services/src"/> + </sourcefiles> + </group> + + <group name="org.eclipse.tcf.te.runtime.statushandler"> + <classfiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.statushandler/target/classes"/> + </classfiles> + <sourcefiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.statushandler/src"/> + </sourcefiles> + </group> + + <group name="org.eclipse.tcf.te.runtime.stepper"> + <classfiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.stepper/target/classes"/> + </classfiles> + <sourcefiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.runtime.stepper/src"/> + </sourcefiles> + </group> + + <group name="org.eclipse.tcf.te.tcf.core"> + <classfiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.core/target/classes"/> + </classfiles> + <sourcefiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.core/src"/> + </sourcefiles> + </group> + + <group name="org.eclipse.tcf.te.tcf.core.model"> + <classfiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.core.model/target/classes"/> + </classfiles> + <sourcefiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.core.model/src"/> + </sourcefiles> + </group> + + <group name="org.eclipse.tcf.te.tcf.filesystem.core"> + <classfiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.filesystem.core/target/classes"/> + </classfiles> + <sourcefiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.filesystem.core/src"/> + </sourcefiles> + </group> + + <group name="org.eclipse.tcf.te.tcf.launch.core"> + <classfiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.launch.core/target/classes"/> + </classfiles> + <sourcefiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.launch.core/src"/> + </sourcefiles> + </group> + + <group name="org.eclipse.tcf.te.tcf.locator"> + <classfiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.locator/target/classes"/> + </classfiles> + <sourcefiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.locator/src"/> + </sourcefiles> + </group> + + <group name="org.eclipse.tcf.te.tcf.log.core"> + <classfiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.log.core/target/classes"/> + </classfiles> + <sourcefiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.log.core/src"/> + </sourcefiles> + </group> + + <group name="org.eclipse.tcf.te.tcf.processes.core"> + <classfiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.processes.core/target/classes"/> + </classfiles> + <sourcefiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.processes.core/src"/> + </sourcefiles> + </group> + + <group name="org.eclipse.tcf.te.tcf.services.contexts"> + <classfiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.services.contexts/target/classes"/> + </classfiles> + <sourcefiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.services.contexts/src"/> + </sourcefiles> + </group> + + <group name="org.eclipse.tcf.te.tcf.terminals.core"> + <classfiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.terminals.core/target/classes"/> + </classfiles> + <sourcefiles> + <fileset dir="${basedir}/../org.eclipse.tcf.te.tcf.terminals.core/src"/> + </sourcefiles> + </group> + + </structure> + + <html destdir="${project.build.directory}/coverage" + footer="Code Coverage Report for Target Explorer ${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/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> |