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=f1f4931cfb0581918939d3fb77869a05fb93b1ad;hb=a26055e5007e75a5aa9551305ea4da211e80df14;hp=90a35810e162d07afdb0d961faaf57b0e739acf4;hpb=ba50f8809edc7d49a74021e25b4094f4c3174b26;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..f1f4931c 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(); @@ -113,7 +113,7 @@ public class ServiceSupervisionTest { } @Test - public void serviceExpiredButDeleteInRicFails_policyAndServiceAreDeletedInRepoAndErrorLoggedForRic() { + void serviceExpiredButDeleteInRicFails_policyAndServiceAreDeletedInRepoAndErrorLoggedForRic() { setUpRepositoryWithKeepAliveInterval(Duration.ofSeconds(2)); setUpCreationOfA1Client(); @@ -136,11 +136,11 @@ public class ServiceSupervisionTest { 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 =