Skip to content

Commit

Permalink
Reworked test coverage reports
Browse files Browse the repository at this point in the history
  • Loading branch information
@vpinna80
vpinna80 committed Dec 22, 2023
1 parent 582e838 commit e690700
Show file tree
Hide file tree
Showing 3 changed files with 111 additions and 35 deletions.
40 changes: 20 additions & 20 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,12 +238,13 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.compiler.release>11</maven.compiler.release>
<site.version>3.12.1</site.version>
<site.version>3.12.1</site.version>
<reflow.version>2.3.4</reflow.version>
<asciidoctor.version>2.2.4</asciidoctor.version>
<restdocs.version>2.0.8.RELEASE</restdocs.version>
<doxia.markdown.version>1.12.0</doxia.markdown.version>
<sf-fs.version>3.0.0-M3</sf-fs.version>
<jacoco.version>0.8.11</jacoco.version>
<scala.version>2.13.11</scala.version>
<scala.compat.version>2.13</scala.compat.version>
<scala-compiler.version>4.8.1</scala-compiler.version>
Expand All @@ -270,6 +271,8 @@
<scmUrl>https://github.com/vpinna80/VTL</scmUrl>
<siteUrl>https://vpinna80.github.io/VTL</siteUrl>
<licenseUrl>https://joinup.ec.europa.eu/sites/default/files/custom-page/attachment/2020-03/EUPL-1.2%20EN.txt</licenseUrl>
<jacoco.ut.file>${project.build.directory}/jacoco-ut.exec</jacoco.ut.file>
<jacoco.it.file>${project.build.directory}/jacoco-it.exec</jacoco.it.file>
</properties>

<reporting>
Expand Down Expand Up @@ -809,19 +812,31 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version>
<version>${jacoco.version}</version>
<executions>
<execution>
<phase>test-compile</phase>
<id>test</id>
<goals>
<goal>prepare-agent</goal>
</goals>
<configuration>
<inclNoLocationClasses>false</inclNoLocationClasses>
<includes>it.bancaditalia.oss.vtl.*</includes>
<destFile>${jacoco.ut.file}</destFile>
</configuration>
</execution>
<execution>
<id>it-test</id>
<phase>pre-integration-test</phase>
<goals>
<goal>prepare-agent-integration</goal>
</goals>
<configuration>
<destFile>${jacoco.it.file}</destFile>
</configuration>
</execution>
</executions>
<configuration>
<inclNoLocationClasses>false</inclNoLocationClasses>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -1087,21 +1102,6 @@
<propertyPrefix>version</propertyPrefix>
</configuration>
</execution>
<execution>
<id>gen-wheel-version</id>
<phase>pre-site</phase>
<goals>
<goal>regex-property</goal>
</goals>
<configuration>
<name>wheel-version</name>
<value>
${version.majorVersion}.${version.minorVersion}.${version.qualifier}${version.incrementalVersion}</value>
<regex>SNAPSHOT</regex>
<replacement>dev</replacement>
<failIfNoMatch>false</failIfNoMatch>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
Expand Down
99 changes: 84 additions & 15 deletions vtl-bundles/vtl-coverage/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,17 @@
<dependency>
<groupId>it.bancaditalia.oss.vtl</groupId>
<artifactId>vtl-rest</artifactId>
<type>war</type>
<version>${project.version}</version>
<classifier>classes</classifier>
</dependency>
</dependencies>
</profile>
<profile>
<id>with-spark</id>
<dependencies>
<dependency>
<groupId>it.bancaditalia.oss.vtl</groupId>
<artifactId>vtl-spark</artifactId>
</dependency>
</dependencies>
</profile>
Expand All @@ -53,7 +63,31 @@
<dependency>
<groupId>it.bancaditalia.oss.vtl</groupId>
<artifactId>vtl-cli</artifactId>
<type>jar</type>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>with-jupyter</id>
<dependencies>
<dependency>
<groupId>it.bancaditalia.oss.vtl</groupId>
<artifactId>vtl-jupyter</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>with-r</id>
<dependencies>
<dependency>
<groupId>it.bancaditalia.oss.vtl</groupId>
<artifactId>vtl-java2r</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>it.bancaditalia.oss.vtl</groupId>
<artifactId>vtl-renv</artifactId>
</dependency>
</dependencies>
</profile>
Expand All @@ -74,15 +108,43 @@
<dependencies>
<dependency>
<groupId>it.bancaditalia.oss.vtl</groupId>
<artifactId>vtl-bundle-deps</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>test</scope>
<artifactId>vtl-api</artifactId>
</dependency>
<dependency>
<groupId>it.bancaditalia.oss.vtl</groupId>
<artifactId>vtl-types</artifactId>
</dependency>
<dependency>
<groupId>it.bancaditalia.oss.vtl</groupId>
<artifactId>vtl-engine</artifactId>
</dependency>
<dependency>
<groupId>it.bancaditalia.oss.vtl</groupId>
<artifactId>vtl-parser</artifactId>
</dependency>
<dependency>
<groupId>it.bancaditalia.oss.vtl</groupId>
<artifactId>vtl-confman</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>it.bancaditalia.oss.vtl</groupId>
<artifactId>vtl-transform</artifactId>
</dependency>
<dependency>
<groupId>it.bancaditalia.oss.vtl</groupId>
<artifactId>vtl-envbase</artifactId>
</dependency>
<dependency>
<groupId>it.bancaditalia.oss.vtl</groupId>
<artifactId>vtl-metabase</artifactId>
</dependency>
<dependency>
<groupId>it.bancaditalia.oss.vtl</groupId>
<artifactId>vtl-metajson</artifactId>
</dependency>
<dependency>
<groupId>it.bancaditalia.oss.vtl</groupId>
<artifactId>vtl-session</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down Expand Up @@ -112,7 +174,8 @@
<report>report-aggregate</report>
</reports>
<configuration>
<outputDirectory>${project.basedir}/../target/site/jacoco-aggregate</outputDirectory>
<outputDirectory>${project.basedir}/../../target/site/jacoco-aggregate</outputDirectory>
<includeCurrentProject>true</includeCurrentProject>
</configuration>
</reportSet>
</reportSets>
Expand All @@ -126,13 +189,6 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
Expand All @@ -148,6 +204,19 @@
<test>**/IntegrationTestSuite</test>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<executions>
<execution>
<id>aggregate</id>
<phase>verify</phase>
<goals>
<goal>report-aggregate</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
7 changes: 7 additions & 0 deletions vtl-bundles/vtl-rest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,13 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<attachClasses>true</attachClasses>
</configuration>
</plugin>
</plugins>
</build>
</project>

0 comments on commit e690700

Please sign in to comment.