Skip to main content
summaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorTamas Borbas2017-01-26 15:41:43 +0000
committerTamas Borbas2017-03-13 12:40:36 +0000
commit27afc162f7e7be1832d7df70da3b62a9628c7c42 (patch)
tree7fad59eeee12e54b7f387bc507de446af154ea74 /releng
parentb50c77c16e043ca756ce2092c23f3e2fe6cfa76c (diff)
downloadorg.eclipse.emf.diffmerge.core-27afc162f7e7be1832d7df70da3b62a9628c7c42.tar.gz
org.eclipse.emf.diffmerge.core-27afc162f7e7be1832d7df70da3b62a9628c7c42.tar.xz
org.eclipse.emf.diffmerge.core-27afc162f7e7be1832d7df70da3b62a9628c7c42.zip
[513564] Convert WindowTester UI tests to RCPTT
The previous version of GUI tests are migrated to RCPTT. GUI tests are added to maven build (profile name: gui.test). Product is added (for gui.test profile) because necessary for RCPTT. Change-Id: I703e47d7abfcfea3188e75c1829b0cbe50ca9ece Signed-off-by: Tamas Borbas <tamas.borbas@incquerylabs.com>
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.emf.diffmerge.configuration/pom.xml13
-rw-r--r--releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target6
-rw-r--r--releng/org.eclipse.emf.diffmerge.tests.ui.product/.project11
-rw-r--r--releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product84
-rw-r--r--releng/org.eclipse.emf.diffmerge.tests.ui.product/pom.xml43
-rw-r--r--releng/pom.xml9
6 files changed, 165 insertions, 1 deletions
diff --git a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
index 1ec21007..a1fd932f 100644
--- a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
@@ -9,6 +9,7 @@
<tycho.version>1.0.0</tycho.version>
<tycho.extras.version>${tycho.version}</tycho.extras.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <rcptt.version>2.1.0</rcptt.version>
<cbi.jarsigner.version>1.1.3</cbi.jarsigner.version>
</properties>
@@ -149,4 +150,14 @@
</pluginRepositories>
</profile>
</profiles>
-</project> \ No newline at end of file
+ <pluginRepositories>
+ <pluginRepository>
+ <id>rcptt-releases</id>
+ <name>RCPTT Maven repository</name>
+ <url>https://repo.eclipse.org/content/repositories/rcptt-releases</url>
+ <snapshots>
+ <updatePolicy>always</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+</project>
diff --git a/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target b/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target
index 9b7389c6..08947f19 100644
--- a/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target
+++ b/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target
@@ -18,5 +18,11 @@
<unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="4.1.3.201701271300"/>
<repository location="http://download.eclipse.org/sirius/updates/releases/4.1.3/mars"/>
</location>
+<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.platform.ide" version="4.4.2.M20150204-1700"/>
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.10.2.v20150204-1316"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.10.1.v20150204-1700"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.4"/>
+</location>
</locations>
</target>
diff --git a/releng/org.eclipse.emf.diffmerge.tests.ui.product/.project b/releng/org.eclipse.emf.diffmerge.tests.ui.product/.project
new file mode 100644
index 00000000..b7e43a3e
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.tests.ui.product/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.tests.ui.product</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product b/releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product
new file mode 100644
index 00000000..8ca6ad72
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="RCPTT GUI Tests Product" uid="org.eclipse.emf.diffmerge.tests.ui.product" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="0.1.0.qualifier" useFeatures="true" includeLaunchers="true">
+
+ <configIni use="default">
+ </configIni>
+
+ <launcherArgs>
+ <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
+ </vmArgsMac>
+ </launcherArgs>
+
+ <windowImages/>
+
+ <launcher>
+ <solaris/>
+ <win useIco="false">
+ <bmp/>
+ </win>
+ </launcher>
+
+ <vm>
+ </vm>
+
+ <plugins>
+ </plugins>
+
+ <features>
+ <feature id="org.eclipse.emf.diffmerge.feature" version="0.7.0.qualifier"/>
+ <feature id="org.eclipse.emf"/>
+ <feature id="org.eclipse.platform"/>
+ <feature id="org.eclipse.jdt"/>
+ <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>
+ <feature id="org.eclipse.emf.mapping.ecore"/>
+ <feature id="org.eclipse.help"/>
+ <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>
+ <feature id="org.eclipse.emf.common.ui"/>
+ <feature id="org.eclipse.emf.codegen"/>
+ <feature id="org.eclipse.emf.common"/>
+ <feature id="org.eclipse.equinox.p2.core.feature"/>
+ <feature id="org.eclipse.emf.mapping.ui"/>
+ <feature id="org.eclipse.ecf.core.ssl.feature"/>
+ <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
+ <feature id="org.eclipse.emf.mapping"/>
+ <feature id="org.eclipse.emf.edit"/>
+ <feature id="org.eclipse.emf.ecore"/>
+ <feature id="org.eclipse.equinox.p2.user.ui"/>
+ <feature id="org.eclipse.emf.codegen.ui"/>
+ <feature id="org.eclipse.equinox.p2.extras.feature"/>
+ <feature id="org.eclipse.emf.databinding.edit"/>
+ <feature id="org.eclipse.emf.codegen.ecore"/>
+ <feature id="org.eclipse.emf.converter"/>
+ <feature id="org.eclipse.emf.edit.ui"/>
+ <feature id="org.eclipse.emf.codegen.ecore.ui"/>
+ <feature id="org.eclipse.rcp"/>
+ <feature id="org.eclipse.ecf.core.feature"/>
+ <feature id="org.eclipse.emf.ecore.editor"/>
+ <feature id="org.eclipse.equinox.p2.rcp.feature"/>
+ <feature id="org.eclipse.ecf.filetransfer.feature"/>
+ <feature id="org.eclipse.emf.mapping.ecore.editor"/>
+ <feature id="org.eclipse.emf.databinding"/>
+ <feature id="org.eclipse.emf.ecore.edit"/>
+ <feature id="org.eclipse.e4.rcp"/>
+ <feature id="org.eclipse.emf.diffmerge.tests.feature" version="0.1.0.qualifier"/>
+ </features>
+
+ <configurations>
+ <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
+ <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+ <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
+ <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+ <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="0" />
+ <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+ </configurations>
+
+ <preferencesInfo>
+ <targetfile overwrite="false"/>
+ </preferencesInfo>
+
+ <cssInfo>
+ </cssInfo>
+
+</product>
diff --git a/releng/org.eclipse.emf.diffmerge.tests.ui.product/pom.xml b/releng/org.eclipse.emf.diffmerge.tests.ui.product/pom.xml
new file mode 100644
index 00000000..a5abd08a
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.tests.ui.product/pom.xml
@@ -0,0 +1,43 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>org.eclipse.emf.diffmerge.tests.ui.product</artifactId>
+ <packaging>eclipse-repository</packaging>
+
+ <parent>
+ <groupId>org.eclipse.emf.diffmerge</groupId>
+ <artifactId>org.eclipse.emf.diffmerge.releng</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
+ </parent>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-repository-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <includeAllDependencies>true</includeAllDependencies>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-p2-director-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <executions>
+ <execution>
+ <id>materialize-products</id>
+ <goals>
+ <goal>materialize-products</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>archive-products</id>
+ <goals>
+ <goal>archive-products</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project> \ No newline at end of file
diff --git a/releng/pom.xml b/releng/pom.xml
index 05b5834a..8578a531 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -14,5 +14,14 @@
<module>org.eclipse.emf.diffmerge.target</module>
<module>org.eclipse.emf.diffmerge.core.javadoc</module>
</modules>
+ <profiles>
+ <profile>
+ <id>gui.test</id>
+ <modules>
+ <!-- Product for GUI test -->
+ <module>org.eclipse.emf.diffmerge.tests.ui.product</module>
+ </modules>
+ </profile>
+ </profiles>
</project>

Back to the top