Make assertions of log messages better

[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 f74c908..8674d0a 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
@@ -80,9 +80,9 @@ class RicSynchronizationTaskTest {
         .controllerName("controllerName") //
         .build());
 
-    private static Policy createPolicy(boolean isTransient) {
+    private static Policy createPolicy(String policyId, boolean isTransient) {
         return ImmutablePolicy.builder() //
-            .id("policyId1") //
+            .id(policyId) //
             .json("") //
             .ownerServiceName("service") //
             .ric(RIC_1) //
@@ -92,7 +92,7 @@ class RicSynchronizationTaskTest {
             .build();
     }
 
-    private static final Policy POLICY_1 = createPolicy(false);
+    private static final Policy POLICY_1 = createPolicy("policyId1", false);
 
     private static final String SERVICE_1_NAME = "service1";
     private static final String SERVICE_1_CALLBACK_URL = "callbackUrl";
@@ -201,7 +201,7 @@ class RicSynchronizationTaskTest {
     void ricIdleAndHavePolicies_thenSynchronizationWithRecreationOfPolicies() {
         RIC_1.setState(RicState.AVAILABLE);
 
-        Policy transientPolicy = createPolicy(true);
+        Policy transientPolicy = createPolicy("transientPolicyId", true);
 
         policies.put(transientPolicy);
         policies.put(POLICY_1);
@@ -308,7 +308,8 @@ class RicSynchronizationTaskTest {
 
         ILoggingEvent loggingEvent = logAppender.list.get(0);
         assertThat(loggingEvent.getLevel()).isEqualTo(WARN);
-        verifyCorrectLogMessage(0, logAppender, "Service notification failed for service: " + SERVICE_1_NAME);
+        verifyCorrectLogMessage(0, logAppender,
+            "Service notification failed for service: " + SERVICE_1_NAME + ". Cause: " + originalErrorMessage);
     }
 
     private void setUpCreationOfA1Client() {
@@ -333,6 +334,6 @@ class RicSynchronizationTaskTest {
     private void verifyCorrectLogMessage(int messageIndex, ListAppender<ILoggingEvent> logAppender,
         String expectedMessage) {
         ILoggingEvent loggingEvent = logAppender.list.get(messageIndex);
-        assertThat(loggingEvent.toString().contains(expectedMessage)).isTrue();
+        assertThat(loggingEvent.getFormattedMessage()).isEqualTo(expectedMessage);
     }
 }