From 9315848e429a2af56dc34bc8ab44301d7e3002f0 Mon Sep 17 00:00:00 2001
From: IanHowell <ian.howell@att.com>
Date: Fri, 30 Mar 2018 12:14:55 -0500
Subject: Fix up several JUnits

Issue-ID: AAF-128
Change-Id: I3644847671e08f0b6d57cce9674dc8a3d60fcbc4
Signed-off-by: IanHowell <ian.howell@att.com>

Get Test coverage for MultiGet to 100%

Issue-ID: AAF-128
Change-Id: I5b591c0b7e0e7353dc669e75546961177ef8d152
Signed-off-by: IanHowell <ian.howell@att.com>

Get test coverage of UserChainManip to 100%

Issue-ID: AAF-128
Change-Id: I41d6a2c3f405d8959507ae02c934fffff7903e32
Signed-off-by: IanHowell <ian.howell@att.com>

Get test coverage of SecurityInfoC to 100%

Issue-ID: AAF-128
Change-Id: I04c088827915b14d1f597d5e1eeb7f8e9159e644
Signed-off-by: IanHowell <ian.howell@att.com>

Trial run at updating POMs for SONAR coverage

Change-Id: Ib2a68773fafbc660266ee5d496ffe842c10e7931
Signed-off-by: IanHowell <ian.howell@att.com>
---
 auth/auth-core/pom.xml | 110 ++++++++++++++++++++++++++-----------------------
 1 file changed, 59 insertions(+), 51 deletions(-)

(limited to 'auth/auth-core')

diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml
index 8e218632..0bfc0ffb 100644
--- a/auth/auth-core/pom.xml
+++ b/auth/auth-core/pom.xml
@@ -142,57 +142,65 @@
 					<serverId>ecomp-staging</serverId>
 				</configuration>
 			</plugin>		
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.7.7.201606060606</version>
-				<configuration>
-					<dumpOnExit>true</dumpOnExit>
-					<includes>
-						<include>org.onap.aaf.*</include>
-					</includes>
-				</configuration>
-				<executions>
-					<execution>
-						<id>pre-unit-test</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-						<configuration>
-							<destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
-							<!-- <append>true</append> -->
-						</configuration>
-					</execution>
-					<execution>
-						<id>pre-integration-test</id>
-						<phase>pre-integration-test</phase>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-						<configuration>
-							<destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>
-							<!-- <append>true</append> -->
-						</configuration>
-					</execution>
-					<execution>
-                        <goals>
-                            <goal>merge</goal>
-                        </goals>
-                        <phase>post-integration-test</phase>
-                        <configuration>
-                            <fileSets>
-                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">
-                                    <directory>${project.build.directory}/coverage-reports</directory>
-                                    <includes>
-                                        <include>*.exec</include>
-                                    </includes>
-                                </fileSet>
-                            </fileSets>
-                            <destFile>${project.build.directory}/jacoco-dev.exec</destFile>
-                        </configuration>
-                    </execution>
-				</executions>
-			</plugin>
+				<plugin>
+					<groupId>org.jacoco</groupId>
+					<artifactId>jacoco-maven-plugin</artifactId>
+					<version>${jacoco.version}</version>
+					<configuration>
+						<excludes>
+							<exclude>**/gen/**</exclude>
+							<exclude>**/generated-sources/**</exclude>
+							<exclude>**/yang-gen/**</exclude>
+							<exclude>**/pax/**</exclude>
+						</excludes>
+					</configuration>
+					<executions>
+						<execution>
+							<id>pre-unit-test</id>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+								<propertyName>surefireArgLine</propertyName>
+							</configuration>
+						</execution>
+						<execution>
+							<id>post-unit-test</id>
+							<phase>test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+							</configuration>
+						</execution>
+						<execution>
+							<id>pre-integration-test</id>
+							<phase>pre-integration-test</phase>
+							<goals>
+								<goal>prepare-agent</goal>
+							</goals>
+							<configuration>
+								<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+								<propertyName>failsafeArgLine</propertyName>
+							</configuration>
+						</execution>
+
+						<execution>
+							<id>post-integration-test</id>
+							<phase>post-integration-test</phase>
+							<goals>
+								<goal>report</goal>
+							</goals>
+							<configuration>
+								<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+								<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
 	   </plugins>
 	</build>
 	<distributionManagement>
-- 
cgit 1.2.3-korg