X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Ftasks%2FRicSynchronizationTaskTest.java;h=8674d0af1dadaa43aab2ed18bb9c8212f710ac1c;hb=7757d0392fb23cc807567431aa433a5c6736d02a;hp=f74c9086d99e57cf4a4d7690207c67ad23656922;hpb=144374e691c0f1bdcd90cf7c01de263c905d45b7;p=nonrtric.git 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 f74c9086..8674d0af 100644 --- 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 logAppender, String expectedMessage) { ILoggingEvent loggingEvent = logAppender.list.get(messageIndex); - assertThat(loggingEvent.toString().contains(expectedMessage)).isTrue(); + assertThat(loggingEvent.getFormattedMessage()).isEqualTo(expectedMessage); } }