Merge "Added STD sim 2.0.0 tests"

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

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 a984528..1631303 100644 (file)
--- a/policy-agent/src/test/java/org/oransc/policyagent/tasks/ServiceSupervisionTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/tasks/ServiceSupervisionTest.java
@@ -56,7 +56,7 @@ import org.oransc.policyagent.utils.LoggingUtils;
 import reactor.core.publisher.Mono;
 
 @ExtendWith(MockitoExtension.class)
-public class ServiceSupervisionTest {
+class ServiceSupervisionTest {
 
     private static final String SERVICE_NAME = "Service name";
     private static final String RIC_NAME = "name";
@@ -74,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() //
@@ -87,10 +88,11 @@ public class ServiceSupervisionTest {
         .ric(ric) //
         .type(policyType) //
         .lastModified("lastModified") //
+        .isTransient(false) //
         .build();
 
     @Test
-    public void serviceExpired_policyAndServiceAreDeletedInRepoAndPolicyIsDeletedInRic() {
+    void serviceExpired_policyAndServiceAreDeletedInRepoAndPolicyIsDeletedInRic() {
         setUpRepositoryWithKeepAliveInterval(Duration.ofSeconds(2));
 
         setUpCreationOfA1Client();
@@ -101,17 +103,17 @@ 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);
+        assertThat(policies.size()).isZero();
+        assertThat(services.size()).isZero();
 
         verify(a1ClientMock).deletePolicy(policy);
         verifyNoMoreInteractions(a1ClientMock);
     }
 
     @Test
-    public void serviceExpiredButDeleteInRicFails_policyAndServiceAreDeletedInRepoAndErrorLoggedForRic() {
+    void serviceExpiredButDeleteInRicFails_policyAndServiceAreDeletedInRepoAndErrorLoggedForRic() {
         setUpRepositoryWithKeepAliveInterval(Duration.ofSeconds(2));
 
         setUpCreationOfA1Client();
@@ -125,25 +127,26 @@ 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);
+        assertThat(policies.size()).isZero();
+        assertThat(services.size()).isZero();
 
         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.toString().contains(expectedLogMessage)).isTrue();
+        assertThat(loggingEvent.getLevel()).isEqualTo(WARN);
+        String expectedLogMessage =
+            "Could not delete policy: " + POLICY_ID + " from ric: " + RIC_NAME + ". Cause: " + originalErrorMessage;
+        assertThat(loggingEvent.getFormattedMessage()).isEqualTo(expectedLogMessage);
     }
 
     @Test
-    public void serviceNotExpired_shouldNotBeChecked() {
+    void serviceNotExpired_shouldNotBeChecked() {
         setUpRepositoryWithKeepAliveInterval(Duration.ofSeconds(2));
 
         ServiceSupervision serviceSupervisionUnderTest =
             new ServiceSupervision(services, policies, a1ClientFactoryMock);
 
-        serviceSupervisionUnderTest.checkAllServices();
+        serviceSupervisionUnderTest.checkAllServices().blockLast();
 
         assertThat(policies.size()).isEqualTo(1);
         assertThat(services.size()).isEqualTo(1);
@@ -153,13 +156,13 @@ public class ServiceSupervisionTest {
     }
 
     @Test
-    public void serviceWithoutKeepAliveInterval_shouldNotBeChecked() {
+    void serviceWithoutKeepAliveInterval_shouldNotBeChecked() {
         setUpRepositoryWithKeepAliveInterval(Duration.ofSeconds(0));
 
         ServiceSupervision serviceSupervisionUnderTest =
             new ServiceSupervision(services, policies, a1ClientFactoryMock);
 
-        serviceSupervisionUnderTest.checkAllServices();
+        serviceSupervisionUnderTest.checkAllServices().blockLast();
 
         assertThat(policies.size()).isEqualTo(1);
         assertThat(services.size()).isEqualTo(1);