Skip to content

Commit b011a46

Browse files
marko-bekhtamarko-bekhta
committed
HV-2046 Enable code coverage with maven build
1 parent 4d09a41 commit b011a46

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
@@ -323,6 +323,27 @@
323323
<parallel>tests</parallel>
324324
<threadCount>4</threadCount>
325325
</configuration>
326+
<executions>
327+
<execution>
328+
<id>default-test</id>
329+
<configuration>
330+
<excludes>
331+
<exclude>**/ByteBuddy*Test</exclude>
332+
</excludes>
333+
</configuration>
334+
</execution>
335+
<execution>
336+
<id>bytebuddy-test</id>
337+
<goals><goal>test</goal></goals>
338+
<phase>test</phase>
339+
<configuration>
340+
<argLine>${surefire.jvm.nojacoco.args}</argLine>
341+
<includes>
342+
<include>**/ByteBuddy*Test</include>
343+
</includes>
344+
</configuration>
345+
</execution>
346+
</executions>
326347
</plugin>
327348
<plugin>
328349
<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
@@ -271,6 +271,7 @@
271271
<version.formatter-maven-plugin>2.24.1</version.formatter-maven-plugin>
272272
<version.versions.plugin>2.17.1</version.versions.plugin>
273273
<version.maven-wrapper-plugin>3.3.2</version.maven-wrapper-plugin>
274+
<version.jacoco.plugin>0.8.12</version.jacoco.plugin>
274275

275276
<!-- Forbidden API related properties -->
276277
<forbiddenapis-junit.path>forbidden-junit.txt</forbiddenapis-junit.path>
@@ -360,6 +361,9 @@
360361
<surefire.jvm.args.add-opens></surefire.jvm.args.add-opens>
361362
<surefire.jvm.args.java-version></surefire.jvm.args.java-version>
362363
<surefire.jvm.args.jaxp.strict-args></surefire.jvm.args.jaxp.strict-args>
364+
<!-- JVM args generated by JaCoCo -->
365+
<surefire.jvm.args.jacoco></surefire.jvm.args.jacoco>
366+
<failsafe.jvm.args.jacoco></failsafe.jvm.args.jacoco>
363367
<!--
364368
The arguments below are Shrinkwrap settings taken from
365369
https://github.com/shrinkwrap/resolver/blob/788a3c1148af3a7ebdfdaf817393273f5f5ee17b/impl-maven/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/bootstrap/MavenSettingsBuilder.java#L80
@@ -368,8 +372,9 @@
368372
<surefire.jvm.args.shrinkwrap>
369373
-Dmaven.repo.local=${settings.localRepository}
370374
</surefire.jvm.args.shrinkwrap>
371-
<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>
372-
<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>
375+
<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>
376+
<surefire.jvm.args>${surefire.jvm.nojacoco.args} @{surefire.jvm.args.jacoco}</surefire.jvm.args>
377+
<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>
373378

374379
<!--
375380
Should be set from the command line.
@@ -1522,6 +1527,11 @@
15221527
<distributionType>bin</distributionType>
15231528
</configuration>
15241529
</plugin>
1530+
<plugin>
1531+
<groupId>org.jacoco</groupId>
1532+
<artifactId>jacoco-maven-plugin</artifactId>
1533+
<version>${version.jacoco.plugin}</version>
1534+
</plugin>
15251535
</plugins>
15261536
</pluginManagement>
15271537
</build>
@@ -1865,6 +1875,51 @@
18651875
</pluginManagement>
18661876
</build>
18671877
</profile>
1878+
1879+
<profile>
1880+
<id>coverage</id>
1881+
<build>
1882+
<plugins>
1883+
<plugin>
1884+
<groupId>org.jacoco</groupId>
1885+
<artifactId>jacoco-maven-plugin</artifactId>
1886+
<configuration>
1887+
<excludes>
1888+
<exclude>**/*_$logger.class</exclude>
1889+
<exclude>**/*_$bundle.class</exclude>
1890+
</excludes>
1891+
</configuration>
1892+
<executions>
1893+
<execution>
1894+
<id>jacoco-prepare-agent</id>
1895+
<goals>
1896+
<goal>prepare-agent</goal>
1897+
</goals>
1898+
<configuration>
1899+
<propertyName>surefire.jvm.args.jacoco</propertyName>
1900+
</configuration>
1901+
</execution>
1902+
<execution>
1903+
<id>jacoco-prepare-agent-integration</id>
1904+
<!--
1905+
This is necessary in order for the property to be set before we process resources,
1906+
such as arquillian.xml in WildFly tests or maven.properties in OSGi tests.
1907+
-->
1908+
<phase>initialize</phase>
1909+
<goals>
1910+
<goal>prepare-agent-integration</goal>
1911+
</goals>
1912+
<configuration>
1913+
<propertyName>failsafe.jvm.args.jacoco</propertyName>
1914+
<destFile>${project.build.directory}/coverage/jacoco.exec</destFile>
1915+
</configuration>
1916+
</execution>
1917+
</executions>
1918+
</plugin>
1919+
</plugins>
1920+
</build>
1921+
</profile>
1922+
18681923
<!--
18691924
WARNING: this MUST be the very last profile,
18701925
so that the "report" module is the very last module,

0 commit comments

Comments
 (0)