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=b376c3b82c0d93549ef6e5013092bd7eccded024;hb=626cd0f862a3513f9267fed66c21bf9053b7b163;hp=dacb30389b5cf7d948b5162edb77bc86047b68f1;hpb=f507d92d55ee77fad16cc024ea95c869e0d5dc32;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 dacb303..b376c3b 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 @@ -64,9 +64,9 @@ public class PolicyAgentApiImplTest { private static final String URL_PREFIX = "UrlPrefix"; private static final String URL_POLICY_SCHEMAS = "/policy_schemas"; private static final String URL_POLICY_INSTANCES = "/policies?type={type}"; - private static final String URL_POLICY_INSTANCE = "/policy?instance={id}"; - private static final String URL_PUT_POLICY = "/policy?type={type}&instance={instance}&ric={ric}&service={service}"; - private static final String URL_DELETE_POLICY = "/policy?instance={instance}"; + private static final String URL_POLICY_INSTANCE = "/policy?id={id}"; + private static final String URL_PUT_POLICY = "/policy?type={type}&id={id}&ric={ric}&service={service}"; + private static final String URL_DELETE_POLICY = "/policy?id={id}"; private static final String URL_RIC_INFO = "/rics?policyType={typeName}"; private static final String POLICY_TYPE_1_ID = "type1"; private static final String POLICY_TYPE_1_VALID = "{\"title\":\"type1\"}"; @@ -200,7 +200,7 @@ public class PolicyAgentApiImplTest { HttpEntity jsonHttpEntity = createJsonHttpEntity(POLICY_1_VALID); Map uriVariables = Map.of( // "type", POLICY_TYPE_1_ID, // - "instance", POLICY_1_ID, // + "id", POLICY_1_ID, // "ric", RIC_1_ID, // "service", "controlpanel"); doThrow(new RestClientException(CLIENT_ERROR_MESSAGE)).when(restTemplateMock) @@ -219,7 +219,7 @@ public class PolicyAgentApiImplTest { HttpEntity jsonHttpEntity = createJsonHttpEntity(POLICY_1_VALID); Map uriVariables = Map.of( // "type", POLICY_TYPE_1_ID, // - "instance", POLICY_1_ID, // + "id", POLICY_1_ID, // "ric", RIC_1_ID, // "service", "controlpanel"); @@ -233,7 +233,7 @@ public class PolicyAgentApiImplTest { @Test public void testDeletePolicyFailure() { - Map uriVariables = Map.of("instance", POLICY_1_ID); + Map uriVariables = Map.of("id", POLICY_1_ID); doThrow(new RestClientException(CLIENT_ERROR_MESSAGE)).when(restTemplateMock) .delete(eq(URL_PREFIX + URL_DELETE_POLICY), eq(uriVariables)); @@ -246,7 +246,7 @@ public class PolicyAgentApiImplTest { @Test public void testDeletePolicySuccess() { - Map uriVariables = Map.of("instance", POLICY_1_ID); + Map uriVariables = Map.of("id", POLICY_1_ID); ResponseEntity returnedResp = apiUnderTest.deletePolicy(POLICY_1_ID);