From 66af8b9b391879be78660d6ccb0a1f1f9340b423 Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Mon, 11 Mar 2019 09:34:34 +0200 Subject: Merge automation from ECOMP's repository Reference commit in ECOMP: 8e92a8c6 Issue-ID: VID-378 Change-Id: Ia32f4813378ef95097f788246aa5b1172e20ca48 Signed-off-by: Ittay Stern --- .../java/org/onap/vid/more/LoggerFormatTest.java | 28 ++++++++++++---------- 1 file changed, 15 insertions(+), 13 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 fd8f48279..7ca29f854 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,7 +1,17 @@ package org.onap.vid.more; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.junit.Assert.assertThat; + import com.fasterxml.jackson.databind.JsonNode; +import java.net.URI; +import java.util.HashMap; +import java.util.Map; import org.apache.commons.lang3.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; import org.onap.vid.api.BaseApiTest; import org.springframework.web.client.RestTemplate; @@ -9,20 +19,12 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import vid.automation.test.services.SimulatorApi; -import java.net.URI; -import java.util.HashMap; -import java.util.Map; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.Matchers.greaterThanOrEqualTo; - public class LoggerFormatTest extends BaseApiTest { - // See: https://wiki.web.att.com/display/KSAT/REST-based+Log+Checker - private final static String logChecker = "http://eelflogcheck.it.att.com:31820/validate"; + // See: https://www.openecomp.org/KSAT/REST-based+Log+Checker + private final static String logChecker = "http://eelf.onap.org:31820/validate"; + private final Logger logger = LogManager.getLogger(LoggerFormatTest.class); @BeforeClass public void login() { @@ -56,9 +58,9 @@ public class LoggerFormatTest extends BaseApiTest { private void validateLogsFormat(String logName, String logType) { String logLines = getLogLines(logName); + logger.info("logLines are: "+logLines); JsonNode response = getCheckerResults(logType, logLines); - - System.out.println(response); + logger.info("Response is:" + response.toString()); double fieldscore = response.path("summary").path("score").path("fieldscore").asDouble(); double overall = response.path("summary").path("score").path("overallscore").asDouble(); -- cgit 1.2.3-korg