diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index b000e861..b9349044 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -33,6 +33,7 @@ jobs:
- name: Build with Maven
run: >
./mvnw -f releng/org.eclipse.emf.parsley.parent/pom.xml
+ -Prcp-build
clean verify
- name: Archive UI Tests Screenshots
uses: actions/upload-artifact@v2
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 3eb2fd6e..c3387fe0 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -38,6 +38,7 @@ jobs:
- name: Build with Maven
run: >
./mvnw -f releng/org.eclipse.emf.parsley.parent/pom.xml
+ -Prcp-build
clean verify
- name: Archive UI Tests Screenshots
uses: actions/upload-artifact@v2
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 9ec073e3..16718892 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -33,6 +33,7 @@ jobs:
- name: Build with Maven
run: >
./mvnw -f releng/org.eclipse.emf.parsley.parent/pom.xml
+ -Prcp-build
clean verify
- name: Archive UI Tests Screenshots
uses: actions/upload-artifact@v2
diff --git a/Jenkinsfile b/Jenkinsfile
index d7ab004c..8aeac55b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,7 +21,7 @@ pipeline {
wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) {
sh """
metacity --sm-disable --replace 2> wm.err &
- ./mvnw -f releng/org.eclipse.emf.parsley.parent/pom.xml clean verify
+ ./mvnw -f releng/org.eclipse.emf.parsley.parent/pom.xml clean verify -Prcp-build
"""
}
}
diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/pom.xml b/dsl/org.eclipse.emf.parsley.dsl.tests/pom.xml
index d3d1736a..375462a7 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.tests/pom.xml
+++ b/dsl/org.eclipse.emf.parsley.dsl.tests/pom.xml
@@ -13,25 +13,6 @@
org.eclipse.emf.parsley.dsl.tests
eclipse-test-plugin
-
-
-
- macosx-jvm-flags
-
-
- mac
-
-
-
- -XstartOnFirstThread
-
-
-
-
@@ -47,24 +28,9 @@
org.eclipse.tycho
tycho-surefire-plugin
- ${tycho-version}
-
-
- default-test
- integration-test
-
- ${dsl.tests.skip}
- false
- false
-
- ${tycho.testArgLine} ${uiTestsArgs} ${memoryArgs} ${moduleProperties}
-
-
- test
-
-
-
+
+ ${dsl.tests.skip}
+
diff --git a/dsl/org.eclipse.emf.parsley.dsl.ui.tests/pom.xml b/dsl/org.eclipse.emf.parsley.dsl.ui.tests/pom.xml
index f5e86004..f3e15bf7 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.ui.tests/pom.xml
+++ b/dsl/org.eclipse.emf.parsley.dsl.ui.tests/pom.xml
@@ -20,9 +20,6 @@
mac
-
- -XstartOnFirstThread
-
@@ -63,35 +60,14 @@
org.eclipse.tycho
tycho-surefire-plugin
- ${tycho-version}
-
-
- default-test
- integration-test
-
- ${dsl.tests.skip}
- true
- true
-
- ${tycho.testArgLine} ${uiTestsArgs} ${pdeTestsArgs} ${moduleProperties}
-
- **/org/eclipse/emf/parsley/dsl/ui/tests/*Test.java
-
-
-
-
- org.apache.felix.scr
- 1
- true
-
-
-
-
- test
-
-
-
+
+ ${dsl.tests.skip}
+ true
+ true
+
+ **/org/eclipse/emf/parsley/dsl/ui/tests/*Test.java
+
+
diff --git a/releng/org.eclipse.emf.parsley.parent/pom.xml b/releng/org.eclipse.emf.parsley.parent/pom.xml
index 6e3b5c96..aa5d8683 100644
--- a/releng/org.eclipse.emf.parsley.parent/pom.xml
+++ b/releng/org.eclipse.emf.parsley.parent/pom.xml
@@ -84,8 +84,16 @@
true
${uiTestsArgs} -DskipDragAndDropTests=${skipDragAndDropTests} -Dorg.eclipse.swtbot.search.timeout=20000 -Dorg.eclipse.swt.internal.gtk.cairoGraphics=false
+
--add-modules=ALL-SYSTEM
+
+
+
+
+
+
+
/home/data/httpd/download.eclipse.org/emf-parsley
@@ -622,6 +630,43 @@
+
+
+ macos
+
+
+ mac
+
+
+
+
+ -XstartOnFirstThread
+
+
+
+ jdk12-or-newer
+
+ [12,)
+
+
+ --enable-preview
+
+
+
+ jacoco
+
+
+ ${tycho.testArgLine}
+
+
+
+
+ org.jacoco
+ jacoco-maven-plugin
+
+
+
+
@@ -687,6 +732,31 @@
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ ${maven-surefire-plugin.version}
+
+ ${platformSystemProperties} ${systemProperties} ${additionalTestArguments}
+
+
+
+
+
+ org.eclipse.tycho
+ tycho-surefire-plugin
+ ${tycho-version}
+
+
+ ${previewProperties} ${platformSystemProperties} ${systemProperties} ${moduleProperties} ${additionalTestArguments} ${specialTestArguments}
+ false
+ false
+
+
+
org.codehaus.mojo
build-helper-maven-plugin
diff --git a/tests/org.eclipse.emf.parsley.cdo.tests/pom.xml b/tests/org.eclipse.emf.parsley.cdo.tests/pom.xml
index 57d60bfd..251a6002 100644
--- a/tests/org.eclipse.emf.parsley.cdo.tests/pom.xml
+++ b/tests/org.eclipse.emf.parsley.cdo.tests/pom.xml
@@ -23,14 +23,8 @@
org.eclipse.tycho
tycho-surefire-plugin
- ${tycho-version}
${simple.tests.skip}
- false
- false
-
- ${tycho.testArgLine} ${memoryArgs} ${moduleProperties}
**/*Tests.java
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot.cdo/pom.xml b/tests/org.eclipse.emf.parsley.tests.swtbot.cdo/pom.xml
index 8429cf15..2eab5fe8 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot.cdo/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot.cdo/pom.xml
@@ -13,19 +13,9 @@
org.eclipse.emf.parsley.tests.swtbot.cdo
eclipse-test-plugin
-
-
- macosx-jvm-flags
-
-
- mac
-
-
-
- -XstartOnFirstThread
-
-
-
+
+ ${swtbotTestsArgs}
+
@@ -37,28 +27,16 @@
org.eclipse.tycho
tycho-surefire-plugin
- ${tycho-version}
${swtbot.cdo.tests.skip}
true
false
-
- ${tycho.testArgLine} ${swtbotTestsArgs} ${moduleProperties}
**/*Test*.java
-
-
-
- org.apache.felix.scr
- 1
- true
-
-
-
+
org.eclipse.tycho
target-platform-configuration
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot.e4/pom.xml b/tests/org.eclipse.emf.parsley.tests.swtbot.e4/pom.xml
index 9e8c233b..adfdfb06 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot.e4/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot.e4/pom.xml
@@ -12,20 +12,10 @@
org.eclipse.emf.parsley.tests.swtbot.e4
eclipse-test-plugin
-
-
-
- macosx-jvm-flags
-
-
- mac
-
-
-
- -XstartOnFirstThread
-
-
-
+
+
+ ${swtbotTestsArgs}
+
@@ -37,15 +27,11 @@
org.eclipse.tycho
tycho-surefire-plugin
- ${tycho-version}
true
false
org.eclipse.emf.parsley.examples.eclipse4.product
org.eclipse.e4.ui.workbench.swt.E4Application
-
- ${tycho.testArgLine} ${swtbotTestsArgs} ${moduleProperties}
0
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot.examples/pom.xml b/tests/org.eclipse.emf.parsley.tests.swtbot.examples/pom.xml
index e709dce7..d539e59f 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot.examples/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot.examples/pom.xml
@@ -12,20 +12,10 @@
org.eclipse.emf.parsley.tests.swtbot.examples
eclipse-test-plugin
-
-
-
- macosx-jvm-flags
-
-
- mac
-
-
-
- -XstartOnFirstThread
-
-
-
+
+
+ ${swtbotTestsArgs}
+
@@ -37,24 +27,12 @@
org.eclipse.tycho
tycho-surefire-plugin
- ${tycho-version}
${swtbot.tests.skip}
true
false
org.eclipse.emf.parsley.examples.mail.rcp.product
org.eclipse.emf.parsley.examples.mail.rcp.application
-
- ${tycho.testArgLine} ${swtbotTestsArgs} ${moduleProperties}
-
-
-
- org.apache.felix.scr
- 1
- true
-
-
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot/pom.xml b/tests/org.eclipse.emf.parsley.tests.swtbot/pom.xml
index 458416be..ab4b64fc 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot/pom.xml
@@ -12,7 +12,11 @@
org.eclipse.emf.parsley.tests.swtbot
eclipse-test-plugin
-
+
+
+ ${swtbotTestsArgs}
+
+
macosx-jvm-flags
@@ -21,9 +25,6 @@
mac
-
- -XstartOnFirstThread
-
@@ -59,19 +60,11 @@
org.eclipse.tycho
tycho-surefire-plugin
- ${tycho-version}
default-test
integration-test
- ${swtbot.tests.skip}
- true
- false
-
- ${tycho.testArgLine} ${swtbotTestsArgs} ${moduleProperties}
- ${project.build.outputDirectory}
**/org/eclipse/emf/parsley/tests/swtbot/*WizardsTest*.java
**/org/eclipse/emf/parsley/tests/swtbot/*DslEditorTest*.java
@@ -80,29 +73,17 @@
**/org/eclipse/emf/parsley/tests/swtbot/*Test*.java
-
-
- 0
-
test
-
draganddrop-test
integration-test
- ${swtbot.tests.skip}
- true
- false
-
- ${tycho.testArgLine} ${swtbotTestsArgs} ${moduleProperties}
- ${project.build.outputDirectory}
**/org/eclipse/emf/parsley/tests/swtbot/*WizardsTest*.java
**/org/eclipse/emf/parsley/tests/swtbot/*DslEditorTest*.java
@@ -110,11 +91,6 @@
**/org/eclipse/emf/parsley/tests/swtbot/*DropTest*.java
-
-
- 0
-
test
@@ -124,16 +100,6 @@
PDEBasedTests
integration-test
- ${swtbot.tests.skip}
-
- true
- false
-
- ${tycho.testArgLine} ${pdeTestsArgs} ${swtbotTestsArgs} ${moduleProperties}
- ${project.build.outputDirectory}
**/org/eclipse/emf/parsley/tests/swtbot/*AbstractTest*.java
@@ -141,17 +107,24 @@
**/org/eclipse/emf/parsley/tests/swtbot/*DslEditorTest*.java
**/org/eclipse/emf/parsley/tests/swtbot/*WizardsTest*.java
-
- 0
-
test
+
+ ${swtbot.tests.skip}
+ true
+ false
+
+
+ 0
+
+
-
+
org.eclipse.tycho
target-platform-configuration
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot/src/org/eclipse/emf/parsley/tests/swtbot/EmfParsleySWTBotAbstractTests.java b/tests/org.eclipse.emf.parsley.tests.swtbot/src/org/eclipse/emf/parsley/tests/swtbot/EmfParsleySWTBotAbstractTests.java
index 1f17320e..71f06c84 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot/src/org/eclipse/emf/parsley/tests/swtbot/EmfParsleySWTBotAbstractTests.java
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot/src/org/eclipse/emf/parsley/tests/swtbot/EmfParsleySWTBotAbstractTests.java
@@ -494,7 +494,9 @@ void printJobs() {
System.err.println("### JOBS: " + job.toString() + " state: " + job.getState());
}
}
- });
+ }, SWTBotPreferences.TIMEOUT + SWTBotPreferences.TIMEOUT);
+ // waiting for Jobs might require lots of time, so better
+ // to double the timeout
}
private static void openJavaPerspective() throws InterruptedException {
diff --git a/tests/org.eclipse.emf.parsley.tests/pom.xml b/tests/org.eclipse.emf.parsley.tests/pom.xml
index ed5bb40a..b646b017 100644
--- a/tests/org.eclipse.emf.parsley.tests/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests/pom.xml
@@ -22,39 +22,21 @@
-
-
- macosx-jvm-flags
-
-
- mac
-
-
-
- -XstartOnFirstThread
-
-
-
-
-
org.jacoco
jacoco-maven-plugin
-
org.eclipse.xtend
xtend-maven-plugin
-
org.apache.maven.plugins
maven-surefire-plugin
- ${maven-surefire-plugin.version}
- ${tycho.testArgLine} ${uiTestsArgs} ${memoryArgs} ${moduleProperties}
${project.build.outputDirectory}
**/*Test.java
@@ -86,7 +65,6 @@
org.eclipse.tycho
tycho-surefire-plugin
- ${tycho-version}
default-test