X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Ftasks%2FStartupServiceTest.java;h=397220708f99f06f8ed84b2c0995395c61e7ca33;hb=d901722a4ebc68c78df8a2643a46287497d3ac81;hp=b44eb29ea70031dbf50a727510914ff63b7d3368;hpb=2c76efafe970aedb2d4167d493088115e1c4a5cc;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 b44eb29e..39722070 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,8 +20,10 @@
 
 package org.oransc.policyagent.tasks;
 
-import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
+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;
@@ -29,7 +31,12 @@ import static org.oransc.policyagent.repository.Ric.RicState.ACTIVE;
 
 import java.util.Vector;
 
-import org.junit.Test;
+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;
@@ -41,35 +48,41 @@ import org.oransc.policyagent.repository.PolicyTypes;
 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";
     private static final String SECOND_RIC_NAME = "second";
     private static final String SECOND_RIC_URL = "secondUrl";
+    private static final String MANAGED_NODE_A = "nodeA";
+    private static final String MANAGED_NODE_B = "nodeB";
+    private static final String MANAGED_NODE_C = "nodeC";
 
-    private static final String PLOCY_TYPE_1_NAME = "type1";
+    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<RicConfig> ricConfigs = new Vector<>(2);
-        ricConfigs.add(getRicConfig(FIRST_RIC_NAME, FIRST_RIC_URL, "nodeA"));
-        ricConfigs.add(getRicConfig(SECOND_RIC_NAME, SECOND_RIC_URL, "nodeB", "nodeC"));
+        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));
         when(appConfigMock.getRicConfigs()).thenReturn(ricConfigs);
 
         Vector<PolicyType> firstTypes = new Vector<>();
-        PolicyType type1 = ImmutablePolicyType.builder().name(PLOCY_TYPE_1_NAME).jsonSchema("{}").build();
+        PolicyType type1 = ImmutablePolicyType.builder().name(POLICY_TYPE_1_NAME).jsonSchema("{}").build();
         firstTypes.add(type1);
         Vector<PolicyType> secondTypes = new Vector<>();
         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();
@@ -83,22 +96,35 @@ public class StartupServiceTest {
         verify(ricClientMock).getPolicyTypes(SECOND_RIC_URL);
         verifyNoMoreInteractions(ricClientMock);
 
-        assertEquals("Correct nymber of Rics not added to Rics", 2, rics.size());
+        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");
+
         Ric firstRic = rics.getRic(FIRST_RIC_NAME);
-        assertEquals("Not correct Ric \"" + FIRST_RIC_NAME + "\" added to Rics", FIRST_RIC_NAME, firstRic.name());
-        assertEquals("Not correct state for \"" + FIRST_RIC_NAME + "\"", ACTIVE, firstRic.state());
-        Ric secondRic = rics.getRic(SECOND_RIC_NAME);
-        assertEquals("Not correct Ric \"" + SECOND_RIC_NAME + "\" added to Rics", SECOND_RIC_NAME, secondRic.name());
-        assertEquals("Not correct state for \"" + SECOND_RIC_NAME + "\"", ACTIVE, secondRic.state());
+        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");
+        assertEquals(1, firstRic.getManagedNodes().size(), "Not correct no of managed nodes");
+        assertTrue(firstRic.isManaging(MANAGED_NODE_A), "Not managed by node");
 
-        assertEquals("Not correct number of policy types added.", 2, policyTypes.size());
-        assertEquals("Not correct type added.", type1, policyTypes.getType(PLOCY_TYPE_1_NAME));
-        assertEquals("Not correct type added.", type2, policyTypes.getType(POLICY_TYPE_2_NAME));
+        Ric secondRic = rics.getRic(SECOND_RIC_NAME);
+        assertNotNull(secondRic, "Ric \"" + SECOND_RIC_NAME + "\" not added to repositpry");
+        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");
+        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");
     }
 
     private RicConfig getRicConfig(String name, String baseUrl, String... nodeNames) {
         Vector<String> managedNodes = new Vector<String>(1);
-        for (String nodeName : managedNodes) {
+        for (String nodeName : nodeNames) {
             managedNodes.add(nodeName);
         }
         ImmutableRicConfig ricConfig = ImmutableRicConfig.builder() //