From 95d254993aef4351511f0969653ad828f6a37fc8 Mon Sep 17 00:00:00 2001 From: Instrumental Date: Mon, 2 Apr 2018 18:48:10 -0500 Subject: [PATCH] Add jococo and SONAR Props to root pom.xml Issue-ID: AAF-111 Change-Id: I98b44dcb005d17c8c93867bc39fc282415aa7e8e Signed-off-by: Instrumental --- .../org/onap/aaf/auth/fs/test/JU_FileServer.java | 81 ---------------------- .../aaf/auth/service/api/test/JU_API_Approval.java | 8 +-- .../aaf/auth/service/api/test/JU_API_Creds.java | 10 +-- .../aaf/auth/service/api/test/JU_API_Delegate.java | 10 +-- .../aaf/auth/service/api/test/JU_API_History.java | 8 +-- .../aaf/auth/service/api/test/JU_API_Mgmt.java | 66 ------------------ .../onap/aaf/auth/service/api/test/JU_API_NS.java | 8 +-- .../aaf/auth/service/api/test/JU_API_Perms.java | 8 +-- .../aaf/auth/service/api/test/JU_API_Roles.java | 8 +-- .../aaf/auth/service/api/test/JU_API_User.java | 8 +-- .../aaf/auth/service/api/test/JU_API_UserRole.java | 8 +-- pom.xml | 78 +++++++++++++++++++-- 12 files changed, 111 insertions(+), 190 deletions(-) delete mode 100644 auth/auth-fs/src/test/java/org/onap/aaf/auth/fs/test/JU_FileServer.java delete mode 100644 auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Mgmt.java diff --git a/auth/auth-fs/src/test/java/org/onap/aaf/auth/fs/test/JU_FileServer.java b/auth/auth-fs/src/test/java/org/onap/aaf/auth/fs/test/JU_FileServer.java deleted file mode 100644 index 6e24f6dc..00000000 --- a/auth/auth-fs/src/test/java/org/onap/aaf/auth/fs/test/JU_FileServer.java +++ /dev/null @@ -1,81 +0,0 @@ -/******************************************************************************* - * ============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==================================================== - * * - * * - ******************************************************************************/ -package org.onap.aaf.auth.fs.test; - -import static org.junit.Assert.*; -import static org.onap.aaf.auth.rserv.HttpMethods.GET; - -import java.io.File; -import java.io.IOException; -import java.net.URL; -import java.util.Properties; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Matchers; -import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; -import org.onap.aaf.auth.env.AuthzEnv; -import org.onap.aaf.auth.env.AuthzTrans; -import org.onap.aaf.auth.fs.*; -import org.onap.aaf.auth.rserv.CachingFileAccess; -import org.onap.aaf.misc.env.APIException; -import org.powermock.api.mockito.PowerMockito; -import org.powermock.modules.junit4.PowerMockRunner; - -@RunWith(MockitoJUnitRunner.class) -public class JU_FileServer { - @Mock - AuthzEnv authzEnvMock; - AuthzEnv authzEnv = new AuthzEnv(); - - @Before - public void setUp() throws APIException, IOException{ - - } - - @SuppressWarnings("static-access") - @Test - public void testMain() throws Exception{ - - String[] args = null; - Properties props = new Properties(); - ClassLoader classLoader = getClass().getClassLoader(); - File file = new File(classLoader.getResource("FileServer.props").getFile()); - -//PowerMockito.whenNew(Something.class).withArguments(argument).thenReturn(mockSomething); - // env.setLog4JNames("log4j.properties","authz","fs","audit","init",null); - // PowerMockito.whenNew(AuthzEnv.class).withArguments(props).thenReturn(authzEnvMock); - // PowerMockito.doNothing().when(authzEnvMock.setLog4JNames(Matchers.anyString(), Matchers.anyString(), Matchers.anyString(), Matchers.anyString(), Matchers.anyString(), Matchers.anyString())); - // PowerMockito.when(new AuthzEnv(props)).thenReturn(authzEnvMock); - //PowerMockito.doNothing().when(authzEnv).setLog4JNames(Matchers.anyString(), Matchers.anyString(), Matchers.anyString(), Matchers.anyString(), Matchers.anyString(), Matchers.anyString()); - //PowerMockito.doNothing().when(authzEnvMock).setLog4JNames(" "," "," "," "," "," "); - - AAF_FS.main(args); - //assertTrue(true); - - } - -} diff --git a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Approval.java b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Approval.java index 010417c5..f302742f 100644 --- a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Approval.java +++ b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Approval.java @@ -60,9 +60,9 @@ public class JU_API_Approval { //assertTrue(true); } - @Test - public void notYetImplemented() { - fail("Tests in this file should not be trusted"); - } +// @Test +// public void notYetImplemented() { +// fail("Tests in this file should not be trusted"); +// } } diff --git a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Creds.java b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Creds.java index 9f33f496..41d4daf0 100644 --- a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Creds.java +++ b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Creds.java @@ -71,10 +71,10 @@ public class JU_API_Creds { e.printStackTrace(); } } - - @Test - public void notYetImplemented() { - fail("Tests in this file should not be trusted"); - } +// +// @Test +// public void notYetImplemented() { +// fail("Tests in this file should not be trusted"); +// } } diff --git a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Delegate.java b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Delegate.java index 1e4f1441..9ca81525 100644 --- a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Delegate.java +++ b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Delegate.java @@ -55,10 +55,10 @@ public class JU_API_Delegate { e.printStackTrace(); } } - - @Test - public void notYetImplemented() { - fail("Tests in this file should not be trusted"); - } +// +// @Test +// public void notYetImplemented() { +// fail("Tests in this file should not be trusted"); +// } } diff --git a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_History.java b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_History.java index 28fca969..dc0a8260 100644 --- a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_History.java +++ b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_History.java @@ -59,9 +59,9 @@ public class JU_API_History { assertTrue(true); } - @Test - public void notYetImplemented() { - fail("Tests in this file should not be trusted"); - } +// @Test +// public void notYetImplemented() { +// fail("Tests in this file should not be trusted"); +// } } diff --git a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Mgmt.java b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Mgmt.java deleted file mode 100644 index 10f08e9d..00000000 --- a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Mgmt.java +++ /dev/null @@ -1,66 +0,0 @@ -/******************************************************************************* - * ============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==================================================== - * * - * * - ******************************************************************************/ -package org.onap.aaf.auth.service.api.test; - -import static org.junit.Assert.*; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.onap.aaf.auth.service.AAF_Service; -import org.onap.aaf.auth.service.api.API_Mgmt; - -import org.onap.aaf.auth.service.facade.AuthzFacade; - -import org.powermock.modules.junit4.PowerMockRunner; -@RunWith(PowerMockRunner.class) -public class JU_API_Mgmt { - API_Mgmt api_Mgmt; - - @Mock - AAF_Service authzAPI; - AuthzFacade facade; - - @Before - public void setUp(){ - - } - - @SuppressWarnings("static-access") - @Test - public void testInit(){ - - try { - api_Mgmt.init(authzAPI, facade); - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } - - @Test - public void notYetImplemented() { - fail("Tests in this file should not be trusted"); - } - -} diff --git a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_NS.java b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_NS.java index 05803414..ce123404 100644 --- a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_NS.java +++ b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_NS.java @@ -51,9 +51,9 @@ public class JU_API_NS { } } - @Test - public void notYetImplemented() { - fail("Tests in this file should not be trusted"); - } +// @Test +// public void notYetImplemented() { +// fail("Tests in this file should not be trusted"); +// } } diff --git a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Perms.java b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Perms.java index aa62433b..f778fd9e 100644 --- a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Perms.java +++ b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Perms.java @@ -67,9 +67,9 @@ public class JU_API_Perms { } } - @Test - public void notYetImplemented() { - fail("Tests in this file should not be trusted"); - } +// @Test +// public void notYetImplemented() { +// fail("Tests in this file should not be trusted"); +// } } diff --git a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Roles.java b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Roles.java index e890ef5a..67506d32 100644 --- a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Roles.java +++ b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_Roles.java @@ -57,9 +57,9 @@ public class JU_API_Roles { } } - @Test - public void notYetImplemented() { - fail("Tests in this file should not be trusted"); - } +// @Test +// public void notYetImplemented() { +// fail("Tests in this file should not be trusted"); +// } } diff --git a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_User.java b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_User.java index 6c0ca0ce..89e5875f 100644 --- a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_User.java +++ b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_User.java @@ -56,9 +56,9 @@ public class JU_API_User { } } - @Test - public void notYetImplemented() { - fail("Tests in this file should not be trusted"); - } +// @Test +// public void notYetImplemented() { +// fail("Tests in this file should not be trusted"); +// } } diff --git a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_UserRole.java b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_UserRole.java index 72954134..dce67063 100644 --- a/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_UserRole.java +++ b/auth/auth-service/src/test/java/org/onap/aaf/auth/service/api/test/JU_API_UserRole.java @@ -52,9 +52,9 @@ public class JU_API_UserRole { } } - @Test - public void notYetImplemented() { - fail("Tests in this file should not be trusted"); - } +// @Test +// public void notYetImplemented() { +// fail("Tests in this file should not be trusted"); +// } } diff --git a/pom.xml b/pom.xml index d54be3c4..dbcd41ca 100644 --- a/pom.xml +++ b/pom.xml @@ -39,6 +39,23 @@ /content/repositories/releases/ /content/repositories/staging/ /content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version} + + false + + 0.7.7.201606060606 + 3.2 + jacoco + + target/code-coverage/jacoco-ut.exec + target/code-coverage/jacoco-it.exec + + **/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/** + https://nexus.onap.org + /content/repositories/snapshots/ + /content/repositories/releases/ + /content/repositories/staging/ + /content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version} + @@ -60,11 +77,62 @@ ecomp-staging - - org.sonarsource.scanner.maven - sonar-maven-plugin - 3.2 - + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.2 + + + org.jacoco + jacoco-maven-plugin + 0.7.7.201606060606 + + true + + org.onap.aaf.* + + + + + pre-unit-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco.exec + + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + ${project.build.directory}/coverage-reports/jacoco-it.exec + + + + + + merge + + post-integration-test + + + + ${project.build.directory}/coverage-reports + + *.exec + + + + ${project.build.directory}/jacoco-dev.exec + + + + -- 2.16.6