Skip to content

Commit 621d838

Browse files
marko-bekhtamarko-bekhta
committed
HV-2046 Enable code coverage with maven build
1 parent afee3b9 commit 621d838

File tree

6 files changed

+115
-11
lines changed

6 files changed

+115
-11
lines changed

‎Jenkinsfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ stage('Default build') {
258258
install \
259259
"} \
260260
-Pdist \
261+
-Pcoverage \
261262
-Pjqassistant -Pci-build \
262263
${enableDefaultBuildIT ? '' : '-DskipITs'} \
263264
${toTestJdkArg(environments.content.jdk.default)} \

‎build/reports/pom.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,4 +156,31 @@
156156
</plugin>
157157
</plugins>
158158
</build>
159+
<profiles>
160+
<profile>
161+
<id>coverage-report</id>
162+
<build>
163+
<plugins>
164+
<plugin>
165+
<groupId>org.jacoco</groupId>
166+
<artifactId>jacoco-maven-plugin</artifactId>
167+
<executions>
168+
<execution>
169+
<id>jacoco-report-aggregate</id>
170+
<phase>package</phase>
171+
<goals>
172+
<goal>report-aggregate</goal>
173+
</goals>
174+
<configuration>
175+
<dataFileIncludes>
176+
<include>**/*.exec</include>
177+
</dataFileIncludes>
178+
</configuration>
179+
</execution>
180+
</executions>
181+
</plugin>
182+
</plugins>
183+
</build>
184+
</profile>
185+
</profiles>
159186
</project>

‎engine/pom.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,27 @@
316316
<parallel>tests</parallel>
317317
<threadCount>4</threadCount>
318318
</configuration>
319+
<executions>
320+
<execution>
321+
<id>default-test</id>
322+
<configuration>
323+
<excludes>
324+
<exclude>**/ByteBuddy*Test</exclude>
325+
</excludes>
326+
</configuration>
327+
</execution>
328+
<execution>
329+
<id>bytebuddy-test</id>
330+
<goals><goal>test</goal></goals>
331+
<phase>test</phase>
332+
<configuration>
333+
<argLine>${surefire.jvm.nojacoco.args}</argLine>
334+
<includes>
335+
<include>**/ByteBuddy*Test</include>
336+
</includes>
337+
</configuration>
338+
</execution>
339+
</executions>
319340
</plugin>
320341
<plugin>
321342
<groupId>org.apache.maven.plugins</groupId>

‎engine/src/test/java/org/hibernate/validator/test/internal/engine/methodvalidation/RelaxedMethodParameterConstraintsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void disallowStrengtheningInSubType() {
7272
}
7373

7474
@Test
75-
public void allowStrengtheningInSubType() {
75+
public void allowStrengtheningInSubType() throws NoSuchMethodException {
7676
HibernateValidatorConfiguration configuration = Validation.byProvider( HibernateValidator.class ).configure();
7777

7878
configuration.allowOverridingMethodAlterParameterConstraint( true );
@@ -83,7 +83,7 @@ public void allowStrengtheningInSubType() {
8383
Set<ConstraintViolation<RealizationWithAdditionalMethodParameterConstraint>> violations =
8484
validator.forExecutables().validateParameters(
8585
new RealizationWithAdditionalMethodParameterConstraint(),
86-
RealizationWithAdditionalMethodParameterConstraint.class.getDeclaredMethods()[0],
86+
RealizationWithAdditionalMethodParameterConstraint.class.getDeclaredMethod( "bar", String.class ),
8787
new Object[] { "foo" }
8888
);
8989

‎engine/src/test/java/org/hibernate/validator/test/internal/util/ExecutableHelperTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public void methodDefinedInOtherTypeHierarchyDoesNotOverride() throws Exception
117117

118118
@Test
119119
public void methodWithNarrowedParameterTypeDoesNotOverride() throws Exception {
120-
Method methodFromBase = SimpleServiceBase.class.getDeclaredMethods()[0];
120+
Method methodFromBase = SimpleServiceBase.class.getDeclaredMethod( "doSomething", Number.class );
121121
Method methodFromImpl = SimpleServiceImpl1.class.getDeclaredMethod( "doSomething", Number.class );
122122

123123
assertThat( executableHelper.overrides( methodFromImpl, methodFromBase ) ).isTrue();
@@ -129,7 +129,7 @@ public void methodWithNarrowedParameterTypeDoesNotOverride() throws Exception {
129129

130130
@Test
131131
public void methodWithIntermediateClass() throws Exception {
132-
Method methodFromBase = SimpleServiceBase.class.getDeclaredMethods()[0];
132+
Method methodFromBase = SimpleServiceBase.class.getDeclaredMethod( "doSomething", Number.class );
133133
Method methodFromImpl = SimpleServiceImpl2.class.getDeclaredMethod( "doSomething", Number.class );
134134

135135
assertThat( executableHelper.overrides( methodFromImpl, methodFromBase ) ).isTrue();
@@ -141,7 +141,7 @@ public void methodWithIntermediateClass() throws Exception {
141141

142142
@Test
143143
public void methodWithGenerics() throws Exception {
144-
Method methodFromBase = GenericServiceBase.class.getDeclaredMethods()[0];
144+
Method methodFromBase = GenericServiceBase.class.getDeclaredMethod( "doSomething", Object.class );
145145
Method methodFromImpl = GenericServiceImpl1.class.getDeclaredMethod( "doSomething", Number.class );
146146

147147
assertThat( executableHelper.overrides( methodFromImpl, methodFromBase ) ).isTrue();
@@ -153,7 +153,7 @@ public void methodWithGenerics() throws Exception {
153153

154154
@Test
155155
public void methodWithGenericsAndIntermediateClass() throws Exception {
156-
Method methodFromBase = GenericServiceBase.class.getDeclaredMethods()[0];
156+
Method methodFromBase = GenericServiceBase.class.getDeclaredMethod( "doSomething", Object.class );
157157
Method methodFromImpl = GenericServiceImpl2.class.getDeclaredMethod( "doSomething", Number.class );
158158

159159
assertThat( executableHelper.overrides( methodFromImpl, methodFromBase ) ).isTrue();
@@ -165,10 +165,10 @@ public void methodWithGenericsAndIntermediateClass() throws Exception {
165165

166166
@Test
167167
public void methodWithGenericsAndMultipleIntermediateClasses() throws Exception {
168-
Method methodFromBase = GenericServiceBase.class.getDeclaredMethods()[0];
168+
Method methodFromBase = GenericServiceBase.class.getDeclaredMethod( "doSomething", Object.class );
169169
Method methodFromImpl = GenericServiceImpl3.class.getDeclaredMethod( "doSomething", Number.class );
170170

171-
assertThat( executableHelper.overrides( methodFromImpl, methodFromBase ) ).isTrue();
171+
assertThat( executableHelper.overrides( methodFromImpl, methodFromBase ) ).as( methodFromImpl + " : " + methodFromBase ).isTrue();
172172

173173
methodFromImpl = GenericServiceImpl2.class.getDeclaredMethod( "doSomething", Integer.class );
174174

@@ -177,7 +177,7 @@ public void methodWithGenericsAndMultipleIntermediateClasses() throws Exception
177177

178178
@Test
179179
public void methodWithParameterizedSubType() throws Exception {
180-
Method methodFromBase = GenericServiceBase.class.getDeclaredMethods()[0];
180+
Method methodFromBase = GenericServiceBase.class.getDeclaredMethod( "doSomething", Object.class );
181181
Method methodFromImpl = ParameterizedSubType.class.getDeclaredMethod( "doSomething", Object.class );
182182

183183
assertThat( executableHelper.overrides( methodFromImpl, methodFromBase ) ).isTrue();

‎pom.xml‎

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@
269269
<version.versions.plugin>2.17.1</version.versions.plugin>
270270
<version.maven-wrapper-plugin>3.3.2</version.maven-wrapper-plugin>
271271
<version.spotless-maven-plugin>2.43.0</version.spotless-maven-plugin>
272+
<version.jacoco.plugin>0.8.12</version.jacoco.plugin>
272273

273274
<!-- Forbidden API related properties -->
274275
<forbiddenapis-junit.path>forbidden-junit.txt</forbiddenapis-junit.path>
@@ -358,6 +359,9 @@
358359
<surefire.jvm.args.add-opens></surefire.jvm.args.add-opens>
359360
<surefire.jvm.args.java-version></surefire.jvm.args.java-version>
360361
<surefire.jvm.args.jaxp.strict-args></surefire.jvm.args.jaxp.strict-args>
362+
<!-- JVM args generated by JaCoCo -->
363+
<surefire.jvm.args.jacoco></surefire.jvm.args.jacoco>
364+
<failsafe.jvm.args.jacoco></failsafe.jvm.args.jacoco>
361365
<!--
362366
The arguments below are Shrinkwrap settings taken from
363367
https://github.com/shrinkwrap/resolver/blob/788a3c1148af3a7ebdfdaf817393273f5f5ee17b/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/bootstrap/MavenSettingsBuilder.java#L80
@@ -366,8 +370,9 @@
366370
<surefire.jvm.args.shrinkwrap>
367371
-Dmaven.repo.local=${settings.localRepository}
368372
</surefire.jvm.args.shrinkwrap>
369-
<surefire.jvm.args>${surefire.jvm.args.additional} ${surefire.jvm.args.add-opens} ${surefire.jvm.args.illegal-access} ${surefire.jvm.args.shrinkwrap} ${surefire.jvm.args.java-version} ${surefire.jvm.args.commandline} ${surefire.jvm.args.jaxp.strict-args}</surefire.jvm.args>
370-
<failsafe.jvm.args>${surefire.jvm.args.additional} ${surefire.jvm.args.add-opens} ${surefire.jvm.args.illegal-access} ${surefire.jvm.args.shrinkwrap} ${surefire.jvm.args.java-version} ${surefire.jvm.args.commandline} ${surefire.jvm.args.jaxp.strict-args}</failsafe.jvm.args>
373+
<surefire.jvm.nojacoco.args>${surefire.jvm.args.additional} ${surefire.jvm.args.add-opens} ${surefire.jvm.args.illegal-access} ${surefire.jvm.args.shrinkwrap} ${surefire.jvm.args.java-version} ${surefire.jvm.args.commandline} ${surefire.jvm.args.jaxp.strict-args}</surefire.jvm.nojacoco.args>
374+
<surefire.jvm.args>${surefire.jvm.nojacoco.args} @{surefire.jvm.args.jacoco}</surefire.jvm.args>
375+
<failsafe.jvm.args>${surefire.jvm.args.additional} ${surefire.jvm.args.add-opens} ${surefire.jvm.args.illegal-access} ${surefire.jvm.args.shrinkwrap} ${surefire.jvm.args.java-version} ${surefire.jvm.args.commandline} ${surefire.jvm.args.jaxp.strict-args} @{failsafe.jvm.args.jacoco}</failsafe.jvm.args>
371376

372377
<!--
373378
Should be set from the command line.
@@ -1507,6 +1512,11 @@
15071512
<distributionType>bin</distributionType>
15081513
</configuration>
15091514
</plugin>
1515+
<plugin>
1516+
<groupId>org.jacoco</groupId>
1517+
<artifactId>jacoco-maven-plugin</artifactId>
1518+
<version>${version.jacoco.plugin}</version>
1519+
</plugin>
15101520
</plugins>
15111521
</pluginManagement>
15121522
</build>
@@ -1848,6 +1858,51 @@
18481858
</pluginManagement>
18491859
</build>
18501860
</profile>
1861+
1862+
<profile>
1863+
<id>coverage</id>
1864+
<build>
1865+
<plugins>
1866+
<plugin>
1867+
<groupId>org.jacoco</groupId>
1868+
<artifactId>jacoco-maven-plugin</artifactId>
1869+
<configuration>
1870+
<excludes>
1871+
<exclude>**/*_$logger.class</exclude>
1872+
<exclude>**/*_$bundle.class</exclude>
1873+
</excludes>
1874+
</configuration>
1875+
<executions>
1876+
<execution>
1877+
<id>jacoco-prepare-agent</id>
1878+
<goals>
1879+
<goal>prepare-agent</goal>
1880+
</goals>
1881+
<configuration>
1882+
<propertyName>surefire.jvm.args.jacoco</propertyName>
1883+
</configuration>
1884+
</execution>
1885+
<execution>
1886+
<id>jacoco-prepare-agent-integration</id>
1887+
<!--
1888+
This is necessary in order for the property to be set before we process resources,
1889+
such as arquillian.xml in WildFly tests or maven.properties in OSGi tests.
1890+
-->
1891+
<phase>initialize</phase>
1892+
<goals>
1893+
<goal>prepare-agent-integration</goal>
1894+
</goals>
1895+
<configuration>
1896+
<propertyName>failsafe.jvm.args.jacoco</propertyName>
1897+
<destFile>${project.build.directory}/coverage/jacoco.exec</destFile>
1898+
</configuration>
1899+
</execution>
1900+
</executions>
1901+
</plugin>
1902+
</plugins>
1903+
</build>
1904+
</profile>
1905+
18511906
<!--
18521907
WARNING: this MUST be the very last profile,
18531908
so that the "report" module is the very last module,

0 commit comments

Comments
 (0)