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=8bf705cdfd4e2931b4e9aec37dec4a55af633708;hb=a7a6e37afdb3be78bd87e45cffe5b449bfff0553;hp=9e4701d2da454f747ed99043b74bebf450ef80f5;hpb=934a146caf5c9d0f735f913375d55b59041b9db5;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 9e4701d2..8bf705cd 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 @@ -35,14 +35,12 @@ 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.junit.MockitoJUnitRunner; import org.mockito.junit.jupiter.MockitoExtension; import org.oransc.policyagent.clients.A1Client; import org.oransc.policyagent.clients.A1ClientFactory; @@ -55,10 +53,11 @@ 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) -@RunWith(MockitoJUnitRunner.class) public class StartupServiceTest { private static final String FIRST_RIC_NAME = "first"; private static final String FIRST_RIC_URL = "firstUrl"; @@ -70,8 +69,6 @@ public class StartupServiceTest { private static final String POLICY_TYPE_1_NAME = "type1"; private static final String POLICY_TYPE_2_NAME = "type2"; - private static final String POLICY_ID_1 = "policy1"; - private static final String POLICY_ID_2 = "policy2"; ApplicationConfig appConfigMock; RefreshConfigTask refreshTaskMock; @@ -90,13 +87,11 @@ public class StartupServiceTest { @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)); + 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(); - Mono> policies = Mono.just(Arrays.asList(POLICY_ID_1, POLICY_ID_2)); - doReturn(policies).when(a1ClientMock).getPolicyIdentities(); doReturn(Mono.just("Schema")).when(a1ClientMock).getPolicyTypeSchema(anyString()); - doReturn(Mono.just("OK")).when(a1ClientMock).deletePolicy(anyString()); + doReturn(Flux.just("OK")).when(a1ClientMock).deleteAllPolicies(); Rics rics = new Rics(); PolicyTypes policyTypes = new PolicyTypes(); @@ -113,9 +108,7 @@ public class StartupServiceTest { await().untilAsserted(() -> assertThat(policyTypes.size()).isEqualTo(2)); - verify(a1ClientMock, times(2)).getPolicyTypeIdentities(); - verify(a1ClientMock, times(2)).deletePolicy(POLICY_ID_1); - verify(a1ClientMock, times(2)).deletePolicy(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."); @@ -124,7 +117,7 @@ public class StartupServiceTest { Ric firstRic = rics.get(FIRST_RIC_NAME); assertNotNull(firstRic, "Ric " + FIRST_RIC_NAME + " not added to repository"); assertEquals(FIRST_RIC_NAME, firstRic.name(), FIRST_RIC_NAME + " not added to Rics"); - assertEquals(IDLE, firstRic.state(), "Not correct state for ric " + FIRST_RIC_NAME); + assertEquals(IDLE, firstRic.getState(), "Not correct state for ric " + FIRST_RIC_NAME); assertEquals(1, firstRic.getSupportedPolicyTypes().size(), "Not correct no of types supported for ric " + FIRST_RIC_NAME); assertTrue(firstRic.isSupportingType(POLICY_TYPE_1_NAME), @@ -136,7 +129,7 @@ public class StartupServiceTest { Ric secondRic = rics.get(SECOND_RIC_NAME); assertNotNull(secondRic, "Ric " + SECOND_RIC_NAME + " not added to repository"); assertEquals(SECOND_RIC_NAME, secondRic.name(), SECOND_RIC_NAME + " not added to Rics"); - assertEquals(IDLE, secondRic.state(), "Not correct state for " + SECOND_RIC_NAME); + assertEquals(IDLE, secondRic.getState(), "Not correct state for " + SECOND_RIC_NAME); assertEquals(2, secondRic.getSupportedPolicyTypes().size(), "Not correct no of types supported for ric " + SECOND_RIC_NAME); assertTrue(secondRic.isSupportingType(POLICY_TYPE_1_NAME), @@ -153,7 +146,6 @@ public class StartupServiceTest { public void startup_unableToConnectToGetTypes() { Mono error = Mono.error(new Exception("Unable to contact ric.")); doReturn(error, error).when(a1ClientMock).getPolicyTypeIdentities(); - doReturn(error).when(a1ClientMock).getPolicyIdentities(); Rics rics = new Rics(); PolicyTypes policyTypes = new PolicyTypes(); @@ -164,17 +156,18 @@ public class StartupServiceTest { serviceUnderTest.onRicConfigUpdate(getRicConfig(FIRST_RIC_NAME, FIRST_RIC_URL, MANAGED_NODE_A), ApplicationConfig.RicConfigUpdate.ADDED); - assertEquals(RicState.UNDEFINED, rics.get(FIRST_RIC_NAME).state(), "Not correct state for " + FIRST_RIC_NAME); + assertEquals(RicState.UNDEFINED, rics.get(FIRST_RIC_NAME).getState(), + "Not correct state for " + FIRST_RIC_NAME); } @Test - public void startup_unableToConnectToGetPolicies() { + public void startup_unableToConnectToDeleteAllPolicies() { - Mono> policyTypes = Mono.just(Arrays.asList(POLICY_TYPE_1_NAME)); + Mono> policyTypes = Mono.just(Arrays.asList(POLICY_TYPE_1_NAME)); when(a1ClientMock.getPolicyTypeIdentities()).thenReturn(policyTypes); when(a1ClientMock.getPolicyTypeSchema(anyString())).thenReturn(Mono.just("Schema")); - Mono error = Mono.error(new Exception("Unable to contact ric.")); - doReturn(error).when(a1ClientMock).getPolicyIdentities(); + Flux error = Flux.error(new Exception("Unable to contact ric.")); + doReturn(error).when(a1ClientMock).deleteAllPolicies(); Rics rics = new Rics(); StartupService serviceUnderTest = new StartupService(appConfigMock, refreshTaskMock, rics, new PolicyTypes(), @@ -184,7 +177,8 @@ public class StartupServiceTest { serviceUnderTest.onRicConfigUpdate(getRicConfig(FIRST_RIC_NAME, FIRST_RIC_URL, MANAGED_NODE_A), ApplicationConfig.RicConfigUpdate.ADDED); - assertEquals(RicState.UNDEFINED, rics.get(FIRST_RIC_NAME).state(), "Not correct state for " + FIRST_RIC_NAME); + assertEquals(RicState.UNDEFINED, rics.get(FIRST_RIC_NAME).getState(), + "Not correct state for " + FIRST_RIC_NAME); } @SafeVarargs