From 03119dc7f335b6f97ccfb061fffbb64b18e6cb6c Mon Sep 17 00:00:00 2001 From: "Andreas Penski (init)" Date: Wed, 12 Aug 2020 08:44:07 +0200 Subject: [PATCH] (chore) some cleanup --- .../validationtool/config/SimpleConfigTest.java | 10 +--------- .../validationtool/config/TestScenarioFactory.java | 13 +++++++++++++ .../kosit/validationtool/impl/DefaultCheckTest.java | 2 ++ 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/test/java/de/kosit/validationtool/config/SimpleConfigTest.java b/src/test/java/de/kosit/validationtool/config/SimpleConfigTest.java index f4374ec..16e31a1 100644 --- a/src/test/java/de/kosit/validationtool/config/SimpleConfigTest.java +++ b/src/test/java/de/kosit/validationtool/config/SimpleConfigTest.java @@ -1,7 +1,6 @@ package de.kosit.validationtool.config; -import static de.kosit.validationtool.config.ConfigurationBuilder.fallback; -import static de.kosit.validationtool.config.TestScenarioFactory.createScenario; +import static de.kosit.validationtool.config.TestScenarioFactory.createSimpleConfiguration; import static org.assertj.core.api.Assertions.assertThat; import org.junit.Test; @@ -11,7 +10,6 @@ import de.kosit.validationtool.api.InputFactory; import de.kosit.validationtool.api.Result; import de.kosit.validationtool.impl.DefaultCheck; import de.kosit.validationtool.impl.Helper.Simple; -import de.kosit.validationtool.impl.ResolvingMode; /** * @author Andreas Penski @@ -28,13 +26,7 @@ public class SimpleConfigTest { assertThat(result).isNotNull(); } - static ConfigurationBuilder createSimpleConfiguration() { - return Configuration.create().name("Simple-API").with(createScenario() - // .description("awesome api") - ).with(fallback().name("default").source("report.xsl")) - .resolvingMode(ResolvingMode.STRICT_RELATIVE).useRepository(Simple.REPOSITORY_URI); - } } diff --git a/src/test/java/de/kosit/validationtool/config/TestScenarioFactory.java b/src/test/java/de/kosit/validationtool/config/TestScenarioFactory.java index 61772d1..70ae5cc 100644 --- a/src/test/java/de/kosit/validationtool/config/TestScenarioFactory.java +++ b/src/test/java/de/kosit/validationtool/config/TestScenarioFactory.java @@ -1,16 +1,29 @@ package de.kosit.validationtool.config; +import static de.kosit.validationtool.config.ConfigurationBuilder.fallback; import static de.kosit.validationtool.config.ConfigurationBuilder.report; import static de.kosit.validationtool.config.ConfigurationBuilder.scenario; import static de.kosit.validationtool.config.ConfigurationBuilder.schema; import java.net.URI; +import java.util.Date; + +import de.kosit.validationtool.api.Configuration; +import de.kosit.validationtool.impl.Helper.Simple; +import de.kosit.validationtool.impl.ResolvingMode; /** * @author Andreas Penski */ public class TestScenarioFactory { + static ConfigurationBuilder createSimpleConfiguration() { + return Configuration.create().name("Simple-API").author("me").description("test desc").date(new Date()) + .with(createScenario().description("awesome scenario")).with(fallback().name("default").source("report.xsl")) + + .resolvingMode(ResolvingMode.STRICT_RELATIVE).useRepository(Simple.REPOSITORY_URI); + } + public static ScenarioBuilder createScenario() { return scenario("simple").validate(schema("Sample Schema").schemaLocation(URI.create("simple.xsd"))) .with(report("Report für eRechnung").source("report.xsl")).acceptWith("count(//test:rejected) = 0") diff --git a/src/test/java/de/kosit/validationtool/impl/DefaultCheckTest.java b/src/test/java/de/kosit/validationtool/impl/DefaultCheckTest.java index faba39e..1d92e18 100644 --- a/src/test/java/de/kosit/validationtool/impl/DefaultCheckTest.java +++ b/src/test/java/de/kosit/validationtool/impl/DefaultCheckTest.java @@ -90,6 +90,8 @@ public class DefaultCheckTest { assertThat(doc.getSchematronResult()).hasSize(1); assertThat(doc.getSchematronResult().get(0).getActivePatterns()).isNotEmpty(); assertThat(doc.getSchematronResult().get(0).getFiredRules()).isNotEmpty(); + assertThat(doc.getSchematronResult().get(0).hasFailedAsserts()).isFalse(); + assertThat(doc.getSchematronResult().get(0).getFailedAsserts()).isEmpty(); assertThat(doc.getAcceptRecommendation()).isEqualTo(AcceptRecommendation.ACCEPTABLE); }