From fede312b74f6caa7b5437a419b8d05a8eeffedf6 Mon Sep 17 00:00:00 2001 From: Joss Armstrong Date: Wed, 9 Jan 2019 15:30:17 +0000 Subject: Test coverage in appc-dg-ssh Increased line coverage from 49% to 93% Issue-ID: APPC-1313 Change-Id: I2f27742fd996cd6d07668fd61c887e29f2140818 Signed-off-by: Joss Armstrong --- .../dg/licmgr/impl/LicenseManagerPluginImpl.java | 27 +++++++++-- .../licmgr/impl/LicenseManagerPluginImplTest.java | 56 ++++++++++++++++++++++ 2 files changed, 78 insertions(+), 5 deletions(-) create mode 100644 appc-dg/appc-dg-shared/appc-dg-license-manager/src/test/java/org/onap/appc/dg/licmgr/impl/LicenseManagerPluginImplTest.java (limited to 'appc-dg/appc-dg-shared/appc-dg-license-manager/src') diff --git a/appc-dg/appc-dg-shared/appc-dg-license-manager/src/main/java/org/onap/appc/dg/licmgr/impl/LicenseManagerPluginImpl.java b/appc-dg/appc-dg-shared/appc-dg-license-manager/src/main/java/org/onap/appc/dg/licmgr/impl/LicenseManagerPluginImpl.java index 1f9cd946b..281d32798 100644 --- a/appc-dg/appc-dg-shared/appc-dg-license-manager/src/main/java/org/onap/appc/dg/licmgr/impl/LicenseManagerPluginImpl.java +++ b/appc-dg/appc-dg-shared/appc-dg-license-manager/src/main/java/org/onap/appc/dg/licmgr/impl/LicenseManagerPluginImpl.java @@ -5,6 +5,8 @@ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Copyright (C) 2017 Amdocs + * ================================================================================ + * Modifications (C) 2019 Ericsson * ============================================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -76,8 +78,14 @@ public class LicenseManagerPluginImpl implements LicenseManagerPlugin { LicenseModel licenseModel = licenseManager.retrieveLicenseModel(params.get(Constants.VNF_TYPE_FIELD_NAME), params.get(Constants.VNF_RESOURCE_VERSION_FIELD_NAME)); - String modelEntitlementPoolUuid = licenseModel.getEntitlementPoolUuid(); if (null == modelEntitlementPoolUuid) modelEntitlementPoolUuid = ""; - String aaiEntitlementPoolUuid = ctx.getAttribute(Constants.AAI_ENTITLMENT_POOL_UUID_NAME); if (null == aaiEntitlementPoolUuid) aaiEntitlementPoolUuid = ""; + String modelEntitlementPoolUuid = licenseModel.getEntitlementPoolUuid(); + if (null == modelEntitlementPoolUuid) { + modelEntitlementPoolUuid = ""; + } + String aaiEntitlementPoolUuid = ctx.getAttribute(Constants.AAI_ENTITLMENT_POOL_UUID_NAME); + if (null == aaiEntitlementPoolUuid) { + aaiEntitlementPoolUuid = ""; + } boolean isAcquireEntitlementRequire = !modelEntitlementPoolUuid.isEmpty() && !modelEntitlementPoolUuid.equals(aaiEntitlementPoolUuid); boolean isReleaseEntitlementRequire = !aaiEntitlementPoolUuid.isEmpty() && (isAcquireEntitlementRequire || modelEntitlementPoolUuid.isEmpty()); boolean isAAIEntitlementUpdateRequire = isAcquireEntitlementRequire || isReleaseEntitlementRequire; @@ -87,9 +95,18 @@ public class LicenseManagerPluginImpl implements LicenseManagerPlugin { ctx.setAttribute(Constants.IS_AAI_ENTITLEMENT_UPDATE_REQUIRE, Boolean.toString(isAAIEntitlementUpdateRequire)); - String modelLicenseKeyGroupUuid = licenseModel.getLicenseKeyGroupUuid(); if (null == modelLicenseKeyGroupUuid) modelLicenseKeyGroupUuid = ""; - String aaiLicenseKeyGroupUuid = ctx.getAttribute(Constants.AAI_LICENSE_KEY_UUID_NAME); if (null == aaiLicenseKeyGroupUuid) aaiLicenseKeyGroupUuid = ""; - String aaiLicenseKeyValue = ctx.getAttribute(Constants.AAI_LICENSE_KEY_VALUE); if (null == aaiLicenseKeyValue) aaiLicenseKeyValue = ""; + String modelLicenseKeyGroupUuid = licenseModel.getLicenseKeyGroupUuid(); + if (null == modelLicenseKeyGroupUuid) { + modelLicenseKeyGroupUuid = ""; + } + String aaiLicenseKeyGroupUuid = ctx.getAttribute(Constants.AAI_LICENSE_KEY_UUID_NAME); + if (null == aaiLicenseKeyGroupUuid) { + aaiLicenseKeyGroupUuid = ""; + } + String aaiLicenseKeyValue = ctx.getAttribute(Constants.AAI_LICENSE_KEY_VALUE); + if (null == aaiLicenseKeyValue) { + aaiLicenseKeyValue = ""; + } boolean isAcquireLicenseRequire = !modelLicenseKeyGroupUuid.isEmpty() && !modelLicenseKeyGroupUuid.equals(aaiLicenseKeyGroupUuid); boolean isReleaseLicenseRequire = !aaiLicenseKeyGroupUuid.isEmpty() && (isAcquireLicenseRequire || modelLicenseKeyGroupUuid.isEmpty()); boolean isAAILicenseUpdateRequire = isAcquireLicenseRequire || isReleaseLicenseRequire; diff --git a/appc-dg/appc-dg-shared/appc-dg-license-manager/src/test/java/org/onap/appc/dg/licmgr/impl/LicenseManagerPluginImplTest.java b/appc-dg/appc-dg-shared/appc-dg-license-manager/src/test/java/org/onap/appc/dg/licmgr/impl/LicenseManagerPluginImplTest.java new file mode 100644 index 000000000..cee75ba47 --- /dev/null +++ b/appc-dg/appc-dg-shared/appc-dg-license-manager/src/test/java/org/onap/appc/dg/licmgr/impl/LicenseManagerPluginImplTest.java @@ -0,0 +1,56 @@ +/* + * ============LICENSE_START======================================================= + * ONAP : APPC + * ================================================================================ + * Copyright (C) 2019 Ericsson + * ============================================================================= + * 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.appc.dg.licmgr.impl; + +import org.junit.Assert; +import java.util.HashMap; +import java.util.Map; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.licmgr.LicenseManager; +import org.onap.appc.licmgr.objects.LicenseModel; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; +import org.mockito.Mockito; + +@RunWith(PowerMockRunner.class) +@PrepareForTest(LicenseModel.class) +public class LicenseManagerPluginImplTest { + + private LicenseManager licenseManagerMock = Mockito.mock(LicenseManager.class); + private LicenseModel licenseModelMock = PowerMockito.mock(LicenseModel.class); + + @Test + public void testRetrieveLicenseModel() throws APPCException { + LicenseManagerPluginImpl lmImpl = new LicenseManagerPluginImpl(); + lmImpl.setLicenseManager(licenseManagerMock); + Mockito.doReturn(licenseModelMock).when(licenseManagerMock).retrieveLicenseModel(Mockito.anyString(), Mockito.anyString()); + Map params = new HashMap<>(); + SvcLogicContext ctx = new SvcLogicContext(); + lmImpl.retrieveLicenseModel(params, ctx); + Assert.assertEquals("", ctx.getAttribute("license-key")); + } + +} -- cgit 1.2.3-korg