X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Ftasks%2FRicSupervisionTest.java;h=3f8dd0677e00a89615d685ca746bbf65f58ee9de;hb=254eab2d525ad00ac092d6859d21cbab8e42746a;hp=8d3dd942a3cee54c98e495e4627d447225a39f9d;hpb=136e826cabebb7e4188c68ec118bb11632f8139a;p=nonrtric.git

diff --git a/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSupervisionTest.java b/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSupervisionTest.java
index 8d3dd942..3f8dd067 100644
--- a/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSupervisionTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSupervisionTest.java
@@ -67,6 +67,7 @@ public class RicSupervisionTest {
         .name("RIC_1") //
         .baseUrl("baseUrl1") //
         .managedElementIds(new Vector<String>(Arrays.asList("kista_1", "kista_2"))) //
+        .controllerName("controllerName") //
         .build());
 
     private static final String POLICY_1_ID = "policyId1";
@@ -95,7 +96,7 @@ public class RicSupervisionTest {
     private A1ClientFactory a1ClientFactory;
 
     @Mock
-    private RicSynchronizationTask recoveryTaskMock;
+    private RicSynchronizationTask synchronizationTaskMock;
 
     private final PolicyTypes types = new PolicyTypes();
     private Policies policies = new Policies();
@@ -121,7 +122,7 @@ public class RicSupervisionTest {
     }
 
     @Test
-    public void whenRicIdleAndNoChangedPoliciesOrPolicyTypes_thenNoRecovery() {
+    public void whenRicIdleAndNoChangedPoliciesOrPolicyTypes_thenNoSynchronization() {
         RIC_1.setState(RicState.IDLE);
         RIC_1.addSupportedPolicyType(POLICY_TYPE_1);
         rics.put(RIC_1);
@@ -142,24 +143,24 @@ public class RicSupervisionTest {
     }
 
     @Test
-    public void whenRicUndefined_thenRecovery() {
+    public void whenRicUndefined_thenSynchronization() {
         RIC_1.setState(RicState.UNDEFINED);
         rics.put(RIC_1);
 
         RicSupervision supervisorUnderTest = spy(new RicSupervision(rics, policies, a1ClientFactory, types, null));
 
-        doReturn(recoveryTaskMock).when(supervisorUnderTest).createSynchronizationTask();
+        doReturn(synchronizationTaskMock).when(supervisorUnderTest).createSynchronizationTask();
 
         supervisorUnderTest.checkAllRics();
 
         verify(supervisorUnderTest).checkAllRics();
         verify(supervisorUnderTest).createSynchronizationTask();
-        verify(recoveryTaskMock).run(RIC_1);
+        verify(synchronizationTaskMock).run(RIC_1);
         verifyNoMoreInteractions(supervisorUnderTest);
     }
 
     @Test
-    public void whenRicRecovering_thenNoRecovery() {
+    public void whenRicSynchronizing_thenNoSynchronization() {
         RIC_1.setState(RicState.SYNCHRONIZING);
         rics.put(RIC_1);
 
@@ -172,7 +173,7 @@ public class RicSupervisionTest {
     }
 
     @Test
-    public void whenRicIdleAndErrorGettingPolicyIdentities_thenNoRecovery() {
+    public void whenRicIdleAndErrorGettingPolicyIdentities_thenNoSynchronization() {
         RIC_1.setState(RicState.IDLE);
         RIC_1.addSupportedPolicyType(POLICY_TYPE_1);
         rics.put(RIC_1);
@@ -187,7 +188,7 @@ public class RicSupervisionTest {
     }
 
     @Test
-    public void whenRicIdleAndNotSameAmountOfPolicies_thenRecovery() {
+    public void whenRicIdleAndNotSameAmountOfPolicies_thenSynchronization() {
         RIC_1.setState(RicState.IDLE);
         rics.put(RIC_1);
 
@@ -198,18 +199,18 @@ public class RicSupervisionTest {
 
         RicSupervision supervisorUnderTest = spy(new RicSupervision(rics, policies, a1ClientFactory, types, null));
 
-        doReturn(recoveryTaskMock).when(supervisorUnderTest).createSynchronizationTask();
+        doReturn(synchronizationTaskMock).when(supervisorUnderTest).createSynchronizationTask();
 
         supervisorUnderTest.checkAllRics();
 
         verify(supervisorUnderTest).checkAllRics();
         verify(supervisorUnderTest).createSynchronizationTask();
-        verify(recoveryTaskMock).run(RIC_1);
+        verify(synchronizationTaskMock).run(RIC_1);
         verifyNoMoreInteractions(supervisorUnderTest);
     }
 
     @Test
-    public void whenRicIdleAndSameAmountOfPoliciesButNotSamePolicies_thenRecovery() {
+    public void whenRicIdleAndSameAmountOfPoliciesButNotSamePolicies_thenSynchronization() {
         RIC_1.setState(RicState.IDLE);
         rics.put(RIC_1);
 
@@ -220,18 +221,18 @@ public class RicSupervisionTest {
 
         RicSupervision supervisorUnderTest = spy(new RicSupervision(rics, policies, a1ClientFactory, types, null));
 
-        doReturn(recoveryTaskMock).when(supervisorUnderTest).createSynchronizationTask();
+        doReturn(synchronizationTaskMock).when(supervisorUnderTest).createSynchronizationTask();
 
         supervisorUnderTest.checkAllRics();
 
         verify(supervisorUnderTest).checkAllRics();
         verify(supervisorUnderTest).createSynchronizationTask();
-        verify(recoveryTaskMock).run(RIC_1);
+        verify(synchronizationTaskMock).run(RIC_1);
         verifyNoMoreInteractions(supervisorUnderTest);
     }
 
     @Test
-    public void whenRicIdleAndErrorGettingPolicyTypes_thenNoRecovery() {
+    public void whenRicIdleAndErrorGettingPolicyTypes_thenNoSynchronization() {
         RIC_1.setState(RicState.IDLE);
         RIC_1.addSupportedPolicyType(POLICY_TYPE_1);
         rics.put(RIC_1);
@@ -247,7 +248,7 @@ public class RicSupervisionTest {
     }
 
     @Test
-    public void whenRicIdleAndNotSameAmountOfPolicyTypes_thenRecovery() {
+    public void whenRicIdleAndNotSameAmountOfPolicyTypes_thenSynchronization() {
         RIC_1.setState(RicState.IDLE);
         RIC_1.addSupportedPolicyType(POLICY_TYPE_1);
         rics.put(RIC_1);
@@ -259,18 +260,18 @@ public class RicSupervisionTest {
 
         RicSupervision supervisorUnderTest = spy(new RicSupervision(rics, policies, a1ClientFactory, types, null));
 
-        doReturn(recoveryTaskMock).when(supervisorUnderTest).createSynchronizationTask();
+        doReturn(synchronizationTaskMock).when(supervisorUnderTest).createSynchronizationTask();
 
         supervisorUnderTest.checkAllRics();
 
         verify(supervisorUnderTest).checkAllRics();
         verify(supervisorUnderTest).createSynchronizationTask();
-        verify(recoveryTaskMock).run(RIC_1);
+        verify(synchronizationTaskMock).run(RIC_1);
         verifyNoMoreInteractions(supervisorUnderTest);
     }
 
     @Test
-    public void whenRicIdleAndSameAmountOfPolicyTypesButNotSameTypes_thenRecovery() {
+    public void whenRicIdleAndSameAmountOfPolicyTypesButNotSameTypes_thenSynchronization() {
         PolicyType policyType2 = ImmutablePolicyType.builder() //
             .name("policyType2") //
             .schema("") //
@@ -286,13 +287,13 @@ public class RicSupervisionTest {
 
         RicSupervision supervisorUnderTest = spy(new RicSupervision(rics, policies, a1ClientFactory, types, null));
 
-        doReturn(recoveryTaskMock).when(supervisorUnderTest).createSynchronizationTask();
+        doReturn(synchronizationTaskMock).when(supervisorUnderTest).createSynchronizationTask();
 
         supervisorUnderTest.checkAllRics();
 
         verify(supervisorUnderTest).checkAllRics();
         verify(supervisorUnderTest).createSynchronizationTask();
-        verify(recoveryTaskMock).run(RIC_1);
+        verify(synchronizationTaskMock).run(RIC_1);
         verifyNoMoreInteractions(supervisorUnderTest);
     }