Merge pull request #63 from eclipse-emf-parsley/issue-11-jacoco

Issue 11 jacoco
eclipse-emf-parsley · Dec 7, 2022 · 1172bc0 · 1172bc0
2 parents 0201e28 + 4fd79ae
commit 1172bc0
Show file tree

Hide file tree

Showing 13 changed files with 190 additions and 67 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -39,6 +39,7 @@ jobs:
       run: >
         ./mvnw -f releng/org.eclipse.emf.parsley.parent/pom.xml
         -Prcp-build
+        -Pjacoco
         clean verify
     - name: Archive UI Tests Screenshots
       uses: actions/upload-artifact@v2
@@ -52,6 +53,12 @@ jobs:
       with:
         name: logs-${{ runner.os }}
         path: '**/target/work/data/.metadata/.log'
+    - name: Archive Coverage Report
+      uses: actions/upload-artifact@v2
+      if: ${{ success() }}
+      with:
+        name: jacoco-coverage-${{ runner.os }}
+        path: '**/site/jacoco-aggregate'
 
   maven-build:
     runs-on: ubuntu-latest

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -21,9 +21,25 @@ 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 -Prcp-build
+            ./mvnw -f releng/org.eclipse.emf.parsley.parent/pom.xml clean verify -Prcp-build,jacoco
           """
         }
+        jacoco (
+          classPattern: 'plugins/org.eclipse.emf.parsley.*/**/classes,dsl/org.eclipse.emf.parsley.dsl/**/classes,dsl/org.eclipse.emf.parsley.dsl.ui/**/classes,dsl/org.eclipse.emf.parsley.dsl.additional.builder/**/classes',
+          exclusionPattern: '**/*StandaloneSetup*.class,**/*ExecutableExtensionFactory*.class,**/*UiModule*.class,**/*RuntimeModule*.class,**/*Activator*.class,**/*Nature*.class,**/EmfParsleyDslProjectCreator.class,**/EmfParsleyDslNewProjectWizard.class,**/Abstract*ProposalProvider*,**/*Internal*,**/*Sequencer*,**/*GrammarAccess*,**/antlr/*.*,**/internal/*.*,**/org/eclipse/emf/parsley/dsl/model/impl/*.*,**/org/eclipse/emf/parsley/dsl/model/util/*.*,**/org/eclipse/emf/parsley/rap/**/*.*,**/org/eclipse/emf/parsley/runtime/**/*.*,**/org/eclipse/emf/parsley/tests/**/*.*,**/org/eclipse/emf/parsley/junit4/**/*.*,**/org/eclipse/emf/parsley/inject/parameters/*.*',
+          maximumBranchCoverage: '100',
+          maximumClassCoverage: '100',
+          maximumComplexityCoverage: '100',
+          maximumLineCoverage: '100',
+          maximumMethodCoverage: '100',
+          minimumBranchCoverage: '90',
+          minimumClassCoverage: '90',
+          minimumComplexityCoverage: '90',
+          minimumLineCoverage: '90',
+          minimumMethodCoverage: '90',
+          sourceInclusionPattern: '**/*.java',
+          sourcePattern: 'plugins/org.eclipse.emf.parsley.*/src,plugins/org.eclipse.emf.parsley.*/xtend-gen,dsl/org.eclipse.emf.parsley.dsl/src,dsl/org.eclipse.emf.parsley.dsl/xtend-gen,dsl/org.eclipse.emf.parsley.dsl.ui/src,dsl/org.eclipse.emf.parsley.dsl.ui/xtend-gen,dsl/org.eclipse.emf.parsley.dsl.additional.builder/src,dsl/org.eclipse.emf.parsley.dsl.additional.builder/xtend-gen'
+        )
       }
     }
   }
@@ -34,7 +50,7 @@ pipeline {
       archiveArtifacts artifacts: '**/target/work/data/.metadata/.log, **/screenshots/, **/wm.err, **/hs_err_pid*.log'
     }
     success {
-      archiveArtifacts artifacts: 'target/repository/, **/target/work/data/.metadata/.log'
+      archiveArtifacts artifacts: 'target/repository/, **/target/work/data/.metadata/.log, **/site/jacoco-aggregate/'
     }
   }
 }
diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/pom.xml b/dsl/org.eclipse.emf.parsley.dsl.tests/pom.xml
@@ -15,11 +15,6 @@
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-			</plugin>
-
 			<plugin>
 				<groupId>org.eclipse.xtend</groupId>
 				<artifactId>xtend-maven-plugin</artifactId>

diff --git a/dsl/org.eclipse.emf.parsley.dsl.ui.tests/pom.xml b/dsl/org.eclipse.emf.parsley.dsl.ui.tests/pom.xml
@@ -47,11 +47,6 @@
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-			</plugin>
-
 			<plugin>
 				<groupId>org.eclipse.xtend</groupId>
 				<artifactId>xtend-maven-plugin</artifactId>

diff --git a/releng/org.eclipse.emf.parsley.parent/pom.xml b/releng/org.eclipse.emf.parsley.parent/pom.xml
@@ -94,6 +94,8 @@
 		<additionalTestArguments></additionalTestArguments>
 		<specialTestArguments></specialTestArguments>
 
+		<jacoco-aggregate-report>../../tests/org.eclipse.emf.parsley.tests.coverage/target/site/jacoco-aggregate/jacoco.xml</jacoco-aggregate-report>
+
 		<!-- <jacoco.reportPath>../target/jacoco.exec</jacoco.reportPath> -->
 
 		<parsley.download.area>/home/data/httpd/download.eclipse.org/emf-parsley</parsley.download.area>
@@ -205,7 +207,6 @@
 				<activeByDefault>true</activeByDefault>
 			</activation>
 			<modules>
-				<module>../../tests/org.eclipse.emf.parsley.tests.coverage</module>
 				<module>../../devtools/org.eclipse.emf.parsley.targetplatform</module>
 
 				<module>../../plugins/org.eclipse.emf.parsley.runtime.common</module>
@@ -288,6 +289,8 @@
 				<module>../../examples/org.eclipse.emf.parsley.examples.eclipse4.parsleypart</module>
 				<module>../../examples/org.eclipse.emf.parsley.examples.eclipse4.product.feature</module>
 				<module>../../tests/org.eclipse.emf.parsley.tests.swtbot.e4</module>
+
+				<module>../../tests/org.eclipse.emf.parsley.tests.coverage</module>
 			</modules>
 
 			<build>
@@ -665,6 +668,17 @@
 						<artifactId>jacoco-maven-plugin</artifactId>
 					</plugin>
 				</plugins>
+				<pluginManagement>
+					<plugins>
+						<plugin>
+							<groupId>org.eclipse.xtend</groupId>
+							<artifactId>xtend-maven-plugin</artifactId>
+							<configuration>
+								<xtendAsPrimaryDebugSource>true</xtendAsPrimaryDebugSource>
+							</configuration>
+						</plugin>
+					</plugins>
+				</pluginManagement>
 			</build>
 		</profile>
 	</profiles>
@@ -788,28 +802,30 @@
 							<goals>
 								<goal>prepare-agent</goal>
 							</goals>
-							<configuration>
-								<!-- Where to put jacoco coverage report -->
-								<destFile>${sonar.jacoco.reportPath}</destFile>
-								<includes>
-									<include>org.eclipse.emf.parsley.*</include>
-								</includes>
-								<excludes>
-									<exclude>**/src-gen/**/*.java</exclude>
-									<exclude>**.antlr**</exclude>
-									<exclude>**.parseTree**</exclude>
-									<exclude>**Abstract*RuntimeModule.java</exclude>
-									<exclude>**/*SetupGenerated*.java</exclude>
-									<exclude>**/Abstract*Validator.java</exclude>
-									<exclude>**/*GrammarAccess.java</exclude>
-									<exclude>**/Abstract*UiModule.java</exclude>
-									<exclude>**/Abstract*ProposalProvider.java</exclude>
-									<exclude>**/*Test.java</exclude>
-								</excludes>
-								<append>true</append>
-							</configuration>
 						</execution>
 					</executions>
+					<configuration>
+						<excludes>
+							<!-- EMF generated Java classes -->
+							<exclude>**/dsl/model/**/*.class</exclude>
+							<!-- Antlr generated Java classes -->
+							<exclude>**/antlr/**/*.class</exclude>
+							<!-- We don't have a custom serializer -->
+							<exclude>**/serializer/*.class</exclude>
+							<!-- generated files -->
+							<exclude>**/*Abstract*RuntimeModule.class</exclude>
+							<exclude>**/*StandaloneSetup*.class</exclude>
+							<exclude>**/*Abstract*Validator.class</exclude>
+							<exclude>**/*Abstract*ScopeProvider.class</exclude>
+							<exclude>**/*GrammarAccess*.class</exclude>
+							<exclude>**/*Abstract*UiModule.class</exclude>
+							<exclude>**/**ExecutableExtensionFactory.class</exclude>
+							<exclude>**/*Abstract*ProposalProvider.class</exclude>
+							<exclude>**/internal/*.class</exclude>
+							<exclude>**/*ProjectTemplateProvider.class</exclude>
+							<exclude>**/*ProjectTemplate.class</exclude>
+						</excludes>
+					</configuration>
 				</plugin>
 
 				<!--  see https://bugs.eclipse.org/bugs/show_bug.cgi?id=419172#c17 -->

diff --git a/tests/org.eclipse.emf.parsley.cdo.tests/pom.xml b/tests/org.eclipse.emf.parsley.cdo.tests/pom.xml
@@ -15,11 +15,6 @@
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-			</plugin>
-
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>

diff --git a/tests/org.eclipse.emf.parsley.tests.coverage/README b/tests/org.eclipse.emf.parsley.tests.coverage/README
diff --git a/tests/org.eclipse.emf.parsley.tests.coverage/pom.xml b/tests/org.eclipse.emf.parsley.tests.coverage/pom.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -13,4 +12,131 @@
 	<artifactId>org.eclipse.emf.tests.coverage</artifactId>
 
 	<packaging>pom</packaging>
+
+	<profiles>
+		<profile>
+			<id>jacoco</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.jacoco</groupId>
+						<artifactId>jacoco-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<phase>verify</phase>
+								<goals>
+									<goal>report-aggregate</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>org.eclipse.emf.parsley.common</artifactId>
+			<version>${project.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>org.eclipse.emf.parsley.editors.common</artifactId>
+			<version>${project.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>org.eclipse.emf.parsley.generator.common</artifactId>
+			<version>${project.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>org.eclipse.emf.parsley.runtime.common</artifactId>
+			<version>${project.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>org.eclipse.emf.parsley.views.common</artifactId>
+			<version>${project.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>org.eclipse.emf.parsley.wizards</artifactId>
+			<version>${project.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>org.eclipse.emf.parsley.dsl</artifactId>
+			<version>${project.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>org.eclipse.emf.parsley.dsl.ui</artifactId>
+			<version>${project.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>org.eclipse.emf.parsley.dsl.additional.builder</artifactId>
+			<version>${project.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>org.eclipse.emf.parsley.tests</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>org.eclipse.emf.parsley.cdo.tests</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>org.eclipse.emf.parsley.dsl.tests</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>org.eclipse.emf.parsley.dsl.ui.tests</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>org.eclipse.emf.parsley.tests.swtbot</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>org.eclipse.emf.parsley.tests.swtbot.cdo</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>org.eclipse.emf.parsley.tests.swtbot.examples</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>org.eclipse.emf.parsley.tests.swtbot.e4</artifactId>
+			<version>${project.version}</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 </project>
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot.cdo/pom.xml b/tests/org.eclipse.emf.parsley.tests.swtbot.cdo/pom.xml
@@ -19,11 +19,6 @@
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-			</plugin>
-
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>

diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot.e4/pom.xml b/tests/org.eclipse.emf.parsley.tests.swtbot.e4/pom.xml
@@ -19,11 +19,6 @@
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-			</plugin>
-
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>

diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot.examples/pom.xml b/tests/org.eclipse.emf.parsley.tests.swtbot.examples/pom.xml
@@ -19,11 +19,6 @@
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-			</plugin>
-
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>

diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot/pom.xml b/tests/org.eclipse.emf.parsley.tests.swtbot/pom.xml
@@ -52,11 +52,6 @@
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-			</plugin>
-
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>

diff --git a/tests/org.eclipse.emf.parsley.tests/pom.xml b/tests/org.eclipse.emf.parsley.tests/pom.xml
@@ -24,10 +24,6 @@
 
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.eclipse.xtend</groupId>
 				<artifactId>xtend-maven-plugin</artifactId>