package org.onap.vid.controller;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
import java.io.File;
import java.io.IOException;
import java.util.List;
this.logfilePathCreator = logfilePathCreator;
}
- @GetMapping(value = "/{loggerName:audit|error|metrics}")
+ @GetMapping(value = "/{loggerName:audit|audit2019|error|metrics}")
public String getLog(@PathVariable String loggerName, HttpServletRequest request,
@RequestParam(value="limit", defaultValue = "5000") Integer limit) throws IOException {
}
String logfilePath = logfilePathCreator.getLogfilePath(loggerName);
- try (final ReversedLinesFileReader reader = new ReversedLinesFileReader(new File(logfilePath))) {
+ try (final ReversedLinesFileReader reader = new ReversedLinesFileReader(new File(logfilePath), UTF_8)) {
Supplier<String> reverseLinesSupplier = () -> {
try {
return reader.readLine();
package org.onap.vid.more;
import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
-import static org.junit.Assert.assertThat;
import com.fasterxml.jackson.databind.JsonNode;
import java.net.URI;
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");
}
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);
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)));
}