Improve code coverage for aaf cadi modules

Issue-ID: AAF-79
Change-Id: I9e12b64024aaa5dad13965fdbfc474c330bae864
Signed-off-by: sg481n <sg481n@att.com>

3 files changed, 258 insertions, 47 deletions

diff --git a/core/pom.xml b/core/pom.xml
index a838ece..3088b20 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -53,6 +53,10 @@
 	<dependencies>

 

 		<dependency>

+   			<groupId>org.mockito</groupId>

+   			<artifactId>mockito-all</artifactId>

+		</dependency>

+		<dependency>

 			<groupId>javax.servlet</groupId>

 			<artifactId>servlet-api</artifactId>

 			<scope>provided</scope>

@@ -141,53 +145,92 @@
 			</plugin> 

 			

 			<plugin>

-				<groupId>org.jacoco</groupId>

-				<artifactId>jacoco-maven-plugin</artifactId>

-				<version>0.7.7.201606060606</version>

-				<configuration>

-					<dumpOnExit>true</dumpOnExit>

-				</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>

+          <groupId>org.jacoco</groupId>

+          <artifactId>jacoco-maven-plugin</artifactId>

+          <version>${jacoco.version}</version>

+          <configuration>

+            <!-- Note: This exclusion list should match <sonar.exclusions>

+         property above -->

+            <excludes>

+              <exclude>**/gen/**</exclude>

+              <exclude>**/generated-sources/**</exclude>

+              <exclude>**/yang-gen/**</exclude>

+              <exclude>**/pax/**</exclude>

+            </excludes>

+          </configuration>

+          <executions>

+            <!--

+        Prepares the property pointing to the JaCoCo runtime agent which

+        is passed as VM argument when Maven the Surefire plugin is executed.

+        -->

+            <execution>

+              <id>pre-unit-test</id>

+              <goals>

+                <goal>prepare-agent</goal>

+              </goals>

+              <configuration>

+                <!-- Sets the path to the file which contains the execution data. -->

+                <destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>

+                <!--

+            Sets the name of the property containing the settings

+            for JaCoCo runtime agent.

+        -->

+                <propertyName>surefireArgLine</propertyName>

+              </configuration>

+            </execution>

+            <!--

+        Ensures that the code coverage report for unit tests is created after

+        unit tests have been run.

+        -->

+            <execution>

+              <id>post-unit-test</id>

+              <phase>test</phase>

+              <goals>

+                <goal>report</goal>

+              </goals>

+              <configuration>

+                <!-- Sets the path to the file which contains the execution data. -->

+                <dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>

+                <!-- Sets the output directory for the code coverage report. -->

+                <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>

+                <!-- Sets the path to the file which contains the execution data. -->

+                <destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>

+                <!--

+            Sets the name of the property containing the settings

+            for JaCoCo runtime agent.

+        -->

+                <propertyName>failsafeArgLine</propertyName>

+              </configuration>

+            </execution>

+            <!--

+        Ensures that the code coverage report for integration tests after

+        integration tests have been run.

+        -->

+            <execution>

+              <id>post-integration-test</id>

+              <phase>post-integration-test</phase>

+              <goals>

+                <goal>report</goal>

+              </goals>

+              <configuration>

+                <!-- Sets the path to the file which contains the execution data. -->

+                <dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>

+                <!-- Sets the output directory for the code coverage report. -->

+                <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>

+              </configuration>

+            </execution>

+          </executions>

+        </plugin>                    

+

 		</plugins>

 	</build>

 	<distributionManagement>

diff --git a/core/src/test/java/org/onap/aaf/cadi/CadiExceptionTest.java b/core/src/test/java/org/onap/aaf/cadi/CadiExceptionTest.java
new file mode 100644
index 0000000..29a0a8b
--- /dev/null
+++ b/core/src/test/java/org/onap/aaf/cadi/CadiExceptionTest.java
@@ -0,0 +1,61 @@
+/*******************************************************************************

+ * ============LICENSE_START====================================================

+ * * org.onap.aaf

+ * * ===========================================================================

+ * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

+ * * ===========================================================================

+ * * Licensed under the Apache License, Version 2.0 (the "License");

+ * * you may not use this file except in compliance with the License.

+ * * You may obtain a copy of the License at

+ * * 

+ *  *      http://www.apache.org/licenses/LICENSE-2.0

+ * * 

+ *  * Unless required by applicable law or agreed to in writing, software

+ * * distributed under the License is distributed on an "AS IS" BASIS,

+ * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * * See the License for the specific language governing permissions and

+ * * limitations under the License.

+ * * ============LICENSE_END====================================================

+ * *

+ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

+ * *

+ ******************************************************************************/

+package org.onap.aaf.cadi;

+

+import static org.hamcrest.CoreMatchers.is;

+import static org.junit.Assert.*;

+

+import org.junit.Test;

+

+public class CadiExceptionTest {

+

+	@Test

+	public void testCadiException() {

+		CadiException exception = new CadiException();

+		

+		assertNotNull(exception);

+	}

+

+	@Test

+	public void testCadiExceptionString() {

+		CadiException exception = new CadiException("New Exception");

+		assertNotNull(exception);

+		assertThat(exception.getMessage(), is("New Exception"));

+	}

+

+	@Test

+	public void testCadiExceptionThrowable() {

+		CadiException exception = new CadiException(new Throwable("New Exception"));

+		assertNotNull(exception);

+		assertThat(exception.getMessage(), is("java.lang.Throwable: New Exception"));

+	}

+

+	@Test

+	public void testCadiExceptionStringThrowable() {

+		CadiException exception = new CadiException("New Exception",new Throwable("New Exception"));

+		assertNotNull(exception);

+		assertThat(exception.getMessage(), is("New Exception"));

+

+	}

+

+}

diff --git a/core/src/test/java/org/onap/aaf/cadi/UserTest.java b/core/src/test/java/org/onap/aaf/cadi/UserTest.java
new file mode 100644
index 0000000..3e8254b
--- /dev/null
+++ b/core/src/test/java/org/onap/aaf/cadi/UserTest.java
@@ -0,0 +1,107 @@
+/*******************************************************************************

+ * ============LICENSE_START====================================================

+ * * org.onap.aaf

+ * * ===========================================================================

+ * * Copyright © 2017 AT&T Intellectual Property. All rights reserved.

+ * * ===========================================================================

+ * * Licensed under the Apache License, Version 2.0 (the "License");

+ * * you may not use this file except in compliance with the License.

+ * * You may obtain a copy of the License at

+ * * 

+ *  *      http://www.apache.org/licenses/LICENSE-2.0

+ * * 

+ *  * Unless required by applicable law or agreed to in writing, software

+ * * distributed under the License is distributed on an "AS IS" BASIS,

+ * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+ * * See the License for the specific language governing permissions and

+ * * limitations under the License.

+ * * ============LICENSE_END====================================================

+ * *

+ * * ECOMP is a trademark and service mark of AT&T Intellectual Property.

+ * *

+ ******************************************************************************/

+package org.onap.aaf.cadi;

+

+import static org.hamcrest.CoreMatchers.is;

+import static org.junit.Assert.*;

+import static org.mockito.Mockito.when;

+

+import java.security.Principal;

+import java.util.ArrayList;

+import java.util.HashMap;

+import java.util.List;

+import java.util.Map;

+

+import org.junit.Before;

+import org.junit.Test;

+import org.mockito.Mock;

+import org.mockito.MockitoAnnotations;

+import org.onap.aaf.cadi.lur.LocalPermission;

+

+public class UserTest {

+

+	@Mock

+	private Principal principal;

+	

+	@Mock

+	private LocalPermission permission;

+	

+	@Before

+	public void setup() {

+		MockitoAnnotations.initMocks(this);

+		

+		when(principal.getName()).thenReturn("Principal");

+		

+		when(permission.getKey()).thenReturn("NewKey");

+		when(permission.match(permission)).thenReturn(true);

+	}

+	

+	@Test

+	public void testCountCheck() {

+		User<Permission> user = new User<Permission>(principal);

+		user.resetCount();

+		assertThat(user.count, is(0));

+		user.incCount();

+		assertThat(user.count, is(1));

+	}

+

+	@Test

+	public void testPerm() throws InterruptedException {

+		User<Permission> user = new User<Permission>(principal);

+		assertThat(user.permExpires(), is(Long.MAX_VALUE));

+		user.renewPerm();

+		Thread.sleep(1);

+		assertThat(user.permExpired(), is(true));

+		user = new User<Permission>(principal,100);

+		assertTrue(user.noPerms());

+		user.add(permission);

+		assertFalse(user.noPerms());

+		user.setNoPerms();

+		assertThat(user.permExpired(), is(false));

+		assertFalse(user.permsUnloaded());

+		user.perms = null;

+		assertTrue(user.permsUnloaded());

+		assertTrue(user.noPerms());

+	}

+	

+	@Test

+	public void testAddValuesToNewMap() {

+		User<Permission> user = new User<Permission>(principal);

+		Map<String, Permission> newMap = new HashMap<String,Permission>();

+		

+		assertFalse(user.contains(permission));

+		

+		user.add(newMap, permission);

+		user.setMap(newMap);

+		

+		assertTrue(user.contains(permission));

+		

+		List<Permission> sink = new ArrayList<Permission>();

+		user.copyPermsTo(sink);

+		

+		assertThat(sink.size(), is(1));

+		assertTrue(sink.contains(permission));

+		

+		assertThat(user.toString(), is("Principal|:NewKey"));

+	}

+}