try running the junit through eclipse instead of surefire

Author: etraisnel2

.mvn/extensions.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extensions>
   <extension>
-    <groupId>org.eclipse.tycho.extras</groupId>
-    <artifactId>tycho-pomless</artifactId>
+    <groupId>org.eclipse.tycho</groupId>
+    <artifactId>tycho-build</artifactId>
     <version>4.0.12</version>
   </extension>
 </extensions>

Jenkinsfile

@@ -10,6 +10,8 @@ pipeline {
 	    MVN_QUALITY_PROFILES = '-P full'
 	    JACOCO_EXEC_FILE_PATH = '${WORKSPACE}/jacoco.exec'
 		BUILD_KEY = (github.isPullRequest() ? CHANGE_TARGET : BRANCH_NAME).replaceFirst(/^v/, '')
+		CAPELLA_PRODUCT_PATH = "${WORKSPACE}/capella/capella"
+		CAPELLA_BRANCH = 'master'
 	}
 	stages {
 		stage('Generate TP') {
@@ -60,29 +62,63 @@ pipeline {
 				}
 			}
 		}
-		stage('Run tests') {
-			steps {
-				wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) {
-					script {
-						// Launch test
-						sh 'mvn -Dmaven.test.failure.ignore=true -Dtycho.localArtifacts=ignore integration-test -P tests -e -f pom.xml'
-					}
+		stage('Download Capella') {
+        	steps {
+        		script {
+	        		def capellaURL = capella.getDownloadURL("${CAPELLA_BRANCH}", 'linux', '')
+	        		
+	        		sh "curl -k -o capella.tar.gz ${capellaURL}"
+					sh "tar xvzf capella.tar.gz"
+
+	       		}         
+	     	}
+	    }
+
+    	stage('Install test features') {
+        	steps {
+        		script {
+	        		sh "chmod 755 ${CAPELLA_PRODUCT_PATH}"
+	        		sh "chmod 755 ${WORKSPACE}/capella/jre/bin/java"
+	        		        		
+	        		eclipse.installFeature("${CAPELLA_PRODUCT_PATH}", capella.getTestUpdateSiteURL("${CAPELLA_BRANCH}"), 'org.polarsys.capella.test.feature.feature.group', "-Dlogback.configurationFile=${CAPELLA_PRODUCT_PATH}/configuration/logback.xml")
+	        		
+	        		eclipse.installFeature("${CAPELLA_PRODUCT_PATH}", "file:/${WORKSPACE}/releng/org.polarsys.capella.docgen.site/target/repository/".replace("\\", "/"), 'org.polarsys.capella.docgen.feature.feature.group', "-Dlogback.configurationFile=${CAPELLA_PRODUCT_PATH}/configuration/logback.xml")
+					eclipse.installFeature("${CAPELLA_PRODUCT_PATH}", "file:/${WORKSPACE}/releng/org.polarsys.capella.docgen.site/target/repository/".replace("\\", "/"), 'org.polarsys.capella.docgen.test.ju', "-Dlogback.configurationFile=${CAPELLA_PRODUCT_PATH}/configuration/logback.xml")
+	       		
+				}         
+	     	}
+	    }
+	    
+    	stage('Run tests') {
+        	steps {
+        		script {
+        			wrap([$class: 'Xvnc', takeScreenshot: false, useXauthority: true]) {
+		        		
+		        		tester.runUITests("${CAPELLA_PRODUCT_PATH}", 'CommandLineTestSuite', 'org.polarsys.capella.docgen.test.ju', 
+		        			['org.polarsys.capella.docgen.test.ju.suites.CommandLineTestSuite'])		
+						tester.runUITests("${CAPELLA_PRODUCT_PATH}", 'IFESampleTestSuite', 'org.polarsys.capella.docgen.test.ju', 
+		        			['org.polarsys.capella.docgen.test.ju.suites.IFESampleTestSuite'])		   							
+	        		}
+	        		
+	        		tester.publishTests()
 				}
 			}
 		}
-		stage('Publish results') {
-			steps {
-				junit allowEmptyResults: true, testResults: '*.xml,**/target/surefire-reports/*.xml'
-				sh "mvn -Djacoco.dataFile=$JACOCO_EXEC_FILE_PATH org.jacoco:jacoco-maven-plugin:$JACOCO_VERSION:report $MVN_QUALITY_PROFILES -e -f pom.xml"
-				archiveArtifacts artifacts: 'tests/**'
-      		}
-		}
+		
+		
 		stage('Perform Sonar analysis') {
 			steps {
 				script {
 					sonar.runSonar("eclipse-capella_capella-xhtml-docgen", "eclipse/capella-xhtml-docgen", "sonar-token-capella-xhtml-docgen")
 				}
 			}
 		}
+		
+		
 	}
+	post {
+    	always {
+       		archiveArtifacts artifacts: '**/*.log, *.log, *.xml, **/*.layout'
+    	}
+		}
 }

tests/plugins/org.polarsys.capella.docgen.test.ju/pom.xml

@@ -32,27 +32,7 @@
 	</properties>
 
 	<build>
-  		<plugins>
-  			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<configuration>
-					<product>${capella-rcp-product-id}</product>
-					<application>${capella-application-id}</application>
-					<useUIHarness>true</useUIHarness>
-					<useUIThread>true</useUIThread>
-					<includes>**/*TestSuite.java</includes>
-					<dependencies>
-						<!-- see https://bugs.eclipse.org/bugs/show_bug.cgi?id=462862 -->
-						<dependency>
-							<type>eclipse-plugin</type>
-							<artifactId>org.eclipse.equinox.event</artifactId>
-							<version>0.0.0</version>
-						</dependency>
-					</dependencies>
-				</configuration>
-			</plugin>
+  		<plugins>  			
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>