change management cypress test

[vid.git] / 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 d72337f..e01ffe8 100644 (file)
--- 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,6 +1,13 @@
 package org.onap.vid.more;
 
+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.HashMap;
+import java.util.Map;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -9,22 +16,12 @@ import org.onap.vid.api.BaseApiTest;
 import org.springframework.web.client.RestTemplate;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
+import vid.automation.test.infra.SkipTestUntil;
 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.Matchers.greaterThan;
-import static org.hamcrest.Matchers.greaterThanOrEqualTo;
-import static org.junit.Assert.assertThat;
-
 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";
+    private final static String logChecker = System.getProperty("EELF_LOG_CHECKER", "http://my-logchecker:8888/validate");
     private final Logger logger = LogManager.getLogger(LoggerFormatTest.class);
 
     @BeforeClass
@@ -37,16 +34,23 @@ public class LoggerFormatTest extends BaseApiTest {
         SimulatorApi.registerExpectationFromPreset(new PresetAAIGetSubscribersGet(), SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET);
     }
 
+    @SkipTestUntil("2019-09-24")
     @Test
     public void validateAuditLogsFormat() {
         validateLogsFormat("audit");
     }
 
+    @Test
+    public void validateAudit2019LogsFormat() {
+        validateLogsFormat("audit2019", "audit-ELS-2019.11", 0);
+    }
+
     @Test(enabled = false) // no total-score is returned for error-log
     public void validateErrorLogsFormat() {
         validateLogsFormat("error");
     }
 
+    @SkipTestUntil("2019-09-24")
     @Test
     public void validateMetricsLogsFormat() {
         validateLogsFormat("metrics", "metric");
@@ -57,6 +61,10 @@ public class LoggerFormatTest extends BaseApiTest {
     }
 
     private void validateLogsFormat(String logName, String logType) {
+        validateLogsFormat(logName, logType, 0.95);
+    }
+
+    private void validateLogsFormat(String logName, String logType, double score) {
 
         String logLines = getLogLines(logName);
         logger.info("logLines are: "+logLines);
@@ -65,8 +73,8 @@ public class LoggerFormatTest extends BaseApiTest {
         double fieldscore = response.path("summary").path("score").path("fieldscore").asDouble();
         double overall = response.path("summary").path("score").path("overallscore").asDouble();
 
-        assertThat(fieldscore, is(greaterThan(0.95)));
-        assertThat(overall, is(greaterThan(0.95)));
+        assertThat(fieldscore, is(greaterThanOrEqualTo(score)));
+        assertThat(overall, is(greaterThanOrEqualTo(score)));
 
     }