Improve code coverage for aaf authz modules

[aaf/authz.git] / authz-test / pom.xml

diff --git a/authz-test/pom.xml b/authz-test/pom.xml
index 6b8b588..755d396 100644 (file)
--- a/authz-test/pom.xml
+++ b/authz-test/pom.xml
@@ -183,91 +183,56 @@
                                </configuration>\r
                        </plugin>               \r
                        <plugin>\r
-          <groupId>org.jacoco</groupId>\r
-          <artifactId>jacoco-maven-plugin</artifactId>\r
-          <version>${jacoco.version}</version>\r
-          <configuration>\r
-            <!-- Note: This exclusion list should match <sonar.exclusions>\r
-         property above -->\r
-            <excludes>\r
-              <exclude>**/gen/**</exclude>\r
-              <exclude>**/generated-sources/**</exclude>\r
-              <exclude>**/yang-gen/**</exclude>\r
-              <exclude>**/pax/**</exclude>\r
-            </excludes>\r
-          </configuration>\r
-          <executions>\r
-            <!--\r
-        Prepares the property pointing to the JaCoCo runtime agent which\r
-        is passed as VM argument when Maven the Surefire plugin is executed.\r
-        -->\r
-            <execution>\r
-              <id>pre-unit-test</id>\r
-              <goals>\r
-                <goal>prepare-agent</goal>\r
-              </goals>\r
-              <configuration>\r
-                <!-- Sets the path to the file which contains the execution data. -->\r
-                <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>\r
-                <!--\r
-            Sets the name of the property containing the settings\r
-            for JaCoCo runtime agent.\r
-        -->\r
-                <propertyName>surefireArgLine</propertyName>\r
-              </configuration>\r
-            </execution>\r
-            <!--\r
-        Ensures that the code coverage report for unit tests is created after\r
-        unit tests have been run.\r
-        -->\r
-            <execution>\r
-              <id>post-unit-test</id>\r
-              <phase>test</phase>\r
-              <goals>\r
-                <goal>report</goal>\r
-              </goals>\r
-              <configuration>\r
-                <!-- Sets the path to the file which contains the execution data. -->\r
-                <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>\r
-                <!-- Sets the output directory for the code coverage report. -->\r
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>\r
-              </configuration>\r
-            </execution>\r
-            <execution>\r
-              <id>pre-integration-test</id>\r
-              <phase>pre-integration-test</phase>\r
-              <goals>\r
-                <goal>prepare-agent</goal>\r
-              </goals>\r
-              <configuration>\r
-                <!-- Sets the path to the file which contains the execution data. -->\r
-                <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>\r
-                <!--\r
-            Sets the name of the property containing the settings\r
-            for JaCoCo runtime agent.\r
-        -->\r
-                <propertyName>failsafeArgLine</propertyName>\r
-              </configuration>\r
-            </execution>\r
-            <!--\r
-        Ensures that the code coverage report for integration tests after\r
-        integration tests have been run.\r
-        -->\r
-            <execution>\r
-              <id>post-integration-test</id>\r
-              <phase>post-integration-test</phase>\r
-              <goals>\r
-                <goal>report</goal>\r
-              </goals>\r
-              <configuration>\r
-                <!-- Sets the path to the file which contains the execution data. -->\r
-                <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>\r
-                <!-- Sets the output directory for the code coverage report. -->\r
-                <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>\r
-              </configuration>\r
-            </execution>\r
-          </executions>\r
-        </plugin>                    \r
+                               <groupId>org.jacoco</groupId>\r
+                               <artifactId>jacoco-maven-plugin</artifactId>\r
+                               <version>0.7.7.201606060606</version>\r
+                               <configuration>\r
+                                       <dumpOnExit>true</dumpOnExit>\r
+                                       <includes>\r
+                                               <include>org.onap.aaf.*</include>\r
+                                       </includes>\r
+                               </configuration>\r
+                               <executions>\r
+                                       <execution>\r
+                                               <id>pre-unit-test</id>\r
+                                               <goals>\r
+                                                       <goal>prepare-agent</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>\r
+                                                       <!-- <append>true</append> -->\r
+                                               </configuration>\r
+                                       </execution>\r
+                                       <execution>\r
+                                               <id>pre-integration-test</id>\r
+                                               <phase>pre-integration-test</phase>\r
+                                               <goals>\r
+                                                       <goal>prepare-agent</goal>\r
+                                               </goals>\r
+                                               <configuration>\r
+                                                       <destFile>${project.build.directory}/coverage-reports/jacoco-it.exec</destFile>\r
+                                                       <!-- <append>true</append> -->\r
+                                               </configuration>\r
+                                       </execution>\r
+                                       <execution>\r
+                        <goals>\r
+                            <goal>merge</goal>\r
+                        </goals>\r
+                        <phase>post-integration-test</phase>\r
+                        <configuration>\r
+                            <fileSets>\r
+                                <fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">\r
+                                    <directory>${project.build.directory}/coverage-reports</directory>\r
+                                    <includes>\r
+                                        <include>*.exec</include>\r
+                                    </includes>\r
+                                </fileSet>\r
+                            </fileSets>\r
+                            <destFile>${project.build.directory}/jacoco-dev.exec</destFile>\r
+                        </configuration>\r
+                    </execution>\r
+                               </executions>\r
+                       </plugin> \r
 \r
                \r
                        </plugins>\r