Added junit for policy client impl 93/39693/1
authorKalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
Wed, 28 Mar 2018 14:20:33 +0000 (10:20 -0400)
committerKalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
Wed, 28 Mar 2018 14:21:21 +0000 (10:21 -0400)
Change-Id: Ibe5319e9b795355372cbd5ef374a545fb3a9b1d3
Issue-ID: SO-542
Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
common/pom.xml
common/src/main/java/org/openecomp/mso/client/policy/PolicyClientImpl.java
common/src/test/java/org/openecomp/mso/client/policy/PolicyClientImplTest.java

index 2369283..9f3497b 100644 (file)
                        <artifactId>guava</artifactId>
                        <version>22.0</version>
                </dependency>
+               <dependency>
+                       <groupId>com.shazam</groupId>
+                       <artifactId>shazamcrest</artifactId>
+                       <version>0.11</version>
+                       <scope>test</scope>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>com.google.guava</groupId>
+                                       <artifactId>guava</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.apache.commons</groupId>
+                                       <artifactId>commons-lang3</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
                <dependency>
              <groupId>log4j</groupId>
              <artifactId>log4j</artifactId>
index dc24b7c..0ce1911 100644 (file)
@@ -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);
index 88cb4fa..f406667 100644 (file)
-/*-
- * ============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);
-       }*/
-}
+/*-\r
+ * ============LICENSE_START=======================================================\r
+ * ONAP - SO\r
+ * ================================================================================\r
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
+ * ================================================================================\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *      http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ * ============LICENSE_END=========================================================\r
+ */\r
+\r
+package org.openecomp.mso.client.policy;\r
+\r
+import static org.junit.Assert.assertEquals;\r
+import static org.mockito.Mockito.doReturn;\r
+import static com.shazam.shazamcrest.MatcherAssert.assertThat;\r
+import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;\r
+\r
+import org.junit.Ignore;\r
+import org.junit.Test;\r
+import org.mockito.Mockito;\r
+import org.openecomp.mso.client.defaultproperties.PolicyRestPropertiesImpl;\r
+import org.openecomp.mso.client.policy.entities.DecisionAttributes;\r
+import org.openecomp.mso.client.policy.entities.DictionaryData;\r
+import org.openecomp.mso.client.policy.entities.PolicyDecision;\r
+import org.openecomp.mso.client.policy.entities.PolicyServiceType;\r
+\r
+public class PolicyClientImplTest {\r
+\r
+       @Test\r
+       public void successReadProperties() {\r
+               PolicyRestClient client = new PolicyRestClient(new PolicyRestPropertiesImpl(), PolicyServiceType.GET_DECISION);\r
+               client.initializeHeaderMap(client.headerMap);\r
+\r
+               assertEquals("Found expected Client Auth", client.headerMap.get("ClientAuth"),\r
+                               "Basic bTAzNzQzOnBvbGljeVIwY2sk");\r
+               assertEquals("Found expected Authorization", client.headerMap.get("Authorization"),\r
+                               "Basic dGVzdHBkcDphbHBoYTEyMw==");\r
+               assertEquals("Found expected Environment", client.headerMap.get("Environment"), "TEST");\r
+               assertEquals("Has X-ECOMP-RequestID", client.headerMap.containsKey("X-ECOMP-RequestID"), true);\r
+       }\r
+\r
+       @Test\r
+       public void getDecisionMockTest() {\r
+               String serviceType = "S";\r
+               String vnfType = "V";\r
+               String bbID = "BB1";\r
+               String workStep = "1";\r
+               String errorCode = "123";\r
+               \r
+               PolicyDecision expected = new PolicyDecision();\r
+               expected.setDecision("PERMIT");\r
+               expected.setDetails("Retry");\r
+               \r
+               DecisionAttributes decisionAttributes = new DecisionAttributes();\r
+               decisionAttributes.setServiceType(serviceType);\r
+               decisionAttributes.setVNFType(vnfType);\r
+               decisionAttributes.setBBID(bbID);\r
+               decisionAttributes.setWorkStep(workStep);\r
+               decisionAttributes.setErrorCode(errorCode);\r
+               PolicyClient client = Mockito.spy(PolicyClientImpl.class);\r
+               \r
+               doReturn(expected).when(client).getDecision(serviceType, vnfType, bbID, workStep, errorCode);\r
+\r
+               PolicyDecision actual = client.getDecision(serviceType, vnfType, bbID, workStep, errorCode);\r
+               assertThat(actual, sameBeanAs(expected));\r
+       }\r
+\r
+       @Test\r
+       @Ignore\r
+       public void getDecisionTest() {\r
+               PolicyClient client = new PolicyClientImpl();\r
+               PolicyDecision decision = client.getDecision("S", "V", "BB1", "1", "123");\r
+               assertEquals("Decision is correct", decision.getDecision(), "PERMIT");\r
+               assertEquals("Decision details is correct", decision.getDetails(), "Retry");\r
+       }\r
+\r
+       @Test\r
+       @Ignore\r
+       public void getAllowedTreatmentsTest() {\r
+               PolicyClient client = new PolicyClientImpl();\r
+               DictionaryData dictClient = client.getAllowedTreatments("BB1", "1");\r
+               final String dictBbidString = dictClient.getBbid().getString();\r
+               final String dictWorkStepString = dictClient.getWorkstep().getString();\r
+               assertEquals("DictionaryData matches a response Bbid", dictBbidString, "BB1");\r
+               assertEquals("DicitonaryData matches a response WorkStep", dictWorkStepString, "1");\r
+       }\r
+       /*\r
+        * @Test public void getAllowedTreatmentsTest() { PolicyClient client = new\r
+        * PolicyClientImpl(); AllowedTreatments allowedTreatments =\r
+        * client.getAllowedTreatments("BB1", "1"); int expectedSizeOfList = 4; int\r
+        * sizeOfList = allowedTreatments.getAllowedTreatments().size();\r
+        * assertEquals("Decision is correct", sizeOfList, expectedSizeOfList); }\r
+        */\r
+}\r