X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=webapp-backend%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fportal%2Fnonrtric%2Fcontrolpanel%2Fpolicyagentapi%2FPolicyAgentApiImplTest.java;h=1d84de49e5f39ba196db1c7ebafb31df60e84fac;hb=6b3b1b864dea5c5ed5154cf9a7210b672917feca;hp=ade63433770a45820a10d424b68ddad735708886;hpb=6c32d755f6bd864f2888d5b7242edf344b21f5aa;p=portal%2Fnonrtric-controlpanel.git

diff --git a/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/policyagentapi/PolicyAgentApiImplTest.java b/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/policyagentapi/PolicyAgentApiImplTest.java
index ade6343..1d84de4 100644
--- a/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/policyagentapi/PolicyAgentApiImplTest.java
+++ b/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/policyagentapi/PolicyAgentApiImplTest.java
@@ -23,7 +23,6 @@ package org.oransc.portal.nonrtric.controlpanel.policyagentapi;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.contains;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -48,7 +47,7 @@ import org.springframework.web.client.HttpServerErrorException;
 import reactor.core.publisher.Mono;
 
 class PolicyAgentApiImplTest {
-    private static final String URL_POLICY_SCHEMAS = "/v2/policy-types";
+    private static final String URL_POLICY_SCHEMAS = "/a1-policy/v2/policy-types";
     private static final String POLICY_TYPE_1_ID = "type1";
     private static final String POLICY_TYPE_1_VALID = "{\"title\":\"type1\"}";
     private static final String POLICY_TYPE_1_INVALID = "\"title\":\"type1\"}";
@@ -65,7 +64,9 @@ class PolicyAgentApiImplTest {
     private static final String RIC_1_INFO_INVALID = "{\"ric_id\":\"ric1\",\"policytype_ids\":\"type1\"]}";
     private static final String CLIENT_ERROR_MESSAGE = "XXXXXXX";
     private static final String SERVICE_ID = "controlpanel";
-
+    private static final String TIMESTAMP = "2021-01-12T09:59:33.392470Z";
+    private static final String STATUS =
+        "{\"last_modified\": \"" + TIMESTAMP + "\",\"status\":{\"enforceStatus\": \"\",\"enforceReason\": \"\"}}";
     private static com.google.gson.Gson gson = new GsonBuilder() //
         .serializeNulls() //
         .create(); //
@@ -121,7 +122,7 @@ class PolicyAgentApiImplTest {
     }
 
     private String urlPolicyInstances(String type) {
-        return "/v2/policies?policytype_id=" + type;
+        return "/a1-policy/v2/policies?policytype_id=" + type;
     }
 
     @Test
@@ -140,6 +141,7 @@ class PolicyAgentApiImplTest {
 
         whenGetReturnOK(urlPolicyInstances(POLICY_TYPE_1_ID), HttpStatus.OK, policyInstances);
         whenGetReturnOK(urlPolicyInstance(POLICY_1_ID), HttpStatus.OK, POLICY_1_VALID);
+        whenGetReturnOK(urlPolicyStatus(POLICY_1_ID), HttpStatus.OK, STATUS);
 
         ResponseEntity<String> returnedResp = apiUnderTest.getPolicyInstancesForType(POLICY_TYPE_1_ID);
         assertEquals(returnedResp.getBody(), policyInstancesJson);
@@ -159,12 +161,17 @@ class PolicyAgentApiImplTest {
     }
 
     private String urlPolicyInstance(String id) {
-        return "/v2/policies/" + id;
+        return "/a1-policy/v2/policies/" + id;
+    }
+
+    private String urlPolicyStatus(String id) {
+        return "/a1-policy/v2/policies/" + id + "/status";
     }
 
     @Test
     void testGetPolicyInstance() {
         whenGetReturnOK(urlPolicyInstance(POLICY_1_ID), HttpStatus.OK, POLICY_1_VALID);
+        whenGetReturnOK(urlPolicyStatus(POLICY_1_ID), HttpStatus.OK, STATUS);
 
         ResponseEntity<Object> returnedResp = apiUnderTest.getPolicyInstance(POLICY_1_ID);
 
@@ -173,33 +180,33 @@ class PolicyAgentApiImplTest {
     }
 
     private String urlPutPolicy() {
-        return "/v2/policies/";
+        return "/a1-policy/v2/policies/";
     }
 
     private void whenPutReturnOK(String url, String putBody, HttpStatus status, String body) {
         ResponseEntity<String> ret = new ResponseEntity<>(body, status);
-        when(restClient.putForEntity(eq(url), contains(SERVICE_ID))).thenReturn(Mono.just(ret));
+        when(restClient.putForEntity(eq(url), eq(putBody))).thenReturn(Mono.just(ret));
     }
 
     private void whenPutReturnFailure(String url, String putBody, HttpStatus status, String body) {
         HttpServerErrorException e =
             new HttpServerErrorException(status, body, body.getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8);
-        when(restClient.putForEntity(eq(url), contains(SERVICE_ID))).thenReturn(Mono.error(e));
+        when(restClient.putForEntity(eq(url), eq(putBody))).thenReturn(Mono.error(e));
     }
 
     @Test
     void testPutPolicyFailure() {
         String url = urlPutPolicy();
-
+        JsonElement data = JsonParser.parseString(POLICY_DATA).getAsJsonObject();
         PolicyInstance i = PolicyInstance.builder() //
             .policyId(POLICY_1_ID) //
             .policyTypeId(POLICY_TYPE_1_ID) //
             .ricId(RIC_1_ID) //
-            .policyData(POLICY_DATA) //
+            .policyData(data) //
             .serviceId(SERVICE_ID) //
             .build(); //
 
-        String jsonStr = gson.toJson(i, PolicyInstance.class);
+        String jsonStr = gson.toJson(i);
         whenPutReturnFailure(url, jsonStr, HttpStatus.NOT_FOUND, CLIENT_ERROR_MESSAGE);
 
         ResponseEntity<String> returnedResp =
@@ -212,15 +219,15 @@ class PolicyAgentApiImplTest {
     @Test
     void testPutPolicySuccess() {
         String url = urlPutPolicy();
+        JsonElement data = JsonParser.parseString(POLICY_DATA).getAsJsonObject();
         PolicyInstance i = PolicyInstance.builder() //
             .policyId(POLICY_1_ID) //
             .policyTypeId(POLICY_TYPE_1_ID) //
             .ricId(RIC_1_ID) //
-            .policyData(POLICY_DATA) //
+            .policyData(data) //
             .serviceId(SERVICE_ID) //
             .build(); //
-        String jsonStr = gson.toJson(i, PolicyInstance.class);
-
+        String jsonStr = gson.toJson(i);
         whenPutReturnOK(url, jsonStr, HttpStatus.OK, POLICY_1_VALID);
 
         ResponseEntity<String> returnedResp =
@@ -241,7 +248,7 @@ class PolicyAgentApiImplTest {
     }
 
     private String deletePolicyUrl(String id) {
-        return "/v2/policies/" + id;
+        return "/a1-policy/v2/policies/" + id;
     }
 
     @Test
@@ -263,7 +270,7 @@ class PolicyAgentApiImplTest {
     }
 
     private String urlRicInfo(String typeName) {
-        return "/v2/rics?policytype_id=" + typeName;
+        return "/a1-policy/v2/rics?policytype_id=" + typeName;
     }
 
     @Test
@@ -301,6 +308,7 @@ class PolicyAgentApiImplTest {
                 .ricId(RIC_1_ID) //
                 .policyData(data) //
                 .serviceId(SERVICE_ID) //
+                .lastModified(TIMESTAMP) //
                 .build(); //
             res.add(i);
         }