From 81e5c5f26e913e23dd8f02a68ca5a74d0d39f24c Mon Sep 17 00:00:00 2001 From: "Kalkere Ramesh, Sharan (sk720x)" Date: Wed, 28 Mar 2018 10:20:33 -0400 Subject: Added junit for policy client impl Change-Id: Ibe5319e9b795355372cbd5ef374a545fb3a9b1d3 Issue-ID: SO-542 Signed-off-by: Kalkere Ramesh, Sharan (sk720x) --- common/pom.xml | 16 ++ .../mso/client/policy/PolicyClientImpl.java | 2 +- .../mso/client/policy/PolicyClientImplTest.java | 179 ++++++++++++--------- 3 files changed, 121 insertions(+), 76 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 23692832e4..9f3497b38a 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -150,6 +150,22 @@ guava 22.0 + + com.shazam + shazamcrest + 0.11 + test + + + com.google.guava + guava + + + org.apache.commons + commons-lang3 + + + log4j log4j diff --git a/common/src/main/java/org/openecomp/mso/client/policy/PolicyClientImpl.java b/common/src/main/java/org/openecomp/mso/client/policy/PolicyClientImpl.java index dc24b7ce16..0ce1911c82 100644 --- a/common/src/main/java/org/openecomp/mso/client/policy/PolicyClientImpl.java +++ b/common/src/main/java/org/openecomp/mso/client/policy/PolicyClientImpl.java @@ -60,7 +60,7 @@ public class PolicyClientImpl implements PolicyClient { return this.getDecision(decisionAttributes); } - private PolicyDecision getDecision(DecisionAttributes decisionAttributes) { + protected PolicyDecision getDecision(DecisionAttributes decisionAttributes) { PolicyRestClient client = new PolicyRestClient(this.props, PolicyServiceType.GET_DECISION); PolicyDecisionRequest decisionRequest = new PolicyDecisionRequest(); decisionRequest.setDecisionAttributes(decisionAttributes); diff --git a/common/src/test/java/org/openecomp/mso/client/policy/PolicyClientImplTest.java b/common/src/test/java/org/openecomp/mso/client/policy/PolicyClientImplTest.java index 88cb4fa2a4..f406667870 100644 --- a/common/src/test/java/org/openecomp/mso/client/policy/PolicyClientImplTest.java +++ b/common/src/test/java/org/openecomp/mso/client/policy/PolicyClientImplTest.java @@ -1,75 +1,104 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 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.openecomp.mso.client.policy; - -import static org.junit.Assert.assertEquals; - -import org.junit.Ignore; -import org.junit.Test; -import org.openecomp.mso.client.defaultproperties.PolicyRestPropertiesImpl; -import org.openecomp.mso.client.policy.entities.Bbid; -import org.openecomp.mso.client.policy.entities.DictionaryData; -import org.openecomp.mso.client.policy.entities.PolicyDecision; -import org.openecomp.mso.client.policy.entities.PolicyServiceType; -import org.openecomp.mso.client.policy.entities.Workstep; - -public class PolicyClientImplTest { - - @Test - public void successReadProperties() { - PolicyRestClient client = new PolicyRestClient(new PolicyRestPropertiesImpl(), PolicyServiceType.GET_DECISION); - client.initializeHeaderMap(client.headerMap); - - assertEquals("Found expected Client Auth", client.headerMap.get("ClientAuth"), "Basic bTAzNzQzOnBvbGljeVIwY2sk"); - assertEquals("Found expected Authorization", client.headerMap.get("Authorization"), "Basic dGVzdHBkcDphbHBoYTEyMw=="); - assertEquals("Found expected Environment", client.headerMap.get("Environment"), "TEST"); - assertEquals("Has X-ECOMP-RequestID", client.headerMap.containsKey("X-ECOMP-RequestID"), true); - } - - @Test - @Ignore - public void getDecisionTest() { - PolicyClient client = new PolicyClientImpl(); - PolicyDecision decision = client.getDecision("S", "V", "BB1", "1", "123"); - assertEquals("Decision is correct", decision.getDecision(), "PERMIT"); - assertEquals("Decision details is correct", decision.getDetails(), "Retry"); - } - - @Test - @Ignore - public void getAllowedTreatmentsTest(){ - PolicyClient client = new PolicyClientImpl(); - DictionaryData dictClient = client.getAllowedTreatments("BB1", "1"); - final String dictBbidString = dictClient.getBbid().getString(); - final String dictWorkStepString = dictClient.getWorkstep().getString(); - assertEquals("DictionaryData matches a response Bbid", dictBbidString, "BB1"); - assertEquals("DicitonaryData matches a response WorkStep", dictWorkStepString, "1"); - } - /* - @Test - public void getAllowedTreatmentsTest() { - PolicyClient client = new PolicyClientImpl(); - AllowedTreatments allowedTreatments = client.getAllowedTreatments("BB1", "1"); - int expectedSizeOfList = 4; - int sizeOfList = allowedTreatments.getAllowedTreatments().size(); - assertEquals("Decision is correct", sizeOfList, expectedSizeOfList); - }*/ -} +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 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.openecomp.mso.client.policy; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.doReturn; +import static com.shazam.shazamcrest.MatcherAssert.assertThat; +import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs; + +import org.junit.Ignore; +import org.junit.Test; +import org.mockito.Mockito; +import org.openecomp.mso.client.defaultproperties.PolicyRestPropertiesImpl; +import org.openecomp.mso.client.policy.entities.DecisionAttributes; +import org.openecomp.mso.client.policy.entities.DictionaryData; +import org.openecomp.mso.client.policy.entities.PolicyDecision; +import org.openecomp.mso.client.policy.entities.PolicyServiceType; + +public class PolicyClientImplTest { + + @Test + public void successReadProperties() { + PolicyRestClient client = new PolicyRestClient(new PolicyRestPropertiesImpl(), PolicyServiceType.GET_DECISION); + client.initializeHeaderMap(client.headerMap); + + assertEquals("Found expected Client Auth", client.headerMap.get("ClientAuth"), + "Basic bTAzNzQzOnBvbGljeVIwY2sk"); + assertEquals("Found expected Authorization", client.headerMap.get("Authorization"), + "Basic dGVzdHBkcDphbHBoYTEyMw=="); + assertEquals("Found expected Environment", client.headerMap.get("Environment"), "TEST"); + assertEquals("Has X-ECOMP-RequestID", client.headerMap.containsKey("X-ECOMP-RequestID"), true); + } + + @Test + public void getDecisionMockTest() { + String serviceType = "S"; + String vnfType = "V"; + String bbID = "BB1"; + String workStep = "1"; + String errorCode = "123"; + + PolicyDecision expected = new PolicyDecision(); + expected.setDecision("PERMIT"); + expected.setDetails("Retry"); + + DecisionAttributes decisionAttributes = new DecisionAttributes(); + decisionAttributes.setServiceType(serviceType); + decisionAttributes.setVNFType(vnfType); + decisionAttributes.setBBID(bbID); + decisionAttributes.setWorkStep(workStep); + decisionAttributes.setErrorCode(errorCode); + PolicyClient client = Mockito.spy(PolicyClientImpl.class); + + doReturn(expected).when(client).getDecision(serviceType, vnfType, bbID, workStep, errorCode); + + PolicyDecision actual = client.getDecision(serviceType, vnfType, bbID, workStep, errorCode); + assertThat(actual, sameBeanAs(expected)); + } + + @Test + @Ignore + public void getDecisionTest() { + PolicyClient client = new PolicyClientImpl(); + PolicyDecision decision = client.getDecision("S", "V", "BB1", "1", "123"); + assertEquals("Decision is correct", decision.getDecision(), "PERMIT"); + assertEquals("Decision details is correct", decision.getDetails(), "Retry"); + } + + @Test + @Ignore + public void getAllowedTreatmentsTest() { + PolicyClient client = new PolicyClientImpl(); + DictionaryData dictClient = client.getAllowedTreatments("BB1", "1"); + final String dictBbidString = dictClient.getBbid().getString(); + final String dictWorkStepString = dictClient.getWorkstep().getString(); + assertEquals("DictionaryData matches a response Bbid", dictBbidString, "BB1"); + assertEquals("DicitonaryData matches a response WorkStep", dictWorkStepString, "1"); + } + /* + * @Test public void getAllowedTreatmentsTest() { PolicyClient client = new + * PolicyClientImpl(); AllowedTreatments allowedTreatments = + * client.getAllowedTreatments("BB1", "1"); int expectedSizeOfList = 4; int + * sizeOfList = allowedTreatments.getAllowedTreatments().size(); + * assertEquals("Decision is correct", sizeOfList, expectedSizeOfList); } + */ +} -- cgit 1.2.3-korg