X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Ftasks%2FRicSynchronizationTaskTest.java;h=f6d2adeb26b4c31cd3819a1c3104ed497a1a5e2c;hb=73a8d2b71f8b683865d96ad78576d0f7ab654ba6;hp=788253c8149cfa3a2283cbb0e26ec3d46314e9b7;hpb=7ab83b874b5118ce9bbbbcab2c010c1d5f17ba98;p=nonrtric.git

diff --git a/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSynchronizationTaskTest.java b/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSynchronizationTaskTest.java
index 788253c8..f6d2adeb 100644
--- a/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSynchronizationTaskTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSynchronizationTaskTest.java
@@ -108,7 +108,7 @@ public class RicSynchronizationTaskTest {
         policyTypes = new PolicyTypes();
         policies = new Policies();
         services = new Services();
-        RIC_1.setState(RicState.UNDEFINED);
+        RIC_1.setState(RicState.UNAVAILABLE);
         RIC_1.clearSupportedPolicyTypes();
     }
 
@@ -135,7 +135,7 @@ public class RicSynchronizationTaskTest {
 
     @Test
     public void ricIdlePolicyTypeInRepo_thenSynchronizationWithReuseOfTypeFromRepoAndCorrectServiceNotified() {
-        RIC_1.setState(RicState.IDLE);
+        RIC_1.setState(RicState.AVAILABLE);
 
         policyTypes.put(POLICY_TYPE_1);
 
@@ -166,12 +166,12 @@ public class RicSynchronizationTaskTest {
 
         assertThat(policyTypes.size()).isEqualTo(1);
         assertThat(policies.size()).isEqualTo(0);
-        assertThat(RIC_1.getState()).isEqualTo(RicState.IDLE);
+        assertThat(RIC_1.getState()).isEqualTo(RicState.AVAILABLE);
     }
 
     @Test
     public void ricIdlePolicyTypeNotInRepo_thenSynchronizationWithTypeFromRic() throws Exception {
-        RIC_1.setState(RicState.IDLE);
+        RIC_1.setState(RicState.AVAILABLE);
 
         setUpCreationOfA1Client();
         simulateRicWithOnePolicyType();
@@ -189,12 +189,12 @@ public class RicSynchronizationTaskTest {
         assertThat(policyTypes.size()).isEqualTo(1);
         assertThat(policyTypes.getType(POLICY_TYPE_1_NAME).schema()).isEqualTo(typeSchema);
         assertThat(policies.size()).isEqualTo(0);
-        assertThat(RIC_1.getState()).isEqualTo(RicState.IDLE);
+        assertThat(RIC_1.getState()).isEqualTo(RicState.AVAILABLE);
     }
 
     @Test
     public void ricIdleAndHavePolicies_thenSynchronizationWithRecreationOfPolicies() {
-        RIC_1.setState(RicState.IDLE);
+        RIC_1.setState(RicState.AVAILABLE);
 
         policies.put(POLICY_1);
 
@@ -215,12 +215,12 @@ public class RicSynchronizationTaskTest {
 
         assertThat(policyTypes.size()).isEqualTo(0);
         assertThat(policies.size()).isEqualTo(1);
-        assertThat(RIC_1.getState()).isEqualTo(RicState.IDLE);
+        assertThat(RIC_1.getState()).isEqualTo(RicState.AVAILABLE);
     }
 
     @Test
     public void ricIdleAndErrorDeletingPoliciesFirstTime_thenSynchronizationWithDeletionOfPolicies() {
-        RIC_1.setState(RicState.IDLE);
+        RIC_1.setState(RicState.AVAILABLE);
 
         policies.put(POLICY_1);
 
@@ -241,12 +241,12 @@ public class RicSynchronizationTaskTest {
 
         assertThat(policyTypes.size()).isEqualTo(0);
         assertThat(policies.size()).isEqualTo(0);
-        assertThat(RIC_1.getState()).isEqualTo(RicState.IDLE);
+        assertThat(RIC_1.getState()).isEqualTo(RicState.AVAILABLE);
     }
 
     @Test
     public void ricIdleAndErrorDeletingPoliciesAllTheTime_thenSynchronizationWithFailedRecovery() {
-        RIC_1.setState(RicState.IDLE);
+        RIC_1.setState(RicState.AVAILABLE);
 
         policies.put(POLICY_1);
 
@@ -265,19 +265,19 @@ public class RicSynchronizationTaskTest {
         synchronizerUnderTest.run(RIC_1);
 
         verifyCorrectLogMessage(0, logAppender,
-            "Recreation of policies failed for ric: " + RIC_1_NAME + ", reason: " + originalErrorMessage);
+            "Synchronization failure for ric: " + RIC_1_NAME + ", reason: " + originalErrorMessage);
 
         verify(a1ClientMock, times(2)).deleteAllPolicies();
         verifyNoMoreInteractions(a1ClientMock);
 
         assertThat(policyTypes.size()).isEqualTo(0);
         assertThat(policies.size()).isEqualTo(0);
-        assertThat(RIC_1.getState()).isEqualTo(RicState.UNDEFINED);
+        assertThat(RIC_1.getState()).isEqualTo(RicState.UNAVAILABLE);
     }
 
     @Test
     public void ricIdlePolicyTypeInRepo_thenSynchronizationWithErrorOnServiceNotificationErrorLogged() {
-        RIC_1.setState(RicState.IDLE);
+        RIC_1.setState(RicState.AVAILABLE);
 
         policyTypes.put(POLICY_TYPE_1);
 
@@ -299,7 +299,7 @@ public class RicSynchronizationTaskTest {
         synchronizerUnderTest.run(RIC_1);
 
         ILoggingEvent loggingEvent = logAppender.list.get(0);
-        assertThat(loggingEvent.getThrowableProxy().getMessage()).isEqualTo(originalErrorMessage);
+        assertThat(loggingEvent.getLevel()).isEqualTo(WARN);
         verifyCorrectLogMessage(0, logAppender, "Service notification failed for service: " + SERVICE_1_NAME);
     }