diff options
| author |   danielhanrahan <daniel.hanrahan@est.tech> | 2024-02-09 17:40:18 +0000 |
|---|---|---|
| committer | danielhanrahan <daniel.hanrahan@est.tech> | 2024-02-12 11:57:57 +0000 |
| commit | c72a0132b024141716b35550fd7204338b2fc673 (patch) | |
| tree | 8e4bbae30a02a476d4f89f307b05d2c32ba4887a /integration-test | |
| parent | 4fa8d653abfd59e48d3b7461e67e5cb965ad8406 (diff) | |
Include integration test results in Jacoco
integration-test module is not recording code coverage due to
incorrectly overriding the maven surefire config from parent pom.
Issue-ID: CPS-2086
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I774c64acedca546f5c01403597bd9f5010de73d2
Diffstat (limited to 'integration-test')
| -rw-r--r-- | integration-test/pom.xml | 42 | ||||
| -rw-r--r-- | integration-test/src/test/groovy/org/onap/cps/integration/performance/base/PerfTestBase.groovy | 1 |
2 files changed, 10 insertions, 33 deletions
diff --git a/integration-test/pom.xml b/integration-test/pom.xml index 73998cd135..6947a94aaa 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -26,7 +26,6 @@ <version>3.4.4-SNAPSHOT</version> <relativePath>../cps-parent/pom.xml</relativePath> </parent> - <modelVersion>4.0.0</modelVersion> <artifactId>integration-test</artifactId> @@ -90,49 +89,28 @@ </dependency> </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <argLine>-Xms512m -Xmx512m</argLine> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>-Xms512m -Xmx512m</argLine> - </configuration> - </plugin> - </plugins> - </build> - <profiles> + <!-- Performance tests are run with maven-failsafe-plugin using a separate profile, so they will + not affect Jacoco coverage. Heap size is set here to ensure consistent test environment. --> <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> + <id>include-performance</id> + <properties> + <failsafeArgLine>-Xms512m -Xmx512m</failsafeArgLine> + </properties> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> + <artifactId>maven-failsafe-plugin</artifactId> <configuration> - <excludes> - <exclude>%regex[.*PerfTest.*]</exclude> - </excludes> + <includes> + <include>**/*PerfTest.java</include> + </includes> </configuration> </plugin> </plugins> </build> </profile> - <profile> - <id>include-performance</id> - </profile> </profiles> - </project> diff --git a/integration-test/src/test/groovy/org/onap/cps/integration/performance/base/PerfTestBase.groovy b/integration-test/src/test/groovy/org/onap/cps/integration/performance/base/PerfTestBase.groovy index b455e69c36..ce0aab45b0 100644 --- a/integration-test/src/test/groovy/org/onap/cps/integration/performance/base/PerfTestBase.groovy +++ b/integration-test/src/test/groovy/org/onap/cps/integration/performance/base/PerfTestBase.groovy @@ -21,7 +21,6 @@ package org.onap.cps.integration.performance.base import org.onap.cps.integration.base.CpsIntegrationSpecBase -import org.springframework.util.StopWatch abstract class PerfTestBase extends CpsIntegrationSpecBase { |