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=1631303598c6a35ee01ed5d3400a38ffca72e50f;hb=964a97cbe18f38e8417366dfdf871fcfae908fc8;hp=90a35810e162d07afdb0d961faaf57b0e739acf4;hpb=4db5e7d262aaa8ccf18feaa4bd93a6a925801333;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 90a35810..16313035 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
@@ -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";
@@ -92,7 +92,7 @@ public class ServiceSupervisionTest {
         .build();
 
     @Test
-    public void serviceExpired_policyAndServiceAreDeletedInRepoAndPolicyIsDeletedInRic() {
+    void serviceExpired_policyAndServiceAreDeletedInRepoAndPolicyIsDeletedInRic() {
         setUpRepositoryWithKeepAliveInterval(Duration.ofSeconds(2));
 
         setUpCreationOfA1Client();
@@ -105,15 +105,15 @@ public class ServiceSupervisionTest {
 
         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();
@@ -129,18 +129,18 @@ public class ServiceSupervisionTest {
 
         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.getLevel()).isEqualTo(WARN);
         String expectedLogMessage =
             "Could not delete policy: " + POLICY_ID + " from ric: " + RIC_NAME + ". Cause: " + originalErrorMessage;
-        assertThat(loggingEvent.toString().contains(expectedLogMessage)).isTrue();
+        assertThat(loggingEvent.getFormattedMessage()).isEqualTo(expectedLogMessage);
     }
 
     @Test
-    public void serviceNotExpired_shouldNotBeChecked() {
+    void serviceNotExpired_shouldNotBeChecked() {
         setUpRepositoryWithKeepAliveInterval(Duration.ofSeconds(2));
 
         ServiceSupervision serviceSupervisionUnderTest =
@@ -156,7 +156,7 @@ public class ServiceSupervisionTest {
     }
 
     @Test
-    public void serviceWithoutKeepAliveInterval_shouldNotBeChecked() {
+    void serviceWithoutKeepAliveInterval_shouldNotBeChecked() {
         setUpRepositoryWithKeepAliveInterval(Duration.ofSeconds(0));
 
         ServiceSupervision serviceSupervisionUnderTest =