From: Henrik Andersson Date: Thu, 19 Dec 2019 12:08:01 +0000 (+0000) Subject: Merge "Support of selecting RIC in dashboard" X-Git-Tag: 1.0.1~65 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;ds=inline;h=cd9e9862fa9a5898f3595b397686861749f72953;hp=-c;p=nonrtric.git Merge "Support of selecting RIC in dashboard" --- cd9e9862fa9a5898f3595b397686861749f72953 diff --combined policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java index 84841c7a,55597ea8..084ab582 --- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java @@@ -26,9 -26,11 +26,9 @@@ import static org.junit.jupiter.api.Ass import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; - import java.net.URL; import java.util.List; import java.util.Vector; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.oransc.policyagent.configuration.ApplicationConfig; @@@ -112,7 -114,13 +112,13 @@@ public class ApplicationTest public void testGetRics() throws Exception { String url = baseUrl() + "/rics"; String rsp = this.restTemplate.getForObject(url, String.class); + System.out.println(rsp); assertThat(rsp).contains("kista_1"); + + url = baseUrl() + "/rics?policyType=ANR"; + rsp = this.restTemplate.getForObject(url, String.class); + // TODO this should test that the correct types are retrieved from the RIC + assertThat(rsp).isEqualTo("[]"); } @Test diff --combined policy-agent/src/test/java/org/oransc/policyagent/tasks/StartupServiceTest.java index 39722070,18ff62b0..ec277c5b --- a/policy-agent/src/test/java/org/oransc/policyagent/tasks/StartupServiceTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/tasks/StartupServiceTest.java @@@ -23,7 -23,7 +23,7 @@@ package org.oransc.policyagent.tasks 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.Mockito.mock; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @@@ -32,11 -32,6 +32,11 @@@ import static org.oransc.policyagent.re import java.util.Vector; 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.RicClient; import org.oransc.policyagent.configuration.ApplicationConfig; import org.oransc.policyagent.configuration.ImmutableRicConfig; @@@ -48,8 -43,6 +48,8 @@@ import org.oransc.policyagent.repositor import org.oransc.policyagent.repository.Ric; import org.oransc.policyagent.repository.Rics; +@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"; @@@ -62,14 -55,11 +62,14 @@@ private static final String POLICY_TYPE_1_NAME = "type1"; private static final String POLICY_TYPE_2_NAME = "type2"; + @Mock ApplicationConfig appConfigMock; + @Mock + RicClient ricClientMock; + @Test public void startup_allOk() throws ServiceException { - ApplicationConfig appConfigMock = mock(ApplicationConfig.class); Vector ricConfigs = new Vector<>(2); ricConfigs.add(getRicConfig(FIRST_RIC_NAME, FIRST_RIC_URL, MANAGED_NODE_A)); ricConfigs.add(getRicConfig(SECOND_RIC_NAME, SECOND_RIC_URL, MANAGED_NODE_B, MANAGED_NODE_C)); @@@ -82,7 -72,9 +82,7 @@@ secondTypes.add(type1); PolicyType type2 = ImmutablePolicyType.builder().name(POLICY_TYPE_2_NAME).jsonSchema("{}").build(); secondTypes.add(type2); - RicClient ricClientMock = mock(RicClient.class); - when(ricClientMock.getPolicyTypes(FIRST_RIC_URL)).thenReturn(firstTypes); - when(ricClientMock.getPolicyTypes("secondUrl")).thenReturn(secondTypes); + when(ricClientMock.getPolicyTypes(anyString())).thenReturn(firstTypes, secondTypes); Rics rics = new Rics(); PolicyTypes policyTypes = new PolicyTypes(); @@@ -106,7 -98,7 +106,7 @@@ 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(type1.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 -107,8 +115,8 @@@ 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(type1.name()), "Not correct type supported"); + assertTrue(secondRic.isSupportingType(type2.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");