diff --git a/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java b/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java index 687841d..1207a1a 100644 --- a/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java +++ b/src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java @@ -138,7 +138,7 @@ public class CommandlineApplicationTest { final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-o", this.output.toString(), "-r", Paths.get(Simple.REPOSITORY).toString(), Paths.get(Simple.EXAMPLES).toString() }; CommandLineApplication.mainProgram(args); - assertThat(this.commandLine.getErrorOutput()).contains("Processing 5 object(s) completed"); + assertThat(this.commandLine.getErrorOutput()).contains("Processing 6 object(s) completed"); } @Test diff --git a/src/test/java/de/kosit/validationtool/impl/DefaultCheckTest.java b/src/test/java/de/kosit/validationtool/impl/DefaultCheckTest.java index aa1376b..624c8a2 100644 --- a/src/test/java/de/kosit/validationtool/impl/DefaultCheckTest.java +++ b/src/test/java/de/kosit/validationtool/impl/DefaultCheckTest.java @@ -22,10 +22,10 @@ package de.kosit.validationtool.impl; import static de.kosit.validationtool.api.InputFactory.read; import static de.kosit.validationtool.impl.Helper.Simple.GARBAGE; import static de.kosit.validationtool.impl.Helper.Simple.NOT_WELLFORMED; +import static de.kosit.validationtool.impl.Helper.Simple.REJECTED; import static org.assertj.core.api.Assertions.assertThat; import java.io.File; -import java.net.URISyntaxException; import java.util.List; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -54,7 +54,7 @@ public class DefaultCheckTest { private DefaultCheck implementation; @Before - public void setup() throws URISyntaxException { + public void setup() { final CheckConfiguration d = new CheckConfiguration(Simple.SCENARIOS); d.setScenarioRepository(new File(Simple.REPOSITORY).toURI()); this.implementation = new DefaultCheck(d); @@ -130,7 +130,19 @@ public class DefaultCheckTest { assertThat(result.getAcceptRecommendation()).isEqualTo(AcceptRecommendation.REJECT); assertThat(result.getReport()).isNotNull(); assertThat(result.getReportDocument()).isNotNull(); - System.out.println(Helper.serialize(result.getReportDocument())); + } + + @Test + public void testRejectAcceptMatch() { + final Result result = this.implementation.checkInput(read(REJECTED)); + assertThat(result).isNotNull(); + assertThat(result.isWellformed()).isTrue(); + assertThat(result.isSchemaValid()).isTrue(); + assertThat(result.isProcessingSuccessful()).isTrue(); + assertThat(result.getAcceptRecommendation()).isEqualTo(AcceptRecommendation.REJECT); + assertThat(result.isAcceptable()).isFalse(); + assertThat(result.getReport()).isNotNull(); + assertThat(result.getReportDocument()).isNotNull(); } } diff --git a/src/test/java/de/kosit/validationtool/impl/Helper.java b/src/test/java/de/kosit/validationtool/impl/Helper.java index f0e913d..1d50fc4 100644 --- a/src/test/java/de/kosit/validationtool/impl/Helper.java +++ b/src/test/java/de/kosit/validationtool/impl/Helper.java @@ -57,6 +57,8 @@ public class Helper { public static final URI FOO = Simple.ROOT.resolve("input/foo.xml"); + public static final URI REJECTED = Simple.ROOT.resolve("input/withManualReject.xml"); + public static final URI SCENARIOS = ROOT.resolve("scenarios.xml"); public static final URI REPOSITORY = ROOT.resolve("repository/"); diff --git a/src/test/resources/examples/simple/input/foo.xml b/src/test/resources/examples/simple/input/foo.xml index 7c22b1f..7122648 100644 --- a/src/test/resources/examples/simple/input/foo.xml +++ b/src/test/resources/examples/simple/input/foo.xml @@ -2,5 +2,7 @@ asldkfj - + + + \ No newline at end of file diff --git a/src/test/resources/examples/simple/input/withManualReject.xml b/src/test/resources/examples/simple/input/withManualReject.xml new file mode 100644 index 0000000..ed81f6d --- /dev/null +++ b/src/test/resources/examples/simple/input/withManualReject.xml @@ -0,0 +1,8 @@ + + + + asldkfj + + directly transferred, so this is part of the report + + \ No newline at end of file diff --git a/src/test/resources/examples/simple/scenarios.xml b/src/test/resources/examples/simple/scenarios.xml index 47e5ec8..3a99296 100644 --- a/src/test/resources/examples/simple/scenarios.xml +++ b/src/test/resources/examples/simple/scenarios.xml @@ -47,7 +47,7 @@ report.xsl - count(//cri:xmlSyntaxError) = 0 + count(//test:rejected) = 0