diff options
| -rw-r--r-- | src/main/java/org/onap/dmaap/dbcapi/aaf/AafServiceImpl.java | 28 | ||||
| -rw-r--r-- | src/test/java/org/onap/dmaap/dbcapi/aaf/AafServiceImplTest.java | 168 |
2 files changed, 183 insertions, 13 deletions
diff --git a/src/main/java/org/onap/dmaap/dbcapi/aaf/AafServiceImpl.java b/src/main/java/org/onap/dmaap/dbcapi/aaf/AafServiceImpl.java index 49810f3..edce4f0 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/aaf/AafServiceImpl.java +++ b/src/main/java/org/onap/dmaap/dbcapi/aaf/AafServiceImpl.java @@ -25,10 +25,12 @@ import org.onap.dmaap.dbcapi.logging.DmaapbcLogMessageEnum; public class AafServiceImpl extends BaseLoggingClass implements AafService { - private String aafUrl; - private String identity; - private boolean useAAF; - private AafConnection aafConnection; + private static final int CREATED = 201; + private static final int OK = 200; + private final String aafUrl; + private final String identity; + private final boolean useAAF; + private final AafConnection aafConnection; AafServiceImpl(boolean useAaf, String aafUrl, String identity, AafConnection aafConnection) { this.useAAF = useAaf; @@ -45,47 +47,47 @@ public class AafServiceImpl extends BaseLoggingClass implements AafService { @Override public int addPerm(DmaapPerm perm) { logger.info("entry: addPerm() "); - return doPost(perm, "authz/perm", 201); + return doPost(perm, "authz/perm", CREATED); } @Override public int delPerm(DmaapPerm perm) { - return 200; + return OK; } @Override public int addGrant(DmaapGrant grant) { logger.info("entry: addGrant() "); - return doPost(grant, "authz/role/perm", 201); + return doPost(grant, "authz/role/perm", CREATED); } @Override public int addUserRole(AafUserRole ur) { logger.info("entry: addUserRole() "); - return doPost(ur, "authz/userRole", 201); + return doPost(ur, "authz/userRole", CREATED); } @Override public int delGrant(DmaapGrant grant) { logger.info("entry: delGrant() "); - return doDelete(grant, "authz/role/:" + grant.getRole() + "/perm", 200); + return doDelete(grant, "authz/role/:" + grant.getRole() + "/perm", OK); } @Override public int addRole(AafRole role) { logger.info("entry: addRole() "); - return doPost(role, "authz/role", 201); + return doPost(role, "authz/role", CREATED); } @Override public int addNamespace(AafNamespace ns) { logger.info("entry: addNamespace() "); - return doPost(ns, "authz/ns", 201); + return doPost(ns, "authz/ns", CREATED); } @Override public int delNamespace(AafNamespace ns) { - return 200; + return OK; } private int doPost(AafObject obj, String uri, int expect) { @@ -136,7 +138,7 @@ public class AafServiceImpl extends BaseLoggingClass implements AafService { case 404: logger.warn("Object not found...ignore"); break; - case 200: + case OK: logger.info("expected response"); break; default: diff --git a/src/test/java/org/onap/dmaap/dbcapi/aaf/AafServiceImplTest.java b/src/test/java/org/onap/dmaap/dbcapi/aaf/AafServiceImplTest.java new file mode 100644 index 0000000..fd70a16 --- /dev/null +++ b/src/test/java/org/onap/dmaap/dbcapi/aaf/AafServiceImplTest.java @@ -0,0 +1,168 @@ +/*- + * ============LICENSE_START======================================================= + * org.onap.dmaap + * ================================================================================ + * Copyright (C) 2019 Nokia 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.dmaap.dbcapi.aaf; + +import junitparams.JUnitParamsRunner; +import junitparams.Parameters; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import static org.junit.Assert.assertEquals; +import static org.mockito.BDDMockito.given; +import static org.mockito.BDDMockito.then; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.verifyZeroInteractions; + +@RunWith(JUnitParamsRunner.class) +public class AafServiceImplTest { + + private static final String AAF_URL = "https://aaf.url/"; + private static final String IDENTITY = "dmaap-bc@onap.org"; + private static final boolean USE_AAF = true; + private static final int CREATED = 201; + private static final int OK = 200; + @Mock + private AafConnection aafConnection; + private AafServiceImpl aafService; + + @Before + public void setUp() throws Exception { + MockitoAnnotations.initMocks(this); + given(aafConnection.postAaf(any(AafObject.class), anyString())).willReturn(CREATED); + given(aafConnection.delAaf(any(AafObject.class), anyString())).willReturn(OK); + aafService = new AafServiceImpl(USE_AAF, AAF_URL, IDENTITY, aafConnection); + } + + @Test + public void shouldReturnCorrectIdentity() { + + assertEquals(IDENTITY, aafService.getIdentity()); + } + + @Test + public void shouldAddPermission() { + DmaapPerm perm = new DmaapPerm("perm", "type", "action"); + + int status = aafService.addPerm(perm); + + then(aafConnection).should().postAaf(perm, AAF_URL + "authz/perm"); + assertEquals(CREATED, status); + } + + + @Test + public void shouldAddDmaapGrant() { + DmaapGrant grant = new DmaapGrant(new DmaapPerm("perm", "type", "action"), "roles"); + + int status = aafService.addGrant(grant); + + then(aafConnection).should().postAaf(grant, AAF_URL + "authz/role/perm"); + assertEquals(CREATED, status); + } + + @Test + public void shouldAddUserRole() { + AafUserRole userRole = new AafUserRole("ident", "role"); + + int status = aafService.addUserRole(userRole); + + then(aafConnection).should().postAaf(userRole, AAF_URL + "authz/userRole"); + assertEquals(CREATED, status); + } + + @Test + public void shouldAddRole() { + AafRole role = new AafRole("ns", "role"); + + int status = aafService.addRole(role); + + then(aafConnection).should().postAaf(role, AAF_URL + "authz/role"); + assertEquals(CREATED, status); + } + + @Test + public void shouldAddNamespace() { + AafNamespace ns = new AafNamespace("ns", "ident"); + + int status = aafService.addNamespace(ns); + + then(aafConnection).should().postAaf(ns, AAF_URL + "authz/ns"); + assertEquals(CREATED, status); + } + + @Test + public void shouldDeleteDmaapGrant() { + DmaapGrant grant = new DmaapGrant(new DmaapPerm("perm", "type", "action"), "roles"); + + int status = aafService.delGrant(grant); + + then(aafConnection).should().delAaf(grant, AAF_URL + "authz/role/:" + grant.getRole() + "/perm"); + assertEquals(OK, status); + } + + @Test + public void shouldNotConnectToAafDuringCreate() { + aafService = new AafServiceImpl(false, AAF_URL, IDENTITY, aafConnection); + DmaapPerm perm = new DmaapPerm("perm", "type", "action"); + + int status = aafService.addPerm(perm); + + verifyZeroInteractions(aafConnection); + assertEquals(CREATED, status); + } + + @Test + public void shouldNotConnectToAafDuringDelete() { + aafService = new AafServiceImpl(false, AAF_URL, IDENTITY, aafConnection); + DmaapGrant grant = new DmaapGrant(new DmaapPerm("perm", "type", "action"), "roles"); + + int status = aafService.delGrant(grant); + + verifyZeroInteractions(aafConnection); + assertEquals(OK, status); + } + + @Test + @Parameters({"401", "403", "409", "200", "500"}) + public void shouldHandleErrorDuringCreate(int aafServiceReturnedCode) { + given(aafConnection.postAaf(any(AafObject.class), anyString())).willReturn(aafServiceReturnedCode); + DmaapPerm perm = new DmaapPerm("perm", "type", "action"); + + int status = aafService.addPerm(perm); + + assertEquals(aafServiceReturnedCode, status); + } + + @Test + @Parameters({"401", "403", "404", "200", "500"}) + public void shouldHandleErrorDuringDelete(int aafServiceReturnedCode) { + given(aafConnection.delAaf(any(AafObject.class), anyString())).willReturn(aafServiceReturnedCode); + DmaapGrant grant = new DmaapGrant(new DmaapPerm("perm", "type", "action"), "roles"); + + int status = aafService.delGrant(grant); + + assertEquals(aafServiceReturnedCode, status); + } +}
\ No newline at end of file |