Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue 11 jacoco #63

Merged
merged 8 commits into from
Dec 7, 2022
Merged

Issue 11 jacoco #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d23087d
jacoco configured in pluginManagement and profile
LorenzoBettini Dec 6, 2022
e8219cc
enabled jacoco profile
LorenzoBettini Dec 6, 2022
b43ed17
Jenkins: also archive jacoco report
LorenzoBettini Dec 6, 2022
17437f9
Jenkins: publishHTML JaCoCo report
LorenzoBettini Dec 6, 2022
b8e16de
configuration of jacoco outside execution
LorenzoBettini Dec 6, 2022
56ab79a
Revert "Jenkins: publishHTML JaCoCo report"
LorenzoBettini Dec 6, 2022
5fbc3d5
exclude dsl/model/**/*.class
LorenzoBettini Dec 7, 2022
4fd79ae
jacoco step in Jenkinsfile
LorenzoBettini Dec 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
20 changes: 18 additions & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
)
}
}
}
Expand All @@ -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/'
}
}
}
5 changes: 0 additions & 5 deletions dsl/org.eclipse.emf.parsley.dsl.tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 0 additions & 5 deletions dsl/org.eclipse.emf.parsley.dsl.ui.tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
58 changes: 37 additions & 21 deletions releng/org.eclipse.emf.parsley.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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 -->
Expand Down
5 changes: 0 additions & 5 deletions tests/org.eclipse.emf.parsley.cdo.tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 0 additions & 3 deletions tests/org.eclipse.emf.parsley.tests.coverage/README
View file
Open in desktop

This file was deleted.

130 changes: 128 additions & 2 deletions tests/org.eclipse.emf.parsley.tests.coverage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
5 changes: 0 additions & 5 deletions tests/org.eclipse.emf.parsley.tests.swtbot.cdo/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 0 additions & 5 deletions tests/org.eclipse.emf.parsley.tests.swtbot.e4/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 0 additions & 5 deletions tests/org.eclipse.emf.parsley.tests.swtbot.examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 0 additions & 5 deletions tests/org.eclipse.emf.parsley.tests.swtbot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions tests/org.eclipse.emf.parsley.tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down