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=eeecc1c9fb3ff92a620c0694806a226e633a7852;hb=7c297ddb425a52dae965adc6a83629a14421ea05;hp=bd1b05858582c561a28480d66228abfedfd3f593;hpb=ab34581c4c82c50e6bb00957aa717221897cea7a;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 bd1b0585..eeecc1c9 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 @@ -29,20 +29,19 @@ 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 com.google.common.collect.ImmutableList; + import java.util.Arrays; +import java.util.Collections; 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; @@ -50,6 +49,8 @@ import org.oransc.policyagent.configuration.ApplicationConfig; import org.oransc.policyagent.configuration.ImmutableRicConfig; import org.oransc.policyagent.configuration.RicConfig; import org.oransc.policyagent.repository.Policies; +import org.oransc.policyagent.repository.Policy; +import org.oransc.policyagent.repository.PolicyType; import org.oransc.policyagent.repository.PolicyTypes; import org.oransc.policyagent.repository.Ric; import org.oransc.policyagent.repository.Ric.RicState; @@ -60,7 +61,6 @@ 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"; @@ -72,8 +72,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; @@ -91,12 +89,12 @@ public class StartupServiceTest { } @Test - public void startup_allOk() { + public void startupAndAllOk_thenRicsAreConfiguredInRepository() { 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(); + doReturn(Flux.empty()).when(a1ClientMock).deleteAllPolicies(); Rics rics = new Rics(); PolicyTypes policyTypes = new PolicyTypes(); @@ -111,18 +109,18 @@ public class StartupServiceTest { getRicConfig(SECOND_RIC_NAME, SECOND_RIC_URL, MANAGED_NODE_B, MANAGED_NODE_C), ApplicationConfig.RicConfigUpdate.ADDED); - await().untilAsserted(() -> assertThat(policyTypes.size()).isEqualTo(2)); - - verify(a1ClientMock, times(2)).deleteAllPolicies(); + Ric firstRic = rics.get(FIRST_RIC_NAME); + Ric secondRic = rics.get(SECOND_RIC_NAME); + await().untilAsserted(() -> assertThat(firstRic.getState()).isEqualTo(IDLE)); + await().untilAsserted(() -> assertThat(secondRic.getState()).isEqualTo(IDLE)); 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.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(1, firstRic.getSupportedPolicyTypes().size(), "Not correct no of types supported for ric " + FIRST_RIC_NAME); assertTrue(firstRic.isSupportingType(POLICY_TYPE_1_NAME), @@ -131,10 +129,8 @@ public class StartupServiceTest { "Not correct no of managed nodes for ric " + FIRST_RIC_NAME); assertTrue(firstRic.isManaging(MANAGED_NODE_A), MANAGED_NODE_A + " not managed by ric " + FIRST_RIC_NAME); - 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(2, secondRic.getSupportedPolicyTypes().size(), "Not correct no of types supported for ric " + SECOND_RIC_NAME); assertTrue(secondRic.isSupportingType(POLICY_TYPE_1_NAME), @@ -148,7 +144,7 @@ public class StartupServiceTest { } @Test - public void startup_unableToConnectToGetTypes() { + public void startupAndUnableToConnectToGetTypes_thenRicStateSetToUndefined() { Mono error = Mono.error(new Exception("Unable to contact ric.")); doReturn(error, error).when(a1ClientMock).getPolicyTypeIdentities(); @@ -161,11 +157,12 @@ 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_unableToConnectToDeleteAllPolicies() { + public void startupAndUnableToConnectToDeleteAllPolicies_thenRicStateSetToUndefined() { Mono> policyTypes = Mono.just(Arrays.asList(POLICY_TYPE_1_NAME)); when(a1ClientMock.getPolicyTypeIdentities()).thenReturn(policyTypes); @@ -173,15 +170,28 @@ public class StartupServiceTest { 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(), - a1ClientFactory, new Policies(), new Services()); + RicConfig ricConfig = mock(RicConfig.class); + when(ricConfig.name()).thenReturn(FIRST_RIC_NAME); + when(ricConfig.managedElementIds()).thenReturn(ImmutableList.copyOf(Collections.emptyList())); + Ric ric = new Ric(ricConfig); + + PolicyType policyType = mock(PolicyType.class); + when(policyType.name()).thenReturn(POLICY_TYPE_1_NAME); + + Policy policy = mock(Policy.class); + when(policy.ric()).thenReturn(ric); + when(policy.type()).thenReturn(policyType); + Policies policies = new Policies(); + policies.put(policy); + + StartupService serviceUnderTest = new StartupService(appConfigMock, refreshTaskMock, new Rics(), + new PolicyTypes(), a1ClientFactory, policies, new Services()); serviceUnderTest.startup(); 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, ric.getState(), "Not correct state for " + FIRST_RIC_NAME); } @SafeVarargs