From 65ed94560237f9de07ce43a7dd4792f1fbdcf20a Mon Sep 17 00:00:00 2001 From: "Andreas Penski (init)" Date: Mon, 23 Mar 2020 11:57:52 +0100 Subject: [PATCH] (chore) adopt new test infrastructure --- .../tasks/ComputeAcceptanceActionTest.java | 48 +----------------- .../impl/tasks/TestBagBuilder.java | 50 ++++++++++++++++++- 2 files changed, 50 insertions(+), 48 deletions(-) diff --git a/src/test/java/de/kosit/validationtool/impl/tasks/ComputeAcceptanceActionTest.java b/src/test/java/de/kosit/validationtool/impl/tasks/ComputeAcceptanceActionTest.java index 5798467..851b4ed 100644 --- a/src/test/java/de/kosit/validationtool/impl/tasks/ComputeAcceptanceActionTest.java +++ b/src/test/java/de/kosit/validationtool/impl/tasks/ComputeAcceptanceActionTest.java @@ -1,29 +1,14 @@ package de.kosit.validationtool.impl.tasks; +import static de.kosit.validationtool.impl.tasks.TestBagBuilder.createBag; import static org.assertj.core.api.Assertions.assertThat; -import java.util.Collection; import java.util.Collections; -import java.util.List; import org.junit.Test; -import org.oclc.purl.dsdl.svrl.FailedAssert; -import org.oclc.purl.dsdl.svrl.SchematronOutput; import de.kosit.validationtool.api.AcceptRecommendation; -import de.kosit.validationtool.api.InputFactory; -import de.kosit.validationtool.impl.ContentRepository; -import de.kosit.validationtool.impl.Helper.Simple; -import de.kosit.validationtool.impl.ObjectFactory; -import de.kosit.validationtool.impl.model.Result; import de.kosit.validationtool.impl.tasks.CheckAction.Bag; -import de.kosit.validationtool.model.reportInput.CreateReportInput; -import de.kosit.validationtool.model.reportInput.ValidationResultsSchematron; -import de.kosit.validationtool.model.reportInput.ValidationResultsSchematron.Results; -import de.kosit.validationtool.model.reportInput.XMLSyntaxError; -import de.kosit.validationtool.model.scenarios.ScenarioType; - -import net.sf.saxon.s9api.XdmNode; /** * Tests the 'acceptMatch' functionality. @@ -103,36 +88,5 @@ public class ComputeAcceptanceActionTest { assertThat(bag.getAcceptStatus()).isEqualTo(AcceptRecommendation.REJECT); } - private static Bag createBag(final boolean schemaValid, final boolean schematronValid) { - final Result schemaResult = schemaValid ? new Result<>(true) - : new Result<>(Collections.singletonList(new XMLSyntaxError())); - final List schematronResult = schematronValid ? Collections.emptyList() : createSchematronError(); - return createBag(schemaResult, schematronResult); - } - private static List createSchematronError() { - final ValidationResultsSchematron v = new ValidationResultsSchematron(); - final SchematronOutput out = new SchematronOutput(); - final FailedAssert f = new FailedAssert(); - out.getActivePatternAndFiredRuleAndFailedAssert().add(f); - final Results r = new Results(); - r.setSchematronOutput(out); - v.setResults(r); - return Collections.singletonList(v); - } - - private static Bag createBag(final Result schemaResult, - final Collection schematronResult) { - final ScenarioType t = new ScenarioType(); - t.initialize(new ContentRepository(ObjectFactory.createProcessor(), Simple.REPOSITORY), true); - final CreateReportInput reportInput = new CreateReportInput(); - reportInput.getValidationResultsSchematron().addAll(schematronResult); - final Bag b = new Bag(InputFactory.read("".getBytes(), "someCheck"), reportInput); - final Result parseREsult = DocumentParseAction.parseDocument(b.getInput()); - b.setReport(parseREsult.getObject()); - b.setParserResult(parseREsult); - b.setSchemaValidationResult(schemaResult); - b.setScenarioSelectionResult(new Result<>(t)); - return b; - } } diff --git a/src/test/java/de/kosit/validationtool/impl/tasks/TestBagBuilder.java b/src/test/java/de/kosit/validationtool/impl/tasks/TestBagBuilder.java index 2594786..0626a66 100644 --- a/src/test/java/de/kosit/validationtool/impl/tasks/TestBagBuilder.java +++ b/src/test/java/de/kosit/validationtool/impl/tasks/TestBagBuilder.java @@ -1,8 +1,15 @@ package de.kosit.validationtool.impl.tasks; import java.net.URI; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + +import org.oclc.purl.dsdl.svrl.FailedAssert; +import org.oclc.purl.dsdl.svrl.SchematronOutput; import de.kosit.validationtool.api.Input; +import de.kosit.validationtool.api.InputFactory; import de.kosit.validationtool.impl.ContentRepository; import de.kosit.validationtool.impl.Helper; import de.kosit.validationtool.impl.Helper.Simple; @@ -10,10 +17,15 @@ import de.kosit.validationtool.impl.ObjectFactory; import de.kosit.validationtool.impl.model.Result; import de.kosit.validationtool.impl.tasks.CheckAction.Bag; import de.kosit.validationtool.model.reportInput.CreateReportInput; +import de.kosit.validationtool.model.reportInput.ValidationResultsSchematron; +import de.kosit.validationtool.model.reportInput.ValidationResultsSchematron.Results; +import de.kosit.validationtool.model.reportInput.XMLSyntaxError; import de.kosit.validationtool.model.scenarios.ResourceType; import de.kosit.validationtool.model.scenarios.ScenarioType; import de.kosit.validationtool.model.scenarios.ValidateWithXmlSchema; +import net.sf.saxon.s9api.XdmNode; + /** * Utilities for creating test objects. * @@ -26,7 +38,11 @@ public class TestBagBuilder { } public static Bag createBag(final Input input, final boolean parse) { - final Bag bag = new Bag(input, new CreateReportInput()); + return createBag(input, parse, new CreateReportInput()); + } + + public static Bag createBag(final Input input, final boolean parse, final CreateReportInput reportInput) { + final Bag bag = new Bag(input, reportInput); if (parse) { bag.setParserResult(DocumentParseAction.parseDocument(bag.getInput())); } @@ -46,4 +62,36 @@ public class TestBagBuilder { t.initialize(repository, true); return t; } + + private static XdmNode createReport() { + return DocumentParseAction.parseDocument(InputFactory.read("xml".getBytes(), "someXml")).getObject(); + } + + static Bag createBag(final boolean schemaValid, final boolean schematronValid) { + final Result schemaResult = schemaValid ? new Result<>(true) + : new Result<>(Collections.singletonList(new XMLSyntaxError())); + final List schematronResult = schematronValid ? Collections.emptyList() : createSchematronError(); + return createBag(schemaResult, schematronResult); + } + + private static List createSchematronError() { + final ValidationResultsSchematron v = new ValidationResultsSchematron(); + final SchematronOutput out = new SchematronOutput(); + final FailedAssert f = new FailedAssert(); + out.getActivePatternAndFiredRuleAndFailedAssert().add(f); + final Results r = new Results(); + r.setSchematronOutput(out); + v.setResults(r); + return Collections.singletonList(v); + } + + static Bag createBag(final Result schemaResult, + final Collection schematronResult) { + final CreateReportInput reportInput = new CreateReportInput(); + reportInput.getValidationResultsSchematron().addAll(schematronResult); + final Bag b = createBag(InputFactory.read("".getBytes(), "someCheck"), true, reportInput); + b.setSchemaValidationResult(schemaResult); + b.setReport(createReport()); + return b; + } }