X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Ftasks%2FStartupServiceTest.java;h=045a8c7afd8df2e3569b6c84417fe5f1dc429df7;hb=805681f9c4f555fd905af4ecd4f0beea8d657327;hp=397220708f99f06f8ed84b2c0995395c61e7ca33;hpb=84ccd9a7a490f524d950852b9f37f9befec8fd75;p=nonrtric.git diff --git a/policy-agent/src/test/java/org/oransc/policyagent/tasks/StartupServiceTest.java b/policy-agent/src/test/java/org/oransc/policyagent/tasks/StartupServiceTest.java index 39722070..045a8c7a 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/tasks/StartupServiceTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/tasks/StartupServiceTest.java @@ -20,12 +20,13 @@ package org.oransc.policyagent.tasks; +import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; import static org.oransc.policyagent.repository.Ric.RicState.ACTIVE; @@ -37,7 +38,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.jupiter.MockitoExtension; -import org.oransc.policyagent.clients.RicClient; +import org.oransc.policyagent.clients.A1Client; import org.oransc.policyagent.configuration.ApplicationConfig; import org.oransc.policyagent.configuration.ImmutableRicConfig; import org.oransc.policyagent.configuration.RicConfig; @@ -48,6 +49,9 @@ import org.oransc.policyagent.repository.PolicyTypes; import org.oransc.policyagent.repository.Ric; import org.oransc.policyagent.repository.Rics; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; + @ExtendWith(MockitoExtension.class) @RunWith(MockitoJUnitRunner.class) public class StartupServiceTest { @@ -60,13 +64,17 @@ public class StartupServiceTest { private static final String MANAGED_NODE_C = "nodeC"; private static final String POLICY_TYPE_1_NAME = "type1"; + private static final PolicyType POLICY_TYPE_1 = ImmutablePolicyType.builder().name(POLICY_TYPE_1_NAME).build(); private static final String POLICY_TYPE_2_NAME = "type2"; + private static final PolicyType POLICY_TYPE_2 = ImmutablePolicyType.builder().name(POLICY_TYPE_2_NAME).build(); + private static final String POLICY_ID_1 = "policy1"; + private static final String POLICY_ID_2 = "policy2"; @Mock ApplicationConfig appConfigMock; @Mock - RicClient ricClientMock; + A1Client a1ClientMock; @Test public void startup_allOk() throws ServiceException { @@ -75,38 +83,40 @@ public class StartupServiceTest { ricConfigs.add(getRicConfig(SECOND_RIC_NAME, SECOND_RIC_URL, MANAGED_NODE_B, MANAGED_NODE_C)); when(appConfigMock.getRicConfigs()).thenReturn(ricConfigs); - Vector firstTypes = new Vector<>(); - PolicyType type1 = ImmutablePolicyType.builder().name(POLICY_TYPE_1_NAME).jsonSchema("{}").build(); - firstTypes.add(type1); - Vector secondTypes = new Vector<>(); - secondTypes.add(type1); - PolicyType type2 = ImmutablePolicyType.builder().name(POLICY_TYPE_2_NAME).jsonSchema("{}").build(); - secondTypes.add(type2); - when(ricClientMock.getPolicyTypes(anyString())).thenReturn(firstTypes, secondTypes); + Flux fluxType1 = Flux.just(POLICY_TYPE_1_NAME); + Flux fluxType2 = Flux.just(POLICY_TYPE_2_NAME); + when(a1ClientMock.getPolicyTypeIdentities(anyString())).thenReturn(fluxType1) + .thenReturn(fluxType1.concatWith(fluxType2)); + Flux policies = Flux.just(new String[] {POLICY_ID_1, POLICY_ID_2}); + when(a1ClientMock.getPolicyIdentities(anyString())).thenReturn(policies); + when(a1ClientMock.deletePolicy(anyString(), anyString())).thenReturn(Mono.empty()); Rics rics = new Rics(); PolicyTypes policyTypes = new PolicyTypes(); - StartupService serviceUnderTest = new StartupService(appConfigMock, rics, policyTypes, ricClientMock); + StartupService serviceUnderTest = new StartupService(appConfigMock, rics, policyTypes, a1ClientMock); serviceUnderTest.startup(); - verify(ricClientMock).deleteAllPolicies(FIRST_RIC_URL); - verify(ricClientMock).getPolicyTypes(FIRST_RIC_URL); - verify(ricClientMock).deleteAllPolicies(SECOND_RIC_URL); - verify(ricClientMock).getPolicyTypes(SECOND_RIC_URL); - verifyNoMoreInteractions(ricClientMock); + await().untilAsserted(() -> assertThat(policyTypes.size()).isEqualTo(2)); + + verify(a1ClientMock).getPolicyTypeIdentities(FIRST_RIC_URL); + verify(a1ClientMock).deletePolicy(FIRST_RIC_URL, POLICY_ID_1); + verify(a1ClientMock).deletePolicy(FIRST_RIC_URL, POLICY_ID_2); + + verify(a1ClientMock).getPolicyTypeIdentities(SECOND_RIC_URL); + verify(a1ClientMock).deletePolicy(SECOND_RIC_URL, POLICY_ID_1); + verify(a1ClientMock).deletePolicy(SECOND_RIC_URL, POLICY_ID_2); - assertEquals(2, policyTypes.size(), "Not correct number of policy types added."); - assertEquals(type1, policyTypes.getType(POLICY_TYPE_1_NAME), "Not correct type added."); - assertEquals(type2, policyTypes.getType(POLICY_TYPE_2_NAME), "Not correct type added."); - assertEquals(2, rics.size(), "Correct nymber of Rics not added to Rics"); + assertTrue(policyTypes.contains(POLICY_TYPE_1_NAME), POLICY_TYPE_1_NAME + " not added to PolicyTypes."); + assertTrue(policyTypes.contains(POLICY_TYPE_2_NAME), POLICY_TYPE_2_NAME + " not added to PolicyTypes."); + assertEquals(2, rics.size(), "Correct number of Rics not added to Rics"); Ric firstRic = rics.getRic(FIRST_RIC_NAME); assertNotNull(firstRic, "Ric \"" + FIRST_RIC_NAME + "\" not added to repositpry"); assertEquals(FIRST_RIC_NAME, firstRic.name(), "Not correct Ric \"" + FIRST_RIC_NAME + "\" added to Rics"); assertEquals(ACTIVE, firstRic.state(), "Not correct state for \"" + FIRST_RIC_NAME + "\""); assertEquals(1, firstRic.getSupportedPolicyTypes().size(), "Not correct no of types supported"); - assertTrue(firstRic.isSupportingType(type1), "Not correct type supported"); + assertTrue(firstRic.isSupportingType(POLICY_TYPE_1_NAME), "Not correct type supported"); assertEquals(1, firstRic.getManagedNodes().size(), "Not correct no of managed nodes"); assertTrue(firstRic.isManaging(MANAGED_NODE_A), "Not managed by node"); @@ -115,8 +125,8 @@ public class StartupServiceTest { assertEquals(SECOND_RIC_NAME, secondRic.name(), "Not correct Ric \"" + SECOND_RIC_NAME + "\" added to Rics"); assertEquals(ACTIVE, secondRic.state(), "Not correct state for \"" + SECOND_RIC_NAME + "\""); assertEquals(2, secondRic.getSupportedPolicyTypes().size(), "Not correct no of types supported"); - assertTrue(secondRic.isSupportingType(type1), "Not correct type supported"); - assertTrue(secondRic.isSupportingType(type2), "Not correct type supported"); + assertTrue(secondRic.isSupportingType(POLICY_TYPE_1_NAME), "Not correct type supported"); + assertTrue(secondRic.isSupportingType(POLICY_TYPE_2_NAME), "Not correct type supported"); assertEquals(2, secondRic.getManagedNodes().size(), "Not correct no of managed nodes"); assertTrue(secondRic.isManaging(MANAGED_NODE_B), "Not correct managed node"); assertTrue(secondRic.isManaging(MANAGED_NODE_C), "Not correct managed node");