X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fclients%2FStdA1ClientTest.java;h=15fe05ae9e3a79f82eabb89717c6b9b62fbd32ef;hb=643ba188e7c1d0c8ce097adfd94ced47b2da615e;hp=ee1e8df5491eff439940e8a36e45a1539acbbbcf;hpb=95db19e2820102db0255ca57407faa333cbb4085;p=nonrtric.git diff --git a/policy-agent/src/test/java/org/oransc/policyagent/clients/StdA1ClientTest.java b/policy-agent/src/test/java/org/oransc/policyagent/clients/StdA1ClientTest.java index ee1e8df5..15fe05ae 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/clients/StdA1ClientTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/clients/StdA1ClientTest.java @@ -20,151 +20,117 @@ package org.oransc.policyagent.clients; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.util.Arrays; -import java.util.Vector; +import java.util.List; -import org.json.JSONException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.oransc.policyagent.configuration.ImmutableRicConfig; import org.oransc.policyagent.configuration.RicConfig; -import org.oransc.policyagent.repository.ImmutablePolicy; -import org.oransc.policyagent.repository.ImmutablePolicyType; import org.oransc.policyagent.repository.Policy; -import org.oransc.policyagent.repository.PolicyType; -import org.oransc.policyagent.repository.Ric; +import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @ExtendWith(MockitoExtension.class) -@RunWith(MockitoJUnitRunner.class) public class StdA1ClientTest { private static final String RIC_URL = "RicUrl"; - private static final String POLICYTYPES_IDENTITIES_URL = "/policytypes/identities"; - private static final String POLICIES_IDENTITIES_URL = "/policies/identities"; - private static final String POLICYTYPES_URL = "/policytypes/"; - private static final String POLICIES_URL = "/policies/"; - private static final String POLICY_TYPE_1_NAME = "type1"; - private static final String POLICY_TYPE_2_NAME = "type2"; - private static final String POLICY_TYPE_SCHEMA_VALID = "{\"type\":\"type1\"}"; - private static final String POLICY_TYPE_SCHEMA_INVALID = "\"type\":\"type1\"}"; private static final String POLICY_1_ID = "policy1"; private static final String POLICY_2_ID = "policy2"; - private static final String POLICY_JSON_VALID = "{\"policyId\":\"policy1\"}"; - private static final String POLICY_JSON_INVALID = "\"policyId\":\"policy1\"}"; + private static final String POLICY_JSON = "{\"policyId\":\"policy1\"}"; private static final String POLICY_TYPE = "typeName"; - StdA1Client a1Client; + StdA1ClientVersion1 clientUnderTest; + @Mock AsyncRestClient asyncRestClientMock; + @Mock + RicConfig ricConfigMock; + @BeforeEach public void init() { - asyncRestClientMock = mock(AsyncRestClient.class); - a1Client = spy(new StdA1Client(createRic(RIC_URL).getConfig(), asyncRestClientMock)); + clientUnderTest = new StdA1ClientVersion1(asyncRestClientMock, ricConfigMock); } - @Test - public void testGetPolicyTypeIdentities() { - Mono policyTypeIds = Mono.just(Arrays.toString(new String[] {POLICY_TYPE_1_NAME, POLICY_TYPE_2_NAME})); - when(asyncRestClientMock.get(POLICYTYPES_IDENTITIES_URL)).thenReturn(policyTypeIds); + private String policiesUrl() { + return RIC_URL + "/A1-P/v1/policies"; + } - Mono policyTypeIdsFlux = a1Client.getPolicyTypeIdentities(); - verify(asyncRestClientMock).get(POLICYTYPES_IDENTITIES_URL); - StepVerifier.create(policyTypeIdsFlux).expectNextCount(1).expectComplete().verify(); + private String policiesBaseUrl() { + return policiesUrl() + "/"; } @Test - public void testGetPolicyIdentities() { - Mono policyIds = Mono.just(Arrays.toString(new String[] {POLICY_1_ID, POLICY_2_ID})); - when(asyncRestClientMock.get(POLICIES_IDENTITIES_URL)).thenReturn(policyIds); - - Mono policyIdsFlux = a1Client.getPolicyIdentities(); - verify(asyncRestClientMock).get(POLICIES_IDENTITIES_URL); - StepVerifier.create(policyIdsFlux).expectNextCount(1).expectComplete().verify(); + public void testGetPolicyTypeIdentities() { + List policyTypeIds = clientUnderTest.getPolicyTypeIdentities().block(); + assertEquals(1, policyTypeIds.size(), "should hardcoded to one"); + assertEquals("", policyTypeIds.get(0), "should hardcoded to empty"); } @Test - public void testGetValidPolicyType() { - when(asyncRestClientMock.get(POLICYTYPES_URL + POLICY_TYPE_1_NAME)) - .thenReturn(Mono.just(POLICY_TYPE_SCHEMA_VALID)); + public void testGetPolicyIdentities() { + doReturn(RIC_URL).when(ricConfigMock).baseUrl(); + Mono policyIds = Mono.just(Arrays.asList(POLICY_1_ID, POLICY_2_ID).toString()); + when(asyncRestClientMock.get(anyString())).thenReturn(policyIds); - Mono policyTypeMono = a1Client.getPolicyTypeSchema(POLICY_TYPE_1_NAME); - verify(asyncRestClientMock).get(POLICYTYPES_URL + POLICY_TYPE_1_NAME); - StepVerifier.create(policyTypeMono).expectNext(POLICY_TYPE_SCHEMA_VALID).expectComplete().verify(); - } + List result = clientUnderTest.getPolicyIdentities().block(); + assertEquals(2, result.size(), ""); - @Test - public void testGetInvalidPolicyType() { - when(asyncRestClientMock.get(POLICYTYPES_URL + POLICY_TYPE_1_NAME)) - .thenReturn(Mono.just(POLICY_TYPE_SCHEMA_INVALID)); - - Mono policyTypeMono = a1Client.getPolicyTypeSchema(POLICY_TYPE_1_NAME); - verify(asyncRestClientMock).get(POLICYTYPES_URL + POLICY_TYPE_1_NAME); - StepVerifier.create(policyTypeMono).expectErrorMatches(throwable -> throwable instanceof JSONException) - .verify(); + verify(asyncRestClientMock).get(policiesUrl()); } @Test - public void testPutPolicyValidResponse() { - when(asyncRestClientMock.put(anyString(), anyString())).thenReturn(Mono.just(POLICY_JSON_VALID)); - - Mono policyMono = - a1Client.putPolicy(createPolicy(RIC_URL, POLICY_1_ID, POLICY_JSON_VALID, POLICY_TYPE)); - verify(asyncRestClientMock).put(POLICIES_URL + POLICY_1_ID, POLICY_JSON_VALID); - StepVerifier.create(policyMono).expectNext(POLICY_JSON_VALID).expectComplete().verify(); + public void testGetValidPolicyType() { + String policyType = clientUnderTest.getPolicyTypeSchema(POLICY_TYPE_1_NAME).block(); + assertEquals("{}", policyType, ""); } @Test - public void testPutPolicyInvalidResponse() { - when(asyncRestClientMock.put(anyString(), anyString())).thenReturn(Mono.just(POLICY_JSON_INVALID)); + public void testPutPolicyValidResponse() { + doReturn(RIC_URL).when(ricConfigMock).baseUrl(); + when(asyncRestClientMock.put(anyString(), anyString())).thenReturn(Mono.just(POLICY_JSON)); Mono policyMono = - a1Client.putPolicy(createPolicy(RIC_URL, POLICY_1_ID, POLICY_JSON_VALID, POLICY_TYPE)); - StepVerifier.create(policyMono).expectErrorMatches(throwable -> throwable instanceof JSONException).verify(); - } - - private Policy createPolicy(String nearRtRicUrl, String policyId, String json, String type) { - return ImmutablePolicy.builder() // - .id(policyId) // - .json(json) // - .ownerServiceName("service") // - .ric(createRic(nearRtRicUrl)) // - .type(createPolicyType(type)) // - .lastModified("now") // - .build(); - } - - private PolicyType createPolicyType(String name) { - return ImmutablePolicyType.builder().name(name).schema("schema").build(); - } + clientUnderTest.putPolicy(A1ClientHelper.createPolicy(RIC_URL, POLICY_1_ID, POLICY_JSON, POLICY_TYPE)); - private Ric createRic(String url) { - RicConfig cfg = ImmutableRicConfig.builder().name("ric") // - .baseUrl(url) // - .managedElementIds(new Vector(Arrays.asList("kista_1", "kista_2"))) // - .build(); - return new Ric(cfg); + verify(asyncRestClientMock).put(policiesBaseUrl() + POLICY_1_ID, POLICY_JSON); + StepVerifier.create(policyMono).expectNext(POLICY_JSON).expectComplete().verify(); } @Test public void testDeletePolicy() { - when(asyncRestClientMock.delete(POLICIES_URL + POLICY_1_ID)).thenReturn(Mono.empty()); + doReturn(RIC_URL).when(ricConfigMock).baseUrl(); + final String url = policiesBaseUrl() + POLICY_1_ID; + when(asyncRestClientMock.delete(url)).thenReturn(Mono.empty()); - Mono responseMono = a1Client.deletePolicy(POLICY_1_ID); - verify(asyncRestClientMock).delete(POLICIES_URL + POLICY_1_ID); + Policy policy = A1ClientHelper.createPolicy(RIC_URL, POLICY_1_ID, POLICY_JSON, POLICY_TYPE); + Mono responseMono = clientUnderTest.deletePolicy(policy); + verify(asyncRestClientMock).delete(url); StepVerifier.create(responseMono).expectComplete().verify(); } + + @Test + public void testDeleteAllPolicies() { + doReturn(RIC_URL).when(ricConfigMock).baseUrl(); + Mono policyIds = Mono.just(Arrays.asList(POLICY_1_ID, POLICY_2_ID).toString()); + when(asyncRestClientMock.get(policiesUrl())).thenReturn(policyIds); + when(asyncRestClientMock.delete(anyString())).thenReturn(Mono.empty()); + + Flux responseFlux = clientUnderTest.deleteAllPolicies(); + StepVerifier.create(responseFlux).expectComplete().verify(); + verify(asyncRestClientMock).get(policiesUrl()); + verify(asyncRestClientMock).delete(policiesBaseUrl() + POLICY_1_ID); + verify(asyncRestClientMock).delete(policiesBaseUrl() + POLICY_2_ID); + } }