Merge "Rename artifacts in A1 controller"

[nonrtric.git] / policy-agent / src / test / java / org / oransc / policyagent / tasks / RicSynchronizationTaskTest.java

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 b05349f..f6d2ade 100644 (file)
--- a/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSynchronizationTaskTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/tasks/RicSynchronizationTaskTest.java
@@ -35,9 +35,11 @@ import static org.mockito.Mockito.when;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.read.ListAppender;
+
 import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collections;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -58,6 +60,7 @@ import org.oransc.policyagent.repository.Ric.RicState;
 import org.oransc.policyagent.repository.Service;
 import org.oransc.policyagent.repository.Services;
 import org.oransc.policyagent.utils.LoggingUtils;
+
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -74,6 +77,7 @@ public class RicSynchronizationTaskTest {
         .name(RIC_1_NAME) //
         .baseUrl("baseUrl1") //
         .managedElementIds(Collections.emptyList()) //
+        .controllerName("controllerName") //
         .build());
 
     private static final Policy POLICY_1 = ImmutablePolicy.builder() //
@@ -104,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();
     }
 
@@ -131,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);
 
@@ -150,7 +154,7 @@ public class RicSynchronizationTaskTest {
 
         synchronizerUnderTest.run(RIC_1);
 
-        verify(a1ClientMock).getPolicyTypeIdentities();
+        verify(a1ClientMock, times(1)).getPolicyTypeIdentities();
         verifyNoMoreInteractions(a1ClientMock);
 
         verify(synchronizerUnderTest).run(RIC_1);
@@ -162,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();
@@ -185,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);
 
@@ -211,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);
 
@@ -237,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);
 
@@ -261,21 +265,19 @@ public class RicSynchronizationTaskTest {
         synchronizerUnderTest.run(RIC_1);
 
         verifyCorrectLogMessage(0, logAppender,
-            "Synchronization failed for ric: " + RIC_1_NAME + ", reason: " + originalErrorMessage);
-        verifyCorrectLogMessage(1, logAppender,
-            "Synchronization failure recovery 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);
 
@@ -297,12 +299,13 @@ 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);
     }
 
     private void setUpCreationOfA1Client() {
         when(a1ClientFactoryMock.createA1Client(any(Ric.class))).thenReturn(Mono.just(a1ClientMock));
+        doReturn(Flux.empty()).when(a1ClientMock).deleteAllPolicies();
     }
 
     private AsyncRestClient setUpCreationOfAsyncRestClient(RicSynchronizationTask synchronizerUnderTest) {