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 <amir.skalka@intl.att.com>
Change-Id: I0379520054b65f2141745579a14690bdc4824655

1 files changed, 5 insertions, 1 deletions

diff --git a/vid-automation/src/test/java/org/onap/vid/more/RequestIdFilterInstalled.java b/vid-automation/src/test/java/org/onap/vid/more/RequestIdFilterInstalled.java
index 93ab14036..d4a1ce3f8 100644
--- a/vid-automation/src/test/java/org/onap/vid/more/RequestIdFilterInstalled.java
+++ b/vid-automation/src/test/java/org/onap/vid/more/RequestIdFilterInstalled.java
@@ -136,10 +136,14 @@ public class RequestIdFilterInstalled extends BaseApiTest {
 
     @Test
     public void healthcheck_doGET_RequestIdReceived() {
+        String path = "/healthCheck";
         final Pair<HttpEntity, String> responseAndUuid = makeRequest(
-                HttpMethod.GET, "/healthCheck", null
+                HttpMethod.GET, path, null
         );
         assertThatUuidInResponseAndUuidIsInARecentLog(LogName.audit2019, responseAndUuid);
+        LoggerFormatTest
+            .verifyExistenceOfIncomingReqsInAuditLogs(restTemplate, uri,
+                responseAndUuid.getKey().getHeaders().get("X-ECOMP-RequestID-echo").get(0).toString(), path);
     }
 
     private void assertThatUuidInResponseAndUuidIsInARecentLog(LogName logName, Pair<HttpEntity, String> responseAndUuid) {