further common configuration for swtbot

eclipse-emf-parsley · Dec 6, 2022 · bf46f2c · bf46f2c
1 parent d201f07
commit bf46f2c
Showing 1 changed file with 10 additions and 22 deletions.
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot/pom.xml b/tests/org.eclipse.emf.parsley.tests.swtbot/pom.xml
@@ -65,9 +65,6 @@
 						<id>default-test</id>
 						<phase>integration-test</phase>
 						<configuration>
-							<skip>${swtbot.tests.skip}</skip>
-							<useUIHarness>true</useUIHarness>
-							<useUIThread>false</useUIThread>
 							<excludes>
 								<exclude>**/org/eclipse/emf/parsley/tests/swtbot/*WizardsTest*.java</exclude>
 								<exclude>**/org/eclipse/emf/parsley/tests/swtbot/*DslEditorTest*.java</exclude>
@@ -76,11 +73,6 @@
 							<includes>
 								<include>**/org/eclipse/emf/parsley/tests/swtbot/*Test*.java</include>
 							</includes>
-							<!-- Disable GTK3 with Luna because it makes the test hang (bug in IcedTea 
-								http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1736) -->
-							<environmentVariables>
-								<SWT_GTK3>0</SWT_GTK3>
-							</environmentVariables>
 						</configuration>
 						<goals>
 							<goal>test</goal>
@@ -92,21 +84,13 @@
 						<id>draganddrop-test</id>
 						<phase>integration-test</phase>
 						<configuration>
-							<skip>${swtbot.tests.skip}</skip>
-							<useUIHarness>true</useUIHarness>
-							<useUIThread>false</useUIThread>
 							<excludes>
 								<exclude>**/org/eclipse/emf/parsley/tests/swtbot/*WizardsTest*.java</exclude>
 								<exclude>**/org/eclipse/emf/parsley/tests/swtbot/*DslEditorTest*.java</exclude>
 							</excludes>
 							<includes>
 								<include>**/org/eclipse/emf/parsley/tests/swtbot/*DropTest*.java</include>
 							</includes>
-							<!-- Disable GTK3 with Luna because it makes the test hang (bug in IcedTea 
-								http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1736) -->
-							<environmentVariables>
-								<SWT_GTK3>0</SWT_GTK3>
-							</environmentVariables>
 						</configuration>
 						<goals>
 							<goal>test</goal>
@@ -116,25 +100,29 @@
 						<id>PDEBasedTests</id>
 						<phase>integration-test</phase>
 						<configuration>
-							<skip>${swtbot.tests.skip}</skip>
-							<useUIHarness>true</useUIHarness>
-							<useUIThread>false</useUIThread>
 							<excludes>
 								<exclude>**/org/eclipse/emf/parsley/tests/swtbot/*AbstractTest*.java</exclude>
 							</excludes>
 							<includes>
 								<include>**/org/eclipse/emf/parsley/tests/swtbot/*DslEditorTest*.java</include>
 								<include>**/org/eclipse/emf/parsley/tests/swtbot/*WizardsTest*.java</include>
 							</includes>
-							<environmentVariables>
-								<SWT_GTK3>0</SWT_GTK3>
-							</environmentVariables>
 						</configuration>
 						<goals>
 							<goal>test</goal>
 						</goals>
 					</execution>
 				</executions>
+				<configuration>
+					<skip>${swtbot.tests.skip}</skip>
+					<useUIHarness>true</useUIHarness>
+					<useUIThread>false</useUIThread>
+					<!-- Disable GTK3 with Luna because it makes the test hang (bug in IcedTea 
+						http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1736) -->
+					<environmentVariables>
+						<SWT_GTK3>0</SWT_GTK3>
+					</environmentVariables>
+				</configuration>
 			</plugin>
 
 			<plugin>