Introduce LOG-NAME enumerator

Issue-ID: VID-253

Change-Id: Ib24e6ce12fd89bdddaf1b15b7c0d47b3d6f8af9a
Signed-off-by: Ittay Stern <ittay.stern@att.com>

1 files changed, 38 insertions, 12 deletions

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 e01ffe8b4..fd05b9dde 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
@@ -1,12 +1,16 @@
 package org.onap.vid.more;
 
+import static java.util.Collections.reverse;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import java.net.URI;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -24,6 +28,10 @@ public class LoggerFormatTest extends BaseApiTest {
     private final static String logChecker = System.getProperty("EELF_LOG_CHECKER", "http://my-logchecker:8888/validate");
     private final Logger logger = LogManager.getLogger(LoggerFormatTest.class);
 
+    public enum LogName {
+        audit, error, audit2019, metrics2019, metrics
+    }
+
     @BeforeClass
     public void login() {
         super.login();
@@ -37,34 +45,34 @@ public class LoggerFormatTest extends BaseApiTest {
     @SkipTestUntil("2019-09-24")
     @Test
     public void validateAuditLogsFormat() {
-        validateLogsFormat("audit");
+        validateLogsFormat(LogName.audit);
     }
 
     @Test
     public void validateAudit2019LogsFormat() {
-        validateLogsFormat("audit2019", "audit-ELS-2019.11", 0);
+        validateLogsFormat(LogName.audit2019, "audit-ELS-2019.11", 0);
     }
 
     @Test(enabled = false) // no total-score is returned for error-log
     public void validateErrorLogsFormat() {
-        validateLogsFormat("error");
+        validateLogsFormat(LogName.error);
     }
 
     @SkipTestUntil("2019-09-24")
     @Test
     public void validateMetricsLogsFormat() {
-        validateLogsFormat("metrics", "metric");
+        validateLogsFormat(LogName.metrics, "metric");
     }
 
-    private void validateLogsFormat(String logName) {
-        validateLogsFormat(logName, logName);
+    private void validateLogsFormat(LogName logName) {
+        validateLogsFormat(logName, logName.name());
     }
 
-    private void validateLogsFormat(String logName, String logType) {
+    private void validateLogsFormat(LogName logName, String logType) {
         validateLogsFormat(logName, logType, 0.95);
     }
 
-    private void validateLogsFormat(String logName, String logType, double score) {
+    private void validateLogsFormat(LogName logName, String logType, double score) {
 
         String logLines = getLogLines(logName);
         logger.info("logLines are: "+logLines);
@@ -78,18 +86,36 @@ public class LoggerFormatTest extends BaseApiTest {
 
     }
 
-    private String getLogLines(String logname) {
+    private String getLogLines(LogName logname) {
         return getLogLines(logname, 5000, 30, restTemplate, uri);
     }
 
-    public static String getLogLines(String logname, int maxRows, int minRows, RestTemplate restTemplate, URI uri) {
-        String logLines = restTemplate.getForObject(uri + "/logger/" + logname + "?limit={maxRows}", String.class, maxRows);
-        assertThat("expecting at least " + minRows + " rows in " + logname,
+    public static String getLogLines(LogName logname, int maxRows, int minRows, RestTemplate restTemplate, URI uri) {
+        String logLines = restTemplate.getForObject(uri + "/logger/" + logname.name() + "?limit={maxRows}", String.class, maxRows);
+        assertThat("expecting at least " + minRows + " rows in " + logname.name(),
                 StringUtils.countMatches(logLines, '\n') + 1,
                 is(greaterThanOrEqualTo(minRows)));
         return logLines;
     }
 
+    /**
+     * @return Chronological-ordered list of recent log-lines of a given requestId
+     */
+    public static List<String> getRequestLogLines(String requestId, LogName logname, RestTemplate restTemplate, URI uri) {
+        String logLines = LoggerFormatTest.getLogLines(LogName.audit2019, 30, 1, restTemplate, uri);
+
+        // Split
+        List<String> lines = new ArrayList<>(Arrays.asList(logLines.split("(\\r?\\n)")));
+
+        // Filter
+        lines.removeIf(line -> !StringUtils.containsIgnoreCase(line, requestId));
+
+        // Reverse
+        reverse(lines);
+
+        return lines;
+    }
+
     private JsonNode getCheckerResults(String logtype, String logLines) {
         Map<String, String> params = new HashMap<>();
         params.put("format", "raw");