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=b44eb29ea70031dbf50a727510914ff63b7d3368;hb=2c76efafe970aedb2d4167d493088115e1c4a5cc;hp=ad9fc6978642923baf615b7fe6253074737d7e5b;hpb=296f7c083ed15a57e59ea4546eb0624bf235d29b;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 ad9fc697..b44eb29e 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
@@ -21,11 +21,11 @@
 package org.oransc.policyagent.tasks;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
+import static org.oransc.policyagent.repository.Ric.RicState.ACTIVE;
 
 import java.util.Vector;
 
@@ -38,41 +38,74 @@ import org.oransc.policyagent.exceptions.ServiceException;
 import org.oransc.policyagent.repository.ImmutablePolicyType;
 import org.oransc.policyagent.repository.PolicyType;
 import org.oransc.policyagent.repository.PolicyTypes;
+import org.oransc.policyagent.repository.Ric;
 import org.oransc.policyagent.repository.Rics;
 
 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 PLOCY_TYPE_1_NAME = "type1";
+    private static final String POLICY_TYPE_2_NAME = "type2";
+
     ApplicationConfig appConfigMock;
 
     @Test
     public void startup_allOk() throws ServiceException {
         ApplicationConfig appConfigMock = mock(ApplicationConfig.class);
         Vector<RicConfig> ricConfigs = new Vector<>(2);
-        Vector<String> firstNodes = new Vector<String>(1);
-        firstNodes.add("nodeA");
-        ricConfigs.add(ImmutableRicConfig.builder().name("first").managedElementIds(firstNodes).baseUrl("url").build());
+        ricConfigs.add(getRicConfig(FIRST_RIC_NAME, FIRST_RIC_URL, "nodeA"));
+        ricConfigs.add(getRicConfig(SECOND_RIC_NAME, SECOND_RIC_URL, "nodeB", "nodeC"));
         when(appConfigMock.getRicConfigs()).thenReturn(ricConfigs);
 
-        Rics rics = new Rics();
-        PolicyTypes policyTypes = new PolicyTypes();
-
-        Vector<PolicyType> types = new Vector<>();
-        PolicyType type = ImmutablePolicyType.builder().name("type1").jsonSchema("{}").build();
-        types.add(type);
+        Vector<PolicyType> firstTypes = new Vector<>();
+        PolicyType type1 = ImmutablePolicyType.builder().name(PLOCY_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(anyString())).thenReturn(types);
+        when(ricClientMock.getPolicyTypes(FIRST_RIC_URL)).thenReturn(firstTypes);
+        when(ricClientMock.getPolicyTypes("secondUrl")).thenReturn(secondTypes);
 
+        Rics rics = new Rics();
+        PolicyTypes policyTypes = new PolicyTypes();
         StartupService serviceUnderTest = new StartupService(appConfigMock, rics, policyTypes, ricClientMock);
 
         serviceUnderTest.startup();
 
-        verify(ricClientMock).deleteAllPolicies("url");
-        verify(ricClientMock).getPolicyTypes("url");
+        verify(ricClientMock).deleteAllPolicies(FIRST_RIC_URL);
+        verify(ricClientMock).getPolicyTypes(FIRST_RIC_URL);
+        verify(ricClientMock).deleteAllPolicies(SECOND_RIC_URL);
+        verify(ricClientMock).getPolicyTypes(SECOND_RIC_URL);
         verifyNoMoreInteractions(ricClientMock);
 
-        assertEquals("Correct nymber of Rics not added to Rics", 1, rics.size());
-        assertEquals("Not correct Ric added to Rics", "first", rics.getRic("first").name());
+        assertEquals("Correct nymber of Rics not added to Rics", 2, rics.size());
+        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());
+
+        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));
+    }
 
-        assertEquals("Not correct number of policy types added.", 1, policyTypes.size());
-        assertEquals("Not correct type added.", type, policyTypes.getType(type.name()));
+    private RicConfig getRicConfig(String name, String baseUrl, String... nodeNames) {
+        Vector<String> managedNodes = new Vector<String>(1);
+        for (String nodeName : managedNodes) {
+            managedNodes.add(nodeName);
+        }
+        ImmutableRicConfig ricConfig = ImmutableRicConfig.builder() //
+            .name(name) //
+            .managedElementIds(managedNodes) //
+            .baseUrl(baseUrl) //
+            .build();
+        return ricConfig;
     }
 }