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=bd1b05858582c561a28480d66228abfedfd3f593;hb=ab34581c4c82c50e6bb00957aa717221897cea7a;hp=729fc7b3b71764d756d8a9b799b3630e11fea94f;hpb=fb4bc7967a4733d10775351440a3af14327d5f20;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 729fc7b3..bd1b0585 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 @@ -25,23 +25,27 @@ 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.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.oransc.policyagent.repository.Ric.RicState.IDLE; import java.util.Arrays; -import java.util.Collection; +import java.util.List; import java.util.Vector; +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.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.jupiter.MockitoExtension; import org.oransc.policyagent.clients.A1Client; +import org.oransc.policyagent.clients.A1ClientFactory; import org.oransc.policyagent.configuration.ApplicationConfig; import org.oransc.policyagent.configuration.ImmutableRicConfig; import org.oransc.policyagent.configuration.RicConfig; @@ -51,6 +55,8 @@ import org.oransc.policyagent.repository.Ric; import org.oransc.policyagent.repository.Ric.RicState; import org.oransc.policyagent.repository.Rics; import org.oransc.policyagent.repository.Services; + +import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @ExtendWith(MockitoExtension.class) @@ -69,26 +75,33 @@ public class StartupServiceTest { private static final String POLICY_ID_1 = "policy1"; private static final String POLICY_ID_2 = "policy2"; - @Mock ApplicationConfig appConfigMock; + RefreshConfigTask refreshTaskMock; - @Mock A1Client a1ClientMock; + A1ClientFactory a1ClientFactory; + + @BeforeEach + public void init() throws Exception { + a1ClientMock = mock(A1Client.class); + a1ClientFactory = mock(A1ClientFactory.class); + appConfigMock = mock(ApplicationConfig.class); + refreshTaskMock = mock(RefreshConfigTask.class); + doReturn(Mono.just(a1ClientMock)).when(a1ClientFactory).createA1Client(any()); + } @Test public void startup_allOk() { - Mono> policyTypes1 = Mono.just(Arrays.asList(POLICY_TYPE_1_NAME)); - Mono> policyTypes2 = Mono.just(Arrays.asList(POLICY_TYPE_1_NAME, POLICY_TYPE_2_NAME)); - when(a1ClientMock.getPolicyTypeIdentities(anyString())).thenReturn(policyTypes1).thenReturn(policyTypes2); - Mono> policies = Mono.just(Arrays.asList(POLICY_ID_1, POLICY_ID_2)); - when(a1ClientMock.getPolicyIdentities(anyString())).thenReturn(policies); - when(a1ClientMock.getPolicyType(anyString(), anyString())).thenReturn(Mono.just("Schema")); - when(a1ClientMock.deletePolicy(anyString(), anyString())).thenReturn(Mono.just("OK")); + Mono> policyTypes1 = Mono.just(Arrays.asList(POLICY_TYPE_1_NAME)); + Mono> policyTypes2 = Mono.just(Arrays.asList(POLICY_TYPE_1_NAME, POLICY_TYPE_2_NAME)); + doReturn(policyTypes1, policyTypes2).when(a1ClientMock).getPolicyTypeIdentities(); + doReturn(Mono.just("Schema")).when(a1ClientMock).getPolicyTypeSchema(anyString()); + doReturn(Flux.just("OK")).when(a1ClientMock).deleteAllPolicies(); Rics rics = new Rics(); PolicyTypes policyTypes = new PolicyTypes(); - StartupService serviceUnderTest = - new StartupService(appConfigMock, rics, policyTypes, a1ClientMock, new Policies(), new Services()); + StartupService serviceUnderTest = new StartupService(appConfigMock, refreshTaskMock, rics, policyTypes, + a1ClientFactory, new Policies(), new Services()); serviceUnderTest.startup(); @@ -100,13 +113,7 @@ public class StartupServiceTest { 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); + verify(a1ClientMock, times(2)).deleteAllPolicies(); 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."); @@ -142,65 +149,39 @@ public class StartupServiceTest { @Test public void startup_unableToConnectToGetTypes() { - Mono> policyIdentities = Mono.just(Arrays.asList(POLICY_TYPE_1_NAME)); Mono error = Mono.error(new Exception("Unable to contact ric.")); - doReturn(error, policyIdentities).when(a1ClientMock).getPolicyTypeIdentities(anyString()); - - Mono> policies = Mono.just(Arrays.asList(POLICY_ID_1, POLICY_ID_2)); - doReturn(policies).when(a1ClientMock).getPolicyIdentities(anyString()); - when(a1ClientMock.getPolicyType(anyString(), anyString())).thenReturn(Mono.just("Schema")); - when(a1ClientMock.deletePolicy(anyString(), anyString())).thenReturn(Mono.just("OK")); + doReturn(error, error).when(a1ClientMock).getPolicyTypeIdentities(); Rics rics = new Rics(); PolicyTypes policyTypes = new PolicyTypes(); - StartupService serviceUnderTest = - new StartupService(appConfigMock, rics, policyTypes, a1ClientMock, new Policies(), new Services()); + StartupService serviceUnderTest = new StartupService(appConfigMock, refreshTaskMock, rics, policyTypes, + a1ClientFactory, new Policies(), new Services()); serviceUnderTest.startup(); serviceUnderTest.onRicConfigUpdate(getRicConfig(FIRST_RIC_NAME, FIRST_RIC_URL, MANAGED_NODE_A), ApplicationConfig.RicConfigUpdate.ADDED); - serviceUnderTest.onRicConfigUpdate( - getRicConfig(SECOND_RIC_NAME, SECOND_RIC_URL, MANAGED_NODE_B, MANAGED_NODE_C), - ApplicationConfig.RicConfigUpdate.ADDED); - - verify(a1ClientMock).deletePolicy(SECOND_RIC_URL, POLICY_ID_1); - verify(a1ClientMock).deletePolicy(SECOND_RIC_URL, POLICY_ID_2); assertEquals(RicState.UNDEFINED, rics.get(FIRST_RIC_NAME).state(), "Not correct state for " + FIRST_RIC_NAME); - - assertEquals(IDLE, rics.get(SECOND_RIC_NAME).state(), "Not correct state for " + SECOND_RIC_NAME); } @Test - public void startup_unableToConnectToGetPolicies() { + public void startup_unableToConnectToDeleteAllPolicies() { - Mono> policyTypes1 = Mono.just(Arrays.asList(POLICY_TYPE_1_NAME)); - Mono> policyTypes2 = Mono.just(Arrays.asList(POLICY_TYPE_1_NAME, POLICY_TYPE_2_NAME)); - when(a1ClientMock.getPolicyTypeIdentities(anyString())).thenReturn(policyTypes1).thenReturn(policyTypes2); - when(a1ClientMock.getPolicyType(anyString(), anyString())).thenReturn(Mono.just("Schema")); - Mono> policies = Mono.just(Arrays.asList(POLICY_ID_1, POLICY_ID_2)); - doReturn(Mono.error(new Exception("Unable to contact ric.")), policies).when(a1ClientMock) - .getPolicyIdentities(anyString()); - when(a1ClientMock.deletePolicy(anyString(), anyString())).thenReturn(Mono.just("OK")); + Mono> policyTypes = Mono.just(Arrays.asList(POLICY_TYPE_1_NAME)); + when(a1ClientMock.getPolicyTypeIdentities()).thenReturn(policyTypes); + when(a1ClientMock.getPolicyTypeSchema(anyString())).thenReturn(Mono.just("Schema")); + Flux error = Flux.error(new Exception("Unable to contact ric.")); + doReturn(error).when(a1ClientMock).deleteAllPolicies(); Rics rics = new Rics(); - PolicyTypes policyTypes = new PolicyTypes(); - StartupService serviceUnderTest = - new StartupService(appConfigMock, rics, policyTypes, a1ClientMock, new Policies(), new Services()); + StartupService serviceUnderTest = new StartupService(appConfigMock, refreshTaskMock, rics, new PolicyTypes(), + a1ClientFactory, new Policies(), new Services()); serviceUnderTest.startup(); serviceUnderTest.onRicConfigUpdate(getRicConfig(FIRST_RIC_NAME, FIRST_RIC_URL, MANAGED_NODE_A), ApplicationConfig.RicConfigUpdate.ADDED); - serviceUnderTest.onRicConfigUpdate( - getRicConfig(SECOND_RIC_NAME, SECOND_RIC_URL, MANAGED_NODE_B, MANAGED_NODE_C), - ApplicationConfig.RicConfigUpdate.ADDED); - - verify(a1ClientMock).deletePolicy(SECOND_RIC_URL, POLICY_ID_1); - verify(a1ClientMock).deletePolicy(SECOND_RIC_URL, POLICY_ID_2); assertEquals(RicState.UNDEFINED, rics.get(FIRST_RIC_NAME).state(), "Not correct state for " + FIRST_RIC_NAME); - - assertEquals(IDLE, rics.get(SECOND_RIC_NAME).state(), "Not correct state for " + SECOND_RIC_NAME); } @SafeVarargs