X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Ftasks%2FServiceSupervisionTest.java;h=f26083a557c4547da77e3729e5da3e987c038bb6;hb=3134679dec4f273afbb768c8ff71a5f50f5a6a4c;hp=381c2d19a7a01ec6448b569449e05482af7ea39b;hpb=b66dcce5210e25b2571036becb6f0e7b0c23e1b2;p=nonrtric.git

diff --git a/policy-agent/src/test/java/org/oransc/policyagent/tasks/ServiceSupervisionTest.java b/policy-agent/src/test/java/org/oransc/policyagent/tasks/ServiceSupervisionTest.java
index 381c2d19..f26083a5 100644
--- a/policy-agent/src/test/java/org/oransc/policyagent/tasks/ServiceSupervisionTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/tasks/ServiceSupervisionTest.java
@@ -31,8 +31,10 @@ 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.Collections;
+
 import org.awaitility.Durations;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -72,6 +74,7 @@ public class ServiceSupervisionTest {
         .name(RIC_NAME) //
         .baseUrl("baseUrl") //
         .managedElementIds(Collections.emptyList()) //
+        .controllerName("") //
         .build();
     private Ric ric = new Ric(ricConfig);
     private PolicyType policyType = ImmutablePolicyType.builder() //
@@ -99,7 +102,7 @@ public class ServiceSupervisionTest {
 
         await().atMost(Durations.FIVE_SECONDS).with().pollInterval(Durations.ONE_SECOND).until(service::isExpired);
 
-        serviceSupervisionUnderTest.checkAllServices();
+        serviceSupervisionUnderTest.checkAllServices().blockLast();
 
         assertThat(policies.size()).isEqualTo(0);
         assertThat(services.size()).isEqualTo(0);
@@ -123,14 +126,15 @@ public class ServiceSupervisionTest {
 
         final ListAppender<ILoggingEvent> logAppender = LoggingUtils.getLogListAppender(ServiceSupervision.class, WARN);
 
-        serviceSupervisionUnderTest.checkAllServices();
+        serviceSupervisionUnderTest.checkAllServices().blockLast();
 
         assertThat(policies.size()).isEqualTo(0);
         assertThat(services.size()).isEqualTo(0);
 
         ILoggingEvent loggingEvent = logAppender.list.get(0);
-        assertThat(loggingEvent.getThrowableProxy().getMessage()).isEqualTo(originalErrorMessage);
-        String expectedLogMessage = "Could not delete policy: " + POLICY_ID + " from ric: " + RIC_NAME;
+        assertThat(loggingEvent.getLevel()).isEqualTo(WARN);
+        String expectedLogMessage =
+            "Could not delete policy: " + POLICY_ID + " from ric: " + RIC_NAME + ". Cause: " + originalErrorMessage;
         assertThat(loggingEvent.toString().contains(expectedLogMessage)).isTrue();
     }
 
@@ -141,7 +145,7 @@ public class ServiceSupervisionTest {
         ServiceSupervision serviceSupervisionUnderTest =
             new ServiceSupervision(services, policies, a1ClientFactoryMock);
 
-        serviceSupervisionUnderTest.checkAllServices();
+        serviceSupervisionUnderTest.checkAllServices().blockLast();
 
         assertThat(policies.size()).isEqualTo(1);
         assertThat(services.size()).isEqualTo(1);
@@ -157,7 +161,7 @@ public class ServiceSupervisionTest {
         ServiceSupervision serviceSupervisionUnderTest =
             new ServiceSupervision(services, policies, a1ClientFactoryMock);
 
-        serviceSupervisionUnderTest.checkAllServices();
+        serviceSupervisionUnderTest.checkAllServices().blockLast();
 
         assertThat(policies.size()).isEqualTo(1);
         assertThat(services.size()).isEqualTo(1);