From 73daeaded6849c784068c88b02aadd757cab96b5 Mon Sep 17 00:00:00 2001 From: "Andreas Penski (init)" Date: Wed, 12 Aug 2020 08:34:27 +0200 Subject: [PATCH] (chore) some cleanup --- .gitlab-ci.yml | 2 +- .../java/de/kosit/validationtool/impl/DefaultCheckTest.java | 6 ++++++ .../impl/tasks/SchemaValidatorActionTest.java | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 49ee7c6..2985761 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -106,7 +106,7 @@ build-java-8-openj9: - target/surefire-reports/*.xml - target/failsafe-reports/*.xml -build-java8-alpine: +build-java8: stage: build image: maven:3-jdk-8-alpine script: diff --git a/src/test/java/de/kosit/validationtool/impl/DefaultCheckTest.java b/src/test/java/de/kosit/validationtool/impl/DefaultCheckTest.java index 5215357..faba39e 100644 --- a/src/test/java/de/kosit/validationtool/impl/DefaultCheckTest.java +++ b/src/test/java/de/kosit/validationtool/impl/DefaultCheckTest.java @@ -85,6 +85,11 @@ public class DefaultCheckTest { assertThat(doc.isAcceptable()).isTrue(); assertThat(doc.isSchematronValid()).isTrue(); assertThat(doc.isSchemaValid()).isTrue(); + assertThat(doc.getFailedAsserts()).isEmpty(); + assertThat(doc.getSchematronResult()).isNotEmpty(); + assertThat(doc.getSchematronResult()).hasSize(1); + assertThat(doc.getSchematronResult().get(0).getActivePatterns()).isNotEmpty(); + assertThat(doc.getSchematronResult().get(0).getFiredRules()).isNotEmpty(); assertThat(doc.getAcceptRecommendation()).isEqualTo(AcceptRecommendation.ACCEPTABLE); } @@ -192,6 +197,7 @@ public class DefaultCheckTest { assertThat(result.isSchemaValid()).isTrue(); assertThat(result.getFailedAsserts()).isNotEmpty(); assertThat(result.isSchematronValid()).isFalse(); + assertThat(result.getSchematronResult().get(0).findFailedAssert("content-1")).isPresent(); assertThat(result.isProcessingSuccessful()).isTrue(); // acceptMatch overules schematron!!! assertThat(result.getAcceptRecommendation()).isEqualTo(AcceptRecommendation.ACCEPTABLE); diff --git a/src/test/java/de/kosit/validationtool/impl/tasks/SchemaValidatorActionTest.java b/src/test/java/de/kosit/validationtool/impl/tasks/SchemaValidatorActionTest.java index a25ffe9..642df80 100644 --- a/src/test/java/de/kosit/validationtool/impl/tasks/SchemaValidatorActionTest.java +++ b/src/test/java/de/kosit/validationtool/impl/tasks/SchemaValidatorActionTest.java @@ -43,6 +43,7 @@ import org.xml.sax.SAXException; import de.kosit.validationtool.api.Input; import de.kosit.validationtool.api.InputFactory; +import de.kosit.validationtool.api.XmlError.Severity; import de.kosit.validationtool.impl.Helper; import de.kosit.validationtool.impl.Helper.Simple; import de.kosit.validationtool.impl.Scenario; @@ -85,6 +86,7 @@ public class SchemaValidatorActionTest { bag.getSchemaValidationResult().getErrors().forEach(e -> { assertThat(e.getRowNumber()).isGreaterThan(0); assertThat(e.getColumnNumber()).isGreaterThan(0); + assertThat(e.getSeverity()).isEqualTo(Severity.SEVERITY_ERROR); }); }