From a868f407c6b80ea0c533fc534d45b9e04e69521a Mon Sep 17 00:00:00 2001 From: Amir Skalka Date: Tue, 5 Nov 2019 11:19:37 +0200 Subject: Validations in different tests for audit log ChangeManagementApi/UserApi to verify incoming requests in audit log. Refactor assert message and contains method for validation Add audit logging validation to Health Check test Refactor audit log validation according to code review comments Fix the test of Add audit logging validation to Health Check test Issue-ID: VID-253 Signed-off-by: Amir Skalka Change-Id: I0379520054b65f2141745579a14690bdc4824655 --- .../src/test/java/org/onap/vid/more/LoggerFormatTest.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java') diff --git a/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java b/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java index 7a4eedfa9..03c607d43 100644 --- a/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java +++ b/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java @@ -135,9 +135,13 @@ public class LoggerFormatTest extends BaseApiTest { String path){ List logLines = getRequestLogLines(requestId, LogName.audit2019, restTemplate, uri); String requestIdPrefix = "RequestID="; - assertThat("request id must be found in exactly two rows - entry & exit message in audit log, and include the req path", + assertThat("\nENTRY & EXIT logs are expected to include RequestId: " + requestId + + " \nAnd request path: " + + path + + "\nin exactly two rows - inside the audit log matching lines:\n" + + String.join("\n", logLines) + "\n", logLines, - containsInRelativeOrder( + contains( allOf( containsString(requestIdPrefix+requestId), containsString("ENTRY"), -- cgit 1.2.3-korg