demo/validator
1
0
Fork 0
mirror of https://github.com/itplr-kosit/validator.git synced 2026-05-25 16:55:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

26-AddAndApplyOpenRewrite

Browse source
This commit is contained in:
Adrian-Devries 2025-04-24 12:54:14 +02:00
parent 2466f9cf5d
commit 24509aae31
77 changed files with 508 additions and 413 deletions
Download patch file Download diff file Expand all files Collapse all files

94
pom.xml
View file

@ -87,13 +87,17 @@
<version.jakarta.xml.bind-api>4.0.2</version.jakarta.xml.bind-api>
<version.jansi>2.4.1</version.jansi>
<version.jaxb-runtime>4.0.5</version.jaxb-runtime>
<version.junit>4.13.2</version.junit>
<version.junit-jupiter-api>5.12.2</version.junit-jupiter-api>
<version.lombok>1.18.38</version.lombok>
<version.mockito-core>5.17.0</version.mockito-core>
<version.packaged-test-scenarios>1.0.2</version.packaged-test-scenarios>
<version.picocli>4.7.7</version.picocli>
<version.pmd>7.12.0</version.pmd>
<version.rest-assured>5.5.1</version.rest-assured>
<version.rewrite-logging-frameworks>3.6.1</version.rewrite-logging-frameworks>
<version.rewrite-migrate-java>3.7.0</version.rewrite-migrate-java>
<version.rewrite-static-analysis>2.7.1</version.rewrite-static-analysis>
<version.rewrite-testing-frameworks>3.6.1</version.rewrite-testing-frameworks>
<version.saxon-he>12.5</version.saxon-he>
<version.slf4j-api>2.0.17</version.slf4j-api>
<version.slf4j-simple>2.0.17</version.slf4j-simple>
@ -124,6 +128,7 @@
<version.maven-site-plugin>3.21.0</version.maven-site-plugin>
<version.maven-source-plugin>3.3.1</version.maven-source-plugin>
<version.maven-surefire-plugin>3.5.3</version.maven-surefire-plugin>
<version.rewrite-maven-plugin>6.6.1</version.rewrite-maven-plugin>
<version.spotbugs-maven-plugin>4.9.3.0</version.spotbugs-maven-plugin>
<version.versions-maven-plugin>2.18.0</version.versions-maven-plugin>
</properties>
@ -211,18 +216,18 @@
<version>${version.rest-assured}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${version.assertj-core}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${version.junit-jupiter-api}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
@ -230,6 +235,7 @@
<scope>test</scope>
</dependency>
</dependencies>
<!--
<repositories>
<repository>
<id>project.local</id>
@ -237,6 +243,7 @@
<url>file:${project.basedir}/libs</url>
</repository>
</repositories>
-->
<build>
<resources>
<resource>
@ -786,6 +793,79 @@
<outputFormat>xml</outputFormat>
</configuration>
</plugin>
<plugin>
<groupId>org.openrewrite.maven</groupId>
<artifactId>rewrite-maven-plugin</artifactId>
<version>${version.rewrite-maven-plugin}</version>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>dryRunNoFork</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.openrewrite.recipe</groupId>
<artifactId>rewrite-logging-frameworks</artifactId>
<version>${version.rewrite-logging-frameworks}</version>
</dependency>
<dependency>
<groupId>org.openrewrite.recipe</groupId>
<artifactId>rewrite-migrate-java</artifactId>
<version>${version.rewrite-migrate-java}</version>
</dependency>
<dependency>
<groupId>org.openrewrite.recipe</groupId>
<artifactId>rewrite-static-analysis</artifactId>
<version>${version.rewrite-static-analysis}</version>
</dependency>
<dependency>
<groupId>org.openrewrite.recipe</groupId>
<artifactId>rewrite-testing-frameworks</artifactId>
<version>${version.rewrite-testing-frameworks}</version>
</dependency>
</dependencies>
<configuration>
<activeRecipes>
<recipe>org.openrewrite.maven.BestPractices</recipe>
<recipe>org.openrewrite.maven.ModernizeObsoletePoms</recipe>
<recipe>org.openrewrite.maven.OrderPomElements</recipe>
<!-- <recipe>org.openrewrite.java.OrderImports</recipe> -->
<recipe>org.openrewrite.java.RemoveUnusedImports</recipe>
<recipe>org.openrewrite.java.ShortenFullyQualifiedTypeReferences</recipe>
<!-- <recipe>org.openrewrite.java.format.AutoFormat</recipe> -->
<recipe>org.openrewrite.java.format.BlankLines</recipe>
<recipe>org.openrewrite.java.format.EmptyNewlineAtEndOfFile</recipe>
<recipe>org.openrewrite.java.format.MethodParamPad</recipe>
<recipe>org.openrewrite.java.format.NoWhitespaceAfter</recipe>
<recipe>org.openrewrite.java.format.NoWhitespaceBefore</recipe>
<recipe>org.openrewrite.java.format.NormalizeFormat</recipe>
<recipe>org.openrewrite.java.format.NormalizeLineBreaks</recipe>
<recipe>org.openrewrite.java.format.NormalizeTabsOrSpaces</recipe>
<recipe>org.openrewrite.java.format.RemoveTrailingWhitespace</recipe>
<recipe>org.openrewrite.java.format.SingleLineComments</recipe>
<recipe>org.openrewrite.java.format.Spaces</recipe>
<!-- <recipe>org.openrewrite.java.format.TabsAndIndents</recipe> -->
<recipe>org.openrewrite.java.format.TypecastParenPad</recipe>
<recipe>org.openrewrite.java.format.WrappingAndBraces</recipe>
<recipe>org.openrewrite.java.logging.PrintStackTraceToLogError</recipe>
<recipe>org.openrewrite.java.logging.slf4j.Slf4jBestPractices</recipe>
<recipe>org.openrewrite.java.migrate.UpgradeToJava8</recipe>
<recipe>org.openrewrite.java.testing.junit5.JUnit4to5Migration</recipe>
<recipe>org.openrewrite.java.testing.junit5.JUnit5BestPractices</recipe>
<recipe>org.openrewrite.staticanalysis.CovariantEquals</recipe>
<!-- <recipe>org.openrewrite.staticanalysis.FinalizeLocalVariables</recipe> -->
<recipe>org.openrewrite.staticanalysis.HideUtilityClassConstructor</recipe>
<recipe>org.openrewrite.staticanalysis.UnnecessaryParentheses</recipe>
</activeRecipes>
<activeStyles>
<style>org.openrewrite.java.IntelliJ</style>
</activeStyles>
<checkstyleDetectionEnabled>false</checkstyleDetectionEnabled>
</configuration>
</plugin>
</plugins>
</build>
<reporting>

5
src/main/java/de/kosit/validationtool/cmd/CommandLineOptions.java
View file

@ -20,6 +20,7 @@ import de.kosit.validationtool.cmd.CommandLineApplication.Level;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.slf4j.simple.SimpleLogger;
import picocli.CommandLine.ArgGroup;
import picocli.CommandLine.Command;
import picocli.CommandLine.Help.Visibility;
@ -172,9 +173,9 @@ public class CommandLineOptions implements Callable<ReturnValue> {
private static void configureLogging(final CommandLineOptions cmd) {
if (cmd.isDebugLog()) {
System.setProperty(org.slf4j.simple.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "DEBUG");
System.setProperty(SimpleLogger.DEFAULT_LOG_LEVEL_KEY, "DEBUG");
} else {
System.setProperty(org.slf4j.simple.SimpleLogger.DEFAULT_LOG_LEVEL_KEY, cmd.getLogLevel().name());
System.setProperty(SimpleLogger.DEFAULT_LOG_LEVEL_KEY, cmd.getLogLevel().name());
}
}

6
src/main/java/de/kosit/validationtool/cmd/InternalCheck.java
View file

@ -73,14 +73,14 @@ class InternalCheck extends DefaultCheck {
private static Grid createResultGrid(final Map<String, Result> results) {
final Grid grid = new Grid(
//@formatter:off
// @formatter:off
new ColumnDefinition("File", 60, 10, 1),
new ColumnDefinition("Schema", 7).justify(Justify.CENTER),
new ColumnDefinition("Schematron", 10).justify(Justify.CENTER),
new ColumnDefinition("Acceptance", 10, 5).justify(Justify.CENTER),
new ColumnDefinition("Error/Description", 60,20,3)
new ColumnDefinition("Error/Description", 60, 20, 3)
);
//@formatter:on
// @formatter:on
results.entrySet().stream().sorted(Entry.comparingByKey()).forEach(e -> {
final Result value = e.getValue();

3
src/main/java/de/kosit/validationtool/cmd/PrintMemoryStats.java
View file

@ -16,6 +16,7 @@
package de.kosit.validationtool.cmd;
import de.kosit.validationtool.impl.tasks.CheckAction;
import lombok.extern.slf4j.Slf4j;
import java.text.NumberFormat;
@ -27,7 +28,7 @@ import java.text.NumberFormat;
* @author Andreas Penski
*/
@Slf4j
class PrintMemoryStats implements de.kosit.validationtool.impl.tasks.CheckAction {
class PrintMemoryStats implements CheckAction {
private static final int BYTES_PER_K = 1024;

3
src/main/java/de/kosit/validationtool/cmd/TypeConverter.java
View file

@ -93,4 +93,7 @@ class TypeConverter {
return TypeConverter.convert(ScenarioDefinition.class, value);
}
}
private TypeConverter() {
}
}

5
src/main/java/de/kosit/validationtool/cmd/Validator.java
View file

@ -25,6 +25,7 @@ import de.kosit.validationtool.cmd.CommandLineOptions.Definition;
import de.kosit.validationtool.cmd.CommandLineOptions.RepositoryDefinition;
import de.kosit.validationtool.cmd.CommandLineOptions.ScenarioDefinition;
import de.kosit.validationtool.cmd.assertions.Assertions;
import de.kosit.validationtool.cmd.assertions.ObjectFactory;
import de.kosit.validationtool.cmd.report.Line;
import de.kosit.validationtool.daemon.Daemon;
import de.kosit.validationtool.impl.ConversionService;
@ -91,7 +92,7 @@ public class Validator {
if (cmd.isDebugOutput()) {
log.error(e.getMessage(), e);
} else {
log.error(e.getMessage());
log.error("", e);
}
return ReturnValue.CONFIGURATION_ERROR;
}
@ -246,7 +247,7 @@ public class Validator {
Assertions a = null;
if (Files.exists(p)) {
final ConversionService c = new ConversionService();
c.initialize(de.kosit.validationtool.cmd.assertions.ObjectFactory.class.getPackage());
c.initialize(ObjectFactory.class.getPackage());
a = c.readXml(p.toUri(), Assertions.class);
}
return a;

2
src/main/java/de/kosit/validationtool/config/ConfigurationBuilder.java
View file

@ -280,7 +280,7 @@ public class ConfigurationBuilder {
configuration.setName(this.name);
configuration.setContentRepository(contentRepository);
configuration.getAdditionalParameters().put(Keys.SCENARIO_DEFINITION, createDefinition(configuration));
return (configuration);
return configuration;
}
private Scenarios createDefinition(final DefaultConfiguration configuration) {

2
src/main/java/de/kosit/validationtool/config/ConfigurationLoader.java
View file

@ -168,7 +168,7 @@ public class ConfigurationLoader {
configuration.setContentRepository(contentRepository);
configuration.getAdditionalParameters().put(Keys.SCENARIOS_FILE, this.scenarioDefinition);
configuration.getAdditionalParameters().put(Keys.SCENARIO_DEFINITION, def);
return (configuration);
return configuration;
}
private ResolvingConfigurationStrategy getResolvingConfigurationStrategy() {

3
src/main/java/de/kosit/validationtool/daemon/CheckHandler.java
View file

@ -80,8 +80,7 @@ class CheckHandler extends BaseHandler {
}
}
private static boolean isContentAvailable(final com.sun.net.httpserver.HttpExchange httpExchange, final BufferedInputStream buffered)
throws IOException {
private static boolean isContentAvailable(final HttpExchange httpExchange, final BufferedInputStream buffered) throws IOException {
final String length = httpExchange.getRequestHeaders().getFirst("Content-length");
if (StringUtils.isNumeric(length)) {
return Integer.parseInt(length) > 0;

2
src/main/java/de/kosit/validationtool/daemon/HttpStatus.java
View file

@ -45,4 +45,4 @@ public interface HttpStatus {
/** {@code 500 Server Error} (HTTP/1.0 - RFC 1945) */
int SC_INTERNAL_SERVER_ERROR = 500;
}
}

2
src/main/java/de/kosit/validationtool/impl/CollectingErrorEventHandler.java
View file

@ -158,4 +158,4 @@ public class CollectingErrorEventHandler implements ValidationEventHandler, Erro
e.getSeverityCode().value() + " " + e.getMessage() + " At row " + e.getRowNumber() + " at pos " + e.getColumnNumber()));
return joiner.toString();
}
}
}

3
src/main/java/de/kosit/validationtool/impl/ConversionService.java
View file

@ -16,6 +16,7 @@
package de.kosit.validationtool.impl;
import de.kosit.validationtool.model.reportInput.ObjectFactory;
import jakarta.xml.bind.JAXBContext;
import jakarta.xml.bind.JAXBElement;
import jakarta.xml.bind.JAXBException;
@ -112,7 +113,7 @@ public class ConversionService {
*/
public void initialize() {
final Collection<Package> p = new ArrayList<>();
p.add(de.kosit.validationtool.model.reportInput.ObjectFactory.class.getPackage());
p.add(ObjectFactory.class.getPackage());
p.add(de.kosit.validationtool.model.scenarios.ObjectFactory.class.getPackage());
initialize(p);
}

3
src/main/java/de/kosit/validationtool/impl/SchemaProvider.java
View file

@ -84,4 +84,7 @@ public class SchemaProvider {
return createSchema(sf, resolve(Objects.requireNonNull(SchemaProvider.class.getResource("/xsd/scenarios.xsd"))));
}
private SchemaProvider() {
}
}

2
src/main/java/de/kosit/validationtool/impl/model/Result.java
View file

@ -74,4 +74,4 @@ public class Result<T, E> {
public boolean isInvalid() {
return !isValid();
}
}
}

2
src/main/java/de/kosit/validationtool/impl/tasks/DocumentParseAction.java
View file

@ -69,7 +69,7 @@ public class DocumentParseAction implements CheckAction {
result = new Result<>(doc, Collections.emptyList());
}
} catch (final SaxonApiException | IOException e) {
log.debug("Exception while parsing {}", content.getName(), e);
log.error("Exception while parsing {}", content.getName(), e);
final XMLSyntaxError error = new XMLSyntaxError();
error.setSeverityCode(XMLSyntaxErrorSeverity.SEVERITY_FATAL_ERROR);
error.setMessage(String.format("IOException while reading resource %s: %s", content.getName(), e.getMessage()));

2
src/main/java/de/kosit/validationtool/impl/xml/BaseResolvingStrategy.java
View file

@ -58,7 +58,7 @@ public abstract class BaseResolvingStrategy implements ResolvingConfigurationStr
if (lenient) {
log.warn(errorMessage);
log.debug(e.getMessage(), e);
log.error(e.getMessage(), e);
} else {
throw new IllegalStateException(errorMessage);
}

3
src/main/java/de/kosit/validationtool/impl/xml/ProcessorProvider.java
View file

@ -116,4 +116,7 @@ public class ProcessorProvider {
.setConfigurationProperty(FeatureKeys.XML_PARSER_FEATURE + encode(XMLConstants.ACCESS_EXTERNAL_DTD), false); // NOSONAR
return processor;
}
private ProcessorProvider() {
}
}

2
src/main/java/de/kosit/validationtool/impl/xml/RelativeUriResolver.java
View file

@ -100,4 +100,4 @@ public class RelativeUriResolver implements URIResolver, UnparsedTextURIResolver
}
}
}
}

2
src/main/java/de/kosit/validationtool/impl/xml/StringTrimAdapter.java
View file

@ -42,4 +42,4 @@ public class StringTrimAdapter extends XmlAdapter<String, String> {
}
return v.trim();
}
}
}

2
src/main/model/xsd/assertions.xsd
View file

@ -52,7 +52,7 @@
<xs:complexType name="AssertionType">
<xs:annotation>
<xs:documentation>Zusicherung: für das in report-doc angegebene Dokument (relativ zum aktuellen
Ausgabeverzeichnis) hat der angebene
Ausgabeverzeichnis) hat der angegebene
XPath-Test den "Effective Truth Value" true(). Im Textknoten kann eine textuelle Zusammenfassung des
Tests stehen.
</xs:documentation>

2
src/main/resources/ui/404.html
View file

File diff suppressed because one or more lines are too long

2
src/main/resources/ui/assets/js/main.3f408954.js
View file

File diff suppressed because one or more lines are too long

2
src/main/resources/ui/config/ConfigPage/index.html
View file

File diff suppressed because one or more lines are too long

2
src/main/resources/ui/config/index.html
View file

File diff suppressed because one or more lines are too long

2
src/main/resources/ui/docs/api/index.html
View file

File diff suppressed because one or more lines are too long

2
src/main/resources/ui/docs/changelog/index.html
View file

File diff suppressed because one or more lines are too long

2
src/main/resources/ui/docs/configurations/index.html
View file

File diff suppressed because one or more lines are too long

2
src/main/resources/ui/health/HealthPage/index.html
View file

File diff suppressed because one or more lines are too long

2
src/main/resources/ui/health/index.html
View file

File diff suppressed because one or more lines are too long

2
src/main/resources/ui/index.html
View file

File diff suppressed because one or more lines are too long

2
src/main/resources/ui/markdown-page/index.html
View file

File diff suppressed because one or more lines are too long

6
src/test/java/de/kosit/validationtool/api/CheckConfigurationTest.java
View file

@ -17,7 +17,7 @@
package de.kosit.validationtool.api;
import de.kosit.validationtool.impl.Helper.Simple;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@ -27,10 +27,10 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Andreas Penski
*/
@Deprecated
public class CheckConfigurationTest {
class CheckConfigurationTest {
@Test
public void testDelegation() {
void delegation() {
final CheckConfiguration config = new CheckConfiguration(Simple.SCENARIOS);
config.setScenarioRepository(Simple.REPOSITORY_URI);
assertThat(config.getScenarios()).isNotEmpty();

43
src/test/java/de/kosit/validationtool/api/InputFactoryTest.java
View file

@ -27,7 +27,7 @@ import net.sf.saxon.s9api.BuildingContentHandler;
import net.sf.saxon.s9api.DocumentBuilder;
import net.sf.saxon.s9api.SaxonApiException;
import net.sf.saxon.s9api.XdmNode;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
@ -45,7 +45,7 @@ import java.nio.file.Paths;
import static de.kosit.validationtool.impl.Helper.Simple.SIMPLE_VALID;
import static de.kosit.validationtool.impl.input.StreamHelper.drain;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Testet den Hashcode-Service.
@ -57,13 +57,13 @@ public class InputFactoryTest {
public static final String SOME_VALUE = "some value";
@Test
public void testDefaultDigestAlgorithm() {
void defaultDigestAlgorithm() {
assertThat(new InputFactory().getAlgorithm()).isEqualTo(InputFactory.DEFAULT_ALGORITHM);
assertThat(new InputFactory("").getAlgorithm()).isEqualTo(InputFactory.DEFAULT_ALGORITHM);
}
@Test
public void testHashCodeGeneration() throws IOException {
void hashCodeGeneration() throws IOException {
final byte[] s1 = drain(InputFactory.read(Simple.SIMPLE_VALID.toURL())).getHashCode();
final byte[] s2 = drain(InputFactory.read(Simple.SIMPLE_VALID.toURL())).getHashCode();
final byte[] s3 = drain(InputFactory.read(Simple.SCHEMA_INVALID.toURL())).getHashCode();
@ -74,64 +74,61 @@ public class InputFactoryTest {
}
@Test
public void testWrongAlgorithm() {
void wrongAlgorithm() {
assertThrows(IllegalArgumentException.class, () -> new InputFactory("unknown"));
}
@Test
public void testNullInputURL() {
void nullInputURL() {
assertThrows(IllegalArgumentException.class, () -> InputFactory.read((URL) null));
}
@Test
public void testInputByte() {
void inputByte() {
final Input input = InputFactory.read(SOME_VALUE.getBytes(), SOME_VALUE);
assertThat(input).isNotNull();
}
@Test
public void testInputStream() {
void inputStream() {
final Input input = InputFactory.read(new ByteArrayInputStream(SOME_VALUE.getBytes()), SOME_VALUE);
assertThat(input).isNotNull();
}
@Test
public void testNullStream() {
void nullStream() {
assertThrows(IllegalArgumentException.class, () -> InputFactory.read((InputStream) null, SOME_VALUE));
}
@Test
public void testInputFile() {
void inputFile() {
final Input input = InputFactory.read(new File(Simple.SIMPLE_VALID));
assertThat(input).isNotNull();
}
@Test
public void testInputPath() {
void inputPath() {
final Input input = InputFactory.read(Paths.get(Simple.SIMPLE_VALID));
assertThat(input).isNotNull();
}
@Test
public void testNullInput() {
void nullInput() {
assertThrows(IllegalArgumentException.class, () -> InputFactory.read((byte[]) null, SOME_VALUE));
}
@Test
public void testNullInputName() {
void nullInputName() {
assertThrows(IllegalArgumentException.class, () -> InputFactory.read(SOME_VALUE.getBytes(), null));
}
@Test
public void testEmptyInputName() {
assertThrows(IllegalArgumentException.class, () -> {
final Input input = InputFactory.read(SOME_VALUE.getBytes(), "");
drain(input);
});
void emptyInputName() {
assertThrows(IllegalArgumentException.class, () -> InputFactory.read(SOME_VALUE.getBytes(), ""));
}
@Test
public void testSourceInput() throws IOException {
void sourceInput() throws IOException {
try ( final InputStream s = Simple.SIMPLE_VALID.toURL().openStream() ) {
final SourceInput input = (SourceInput) InputFactory.read(new StreamSource(s));
assertThat(input.getSource()).isNotNull();
@ -143,7 +140,7 @@ public class InputFactoryTest {
}
@Test
public void testSourceInputReader() throws IOException {
void sourceInputReader() throws IOException {
try ( final InputStream s = Simple.SIMPLE_VALID.toURL().openStream();
final InputStreamReader reader = new InputStreamReader(s) ) {
final SourceInput input = (SourceInput) InputFactory.read(new StreamSource(reader));
@ -156,12 +153,12 @@ public class InputFactoryTest {
}
@Test
public void testNotExistingInput() {
void notExistingInput() {
assertThrows(IllegalArgumentException.class, () -> InputFactory.read(Simple.NOT_EXISTING));
}
@Test
public void testDomSource() throws SaxonApiException, SAXException, IOException {
void domSource() throws SaxonApiException, SAXException, IOException {
final DocumentBuilder builder = TestObjectFactory.createProcessor().newDocumentBuilder();
final BuildingContentHandler handler = builder.newBuildingContentHandler();
@ -179,7 +176,7 @@ public class InputFactoryTest {
}
@Test
public void testXdmNode() throws Exception {
void xdmNode() throws Exception {
final XdmNode node = TestObjectFactory.createProcessor().newDocumentBuilder().build(new StreamSource(SIMPLE_VALID.toASCIIString()));
final Input nodeInput = InputFactory.read(node, "node test");
assertThat(nodeInput).isNotNull();

14
src/test/java/de/kosit/validationtool/cmd/CheckAssertionActionTest.java
View file

@ -22,8 +22,8 @@ import de.kosit.validationtool.impl.Helper;
import de.kosit.validationtool.impl.TestObjectFactory;
import de.kosit.validationtool.impl.tasks.CheckAction;
import de.kosit.validationtool.model.reportInput.CreateReportInput;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.net.URISyntaxException;
import java.net.URL;
@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Andreas Penski
*/
public class CheckAssertionActionTest {
class CheckAssertionActionTest {
private static final URL SAMPLE = CheckAssertionActionTest.class.getResource("/examples/assertions/ubl-0001.xml");
@ -43,20 +43,20 @@ public class CheckAssertionActionTest {
private static final URL SAMPLE_ASSERTIONS = CheckAssertionActionTest.class.getResource("/examples/assertions/tests-xrechnung.xml");
@Before
public void setup() {
@BeforeEach
void setup() {
CommandLine.activate();
}
@Test
public void testEmptyInput() {
void emptyInput() {
final CheckAssertionAction a = new CheckAssertionAction(new Assertions(), TestObjectFactory.createProcessor());
a.check(new CheckAction.Bag(InputFactory.read(SAMPLE), new CreateReportInput()));
assertThat(CommandLine.getErrorOutput()).contains("Can not find assertions for");
}
@Test
public void testSimple() throws URISyntaxException {
void simple() throws URISyntaxException {
final CheckAction.Bag bag = new CheckAction.Bag(InputFactory.read(SAMPLE), new CreateReportInput());
bag.setReport(Helper.load(SAMPLE_REPORT));

3
src/test/java/de/kosit/validationtool/cmd/CommandLine.java
View file

@ -151,4 +151,7 @@ public class CommandLine {
setStandardInput(nullInputStream());
}
private CommandLine() {
}
}

64
src/test/java/de/kosit/validationtool/cmd/CommandlineApplicationTest.java
View file

@ -21,9 +21,9 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.assertj.core.api.Condition;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.nio.file.Files;
@ -47,8 +47,8 @@ public class CommandlineApplicationTest {
private final Path output = Paths.get("target/test-output");
@Before
public void setup() throws IOException {
@BeforeEach
void setup() throws IOException {
CommandLine.activate();
if (Files.exists(this.output)) {
FileUtils.deleteDirectory(this.output.toFile());
@ -56,8 +56,8 @@ public class CommandlineApplicationTest {
TypeConverter.counter.clear();
}
@After
public void cleanup() throws IOException {
@AfterEach
void cleanup() throws IOException {
try ( Stream<Path> stream = Files.list(Paths.get("")) ) {
stream.filter(p -> p.getFileName().toString().endsWith("-report.xml")).forEach(path -> {
try {
@ -71,7 +71,7 @@ public class CommandlineApplicationTest {
}
@Test
public void testHelp() {
void help() {
final String[] args = new String[] { "-?" };
CommandLineApplication.mainProgram(args);
assertThat(CommandLine.getErrorOutput()).isEmpty();
@ -84,7 +84,7 @@ public class CommandlineApplicationTest {
}
@Test
public void testRequiredScenarioFile() {
void requiredScenarioFile() {
final String[] args = new String[] { "arguments", "egal welche", "argumente drin sind" };
CommandLineApplication.mainProgram(args);
assertThat(CommandLine.getErrorOutput()).isNotEmpty();
@ -92,7 +92,7 @@ public class CommandlineApplicationTest {
}
@Test
public void testNotExistingScenarioFile() {
void notExistingScenarioFile() {
final String s = Paths.get(Simple.NOT_EXISTING).toString();
final String[] args = new String[] { "-s", s, s };
CommandLineApplication.mainProgram(args);
@ -101,7 +101,7 @@ public class CommandlineApplicationTest {
}
@Test
public void testIncorrectRepository() {
void incorrectRepository() {
final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r", Paths.get(Simple.NOT_EXISTING).toString(),
Paths.get(Simple.SIMPLE_VALID).toString() };
CommandLineApplication.mainProgram(args);
@ -110,7 +110,7 @@ public class CommandlineApplicationTest {
}
@Test
public void testNotExistingTestTarget() {
void notExistingTestTarget() {
final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r",
Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.NOT_EXISTING).toString() };
CommandLineApplication.mainProgram(args);
@ -119,7 +119,7 @@ public class CommandlineApplicationTest {
}
@Test
public void testValidMinimalConfiguration() {
void validMinimalConfiguration() {
final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r",
Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString() };
CommandLineApplication.mainProgram(args);
@ -127,7 +127,7 @@ public class CommandlineApplicationTest {
}
@Test
public void testValidNamingConfiguration() {
void validNamingConfiguration() {
final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r",
Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString(), "--report-prefix", "somePrefix",
"--report-postfix", "somePostfix" };
@ -137,7 +137,7 @@ public class CommandlineApplicationTest {
}
@Test
public void testValidMultipleInput() {
void validMultipleInput() {
final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-o", this.output.toString(), "-r",
Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString(), Paths.get(Simple.FOO).toString() };
CommandLineApplication.mainProgram(args);
@ -145,7 +145,7 @@ public class CommandlineApplicationTest {
}
@Test
public void testValidDirectoryInput() {
void validDirectoryInput() {
final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-o", this.output.toString(), "-r",
Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.EXAMPLES).toString() };
CommandLineApplication.mainProgram(args);
@ -153,7 +153,7 @@ public class CommandlineApplicationTest {
}
@Test
public void testValidOutputConfiguration() throws IOException {
void validOutputConfiguration() throws IOException {
final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-o", this.output.toString(), "-r",
Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString() };
CommandLineApplication.mainProgram(args);
@ -163,7 +163,7 @@ public class CommandlineApplicationTest {
}
@Test
public void testNoInput() {
void noInput() {
// assertThat(output).doesNotExist();
final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r",
Paths.get(Simple.REPOSITORY_URI).toString(), };
@ -172,7 +172,7 @@ public class CommandlineApplicationTest {
}
@Test
public void testPrint() {
void print() {
final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-p", "-r",
Paths.get(Simple.REPOSITORY_URI).toString(), "-o", this.output.toString(), Paths.get(Simple.SIMPLE_VALID).toString() };
CommandLineApplication.mainProgram(args);
@ -182,7 +182,7 @@ public class CommandlineApplicationTest {
}
@Test
public void testHtmlExtraktion() throws IOException {
void htmlExtraktion() throws IOException {
final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-h", "-o",
this.output.toAbsolutePath().toString(), "-r", Paths.get(Simple.REPOSITORY_URI).toString(),
Paths.get(Simple.SIMPLE_VALID).toString() };
@ -194,7 +194,7 @@ public class CommandlineApplicationTest {
}
@Test
public void testAssertionsExtraktion() {
void assertionsExtraktion() {
final String s = Paths.get(Simple.REPOSITORY_URI).toString();
final String[] args = new String[] { "-d", "-s", Paths.get(Simple.SCENARIOS).toString(), "-r", s, "-o", this.output.toString(),
"-c", Paths.get(ASSERTIONS).toString(), s, Paths.get(Simple.SIMPLE_VALID).toString() };
@ -204,7 +204,7 @@ public class CommandlineApplicationTest {
}
@Test
public void testDebugFlag() {
void debugFlag() {
final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r", "unknown", "-o", this.output.toString(),
"-d", Paths.get(ASSERTIONS).toString() };
CommandLineApplication.mainProgram(args);
@ -212,7 +212,7 @@ public class CommandlineApplicationTest {
}
@Test
public void testPrintMemoryStats() {
void printMemoryStats() {
final String[] args = new String[] { "-m", "-s", Paths.get(Simple.SCENARIOS).toString(), "-r",
Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString() };
CommandLineApplication.mainProgram(args);
@ -221,7 +221,7 @@ public class CommandlineApplicationTest {
}
@Test
public void testReadFromPipe() throws IOException {
void readFromPipe() throws IOException {
final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-r",
Paths.get(Simple.REPOSITORY_URI).toString() };
CommandLine.setStandardInput(Files.newInputStream(Paths.get(Simple.SIMPLE_VALID)));
@ -230,7 +230,7 @@ public class CommandlineApplicationTest {
}
@Test
public void testUnexpectedDaemonFlag() {
void unexpectedDaemonFlag() {
final String[] args = new String[] { "-D", "-s", Paths.get(Simple.SCENARIOS).toString(), "-r",
Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString() };
CommandLineApplication.mainProgram(args);
@ -238,7 +238,7 @@ public class CommandlineApplicationTest {
}
@Test
public void testParsingError() {
void parsingError() {
final String[] args = new String[] { "-s", "-r", Paths.get(Simple.REPOSITORY_URI).toString(),
Paths.get(Simple.SIMPLE_VALID).toString() };
CommandLineApplication.mainProgram(args);
@ -246,7 +246,7 @@ public class CommandlineApplicationTest {
}
@Test
public void loadMultipleScenarios() {
void loadMultipleScenarios() {
final Path p = Paths.get(Simple.REPOSITORY_URI);
final String[] args = new String[] { "-s", "s1=" + Paths.get(Simple.SCENARIOS), "-s", "s2=" + Paths.get(Simple.OTHER_SCENARIOS),
"-r", "s1=" + p, "-r", "s2=" + p, Paths.get(Simple.SIMPLE_VALID).toString() };
@ -255,7 +255,7 @@ public class CommandlineApplicationTest {
}
@Test
public void loadMultipleScenariosSingleRepository() {
void loadMultipleScenariosSingleRepository() {
final String[] args = new String[] { "-s", "s1=" + Paths.get(Simple.SCENARIOS), "-s", "s2=" + Paths.get(Simple.OTHER_SCENARIOS),
"-r", Paths.get(Simple.REPOSITORY_URI).toString(), Paths.get(Simple.SIMPLE_VALID).toString() };
CommandLineApplication.mainProgram(args);
@ -263,7 +263,7 @@ public class CommandlineApplicationTest {
}
@Test
public void loadMultipleScenariosMissingRepository() {
void loadMultipleScenariosMissingRepository() {
final Path p = Paths.get(Simple.REPOSITORY_URI);
final String[] args = new String[] { "-s", "s1=" + Paths.get(Simple.SCENARIOS), "-s", "s2=" + Paths.get(Simple.OTHER_SCENARIOS),
"-r", "s1=" + p, "-r", "typo=" + p, Paths.get(Simple.SIMPLE_VALID).toString() };
@ -272,7 +272,7 @@ public class CommandlineApplicationTest {
}
@Test
public void loadMultipleOrderedScenarios() {
void loadMultipleOrderedScenarios() {
final String s = Paths.get(Simple.REPOSITORY_URI).toString();
final String[] args = new String[] { "-s", Paths.get(Simple.SCENARIOS).toString(), "-s",
Paths.get(Simple.OTHER_SCENARIOS).toString(), "-r", s, "-r", s, Paths.get(Simple.SIMPLE_VALID).toString() };
@ -281,7 +281,7 @@ public class CommandlineApplicationTest {
}
@Test
public void checkUnusedRepository() {
void checkUnusedRepository() {
final Path p = Paths.get(Simple.REPOSITORY_URI);
final String[] args = new String[] { "-s", "s1=" + Paths.get(Simple.SCENARIOS), "-r", "s1=" + p, "-r", "unused=" + p,
Paths.get(Simple.SIMPLE_VALID).toString() };
@ -291,7 +291,7 @@ public class CommandlineApplicationTest {
}
@Test
public void checkDuplicationScenarioDefinition() {
void checkDuplicationScenarioDefinition() {
final Path p = Paths.get(Simple.REPOSITORY_URI);
final String[] args = new String[] { "-s", "s1=" + Paths.get(Simple.SCENARIOS), "-r", "s1=" + p, "-r", "unused=" + p,
Paths.get(Simple.SIMPLE_VALID).toString() };

19
src/test/java/de/kosit/validationtool/cmd/DefaultNamingStrategyTest.java
View file

@ -16,19 +16,20 @@
package de.kosit.validationtool.cmd;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Tests {@link DefaultNamingStrategy}
*
* @author Andreas Penski
*/
public class DefaultNamingStrategyTest {
class DefaultNamingStrategyTest {
@Test
public void testSimple() {
void simple() {
final DefaultNamingStrategy strategy = new DefaultNamingStrategy();
assertThat(strategy.createName("test")).isEqualTo("test-report.xml");
strategy.setPrefix("prefix");
@ -40,7 +41,7 @@ public class DefaultNamingStrategyTest {
}
@Test
public void testDotted() {
void dotted() {
final DefaultNamingStrategy strategy = new DefaultNamingStrategy();
assertThat(strategy.createName("test.xml")).isEqualTo("test-report.xml");
strategy.setPrefix("prefix");
@ -52,7 +53,7 @@ public class DefaultNamingStrategyTest {
}
@Test
public void testDoubleDotted() {
void doubleDotted() {
final DefaultNamingStrategy strategy = new DefaultNamingStrategy();
assertThat(strategy.createName("test.second.xml")).isEqualTo("test.second-report.xml");
strategy.setPrefix("prefix");
@ -64,7 +65,7 @@ public class DefaultNamingStrategyTest {
}
@Test
public void testUnknownExtension() {
void unknownExtension() {
final DefaultNamingStrategy strategy = new DefaultNamingStrategy();
assertThat(strategy.createName("test.ext")).isEqualTo("test.ext-report.xml");
strategy.setPrefix("prefix");
@ -75,8 +76,8 @@ public class DefaultNamingStrategyTest {
assertThat(strategy.createName("test.ext")).isEqualTo("test.ext-postfix.xml");
}
@Test(expected = IllegalArgumentException.class)
public void testEmptyInput() {
new DefaultNamingStrategy().createName(null);
@Test
void emptyInput() {
assertThrows(IllegalArgumentException.class, () -> new DefaultNamingStrategy().createName(null));
}
}

18
src/test/java/de/kosit/validationtool/cmd/ExtractHtmlActionTest.java
View file

@ -22,9 +22,9 @@ import de.kosit.validationtool.impl.Helper.Simple;
import de.kosit.validationtool.impl.TestObjectFactory;
import de.kosit.validationtool.impl.tasks.CheckAction;
import org.apache.commons.io.FileUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.nio.file.Files;
@ -39,25 +39,25 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Andreas Penski
*/
public class ExtractHtmlActionTest {
class ExtractHtmlActionTest {
private ExtractHtmlContentAction action;
private Path tmpDirectory;
@Before
public void setup() throws IOException {
@BeforeEach
void setup() throws IOException {
this.tmpDirectory = Files.createTempDirectory("checktool");
this.action = new ExtractHtmlContentAction(TestObjectFactory.createProcessor(), this.tmpDirectory);
}
@After
public void tearDown() throws IOException {
@AfterEach
void tearDown() throws IOException {
FileUtils.deleteDirectory(this.tmpDirectory.toFile());
}
@Test
public void testSimple() throws IOException {
void simple() throws IOException {
final CheckAction.Bag b = new CheckAction.Bag(InputFactory.read(Simple.SIMPLE_VALID));
assertThat(this.action.isSkipped(b)).isTrue();
b.setReport(Helper.load(Simple.SIMPLE_VALID.toURL()));

18
src/test/java/de/kosit/validationtool/cmd/PrintReportActionTest.java
View file

@ -21,9 +21,9 @@ import de.kosit.validationtool.impl.Helper;
import de.kosit.validationtool.impl.Helper.Simple;
import de.kosit.validationtool.impl.TestObjectFactory;
import de.kosit.validationtool.impl.tasks.CheckAction;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.net.MalformedURLException;
@ -32,23 +32,23 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Andreas Penski
*/
public class PrintReportActionTest {
class PrintReportActionTest {
private PrintReportAction action;
@Before
public void setup() {
@BeforeEach
void setup() {
CommandLine.activate();
this.action = new PrintReportAction(TestObjectFactory.createProcessor());
}
@After
public void tearDown() {
@AfterEach
void tearDown() {
CommandLine.deactivate();
}
@Test
public void testSimpleSerialize() throws MalformedURLException {
void simpleSerialize() throws MalformedURLException {
final CheckAction.Bag b = new CheckAction.Bag(InputFactory.read(Simple.SIMPLE_VALID));
b.setReport(Helper.load(Simple.SIMPLE_VALID.toURL()));
assertThat(this.action.isSkipped(b)).isFalse();

20
src/test/java/de/kosit/validationtool/cmd/SerializeReportActionTest.java
View file

@ -22,9 +22,9 @@ import de.kosit.validationtool.impl.Helper.Simple;
import de.kosit.validationtool.impl.TestObjectFactory;
import de.kosit.validationtool.impl.tasks.CheckAction;
import org.apache.commons.io.FileUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.net.MalformedURLException;
@ -36,26 +36,26 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Andreas Penski
*/
public class SerializeReportActionTest {
class SerializeReportActionTest {
private Path tmpDirectory;
private SerializeReportAction action;
@Before
public void setup() throws IOException {
@BeforeEach
void setup() throws IOException {
this.tmpDirectory = Files.createTempDirectory("checktool");
final DefaultNamingStrategy namingStrategy = new DefaultNamingStrategy();
this.action = new SerializeReportAction(this.tmpDirectory, TestObjectFactory.createProcessor(), namingStrategy);
}
@After
public void tearDown() throws IOException {
@AfterEach
void tearDown() throws IOException {
FileUtils.deleteDirectory(this.tmpDirectory.toFile());
}
@Test
public void testSimpleSerialize() throws MalformedURLException {
void simpleSerialize() throws MalformedURLException {
final CheckAction.Bag b = new CheckAction.Bag(InputFactory.read(Simple.SIMPLE_VALID));
assertThat(this.action.isSkipped(b)).isTrue();
b.setReport(Helper.load(Simple.SIMPLE_VALID.toURL()));
@ -67,7 +67,7 @@ public class SerializeReportActionTest {
// ERPT-83
@Test
public void testName() {
void name() {
final String name = "some.name.with.dots";
final CheckAction.Bag b = new CheckAction.Bag(InputFactory.read("ega".getBytes(), name + ".xml"));
assertThat(b.getName()).isEqualTo(name);

18
src/test/java/de/kosit/validationtool/cmd/SerializeReportInputActionTest.java
View file

@ -20,9 +20,9 @@ import de.kosit.validationtool.api.InputFactory;
import de.kosit.validationtool.impl.ConversionService;
import de.kosit.validationtool.impl.tasks.CheckAction;
import org.apache.commons.io.FileUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.nio.file.Files;
@ -33,25 +33,25 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Andreas Penski
*/
public class SerializeReportInputActionTest {
class SerializeReportInputActionTest {
private Path tmpDirectory;
private SerializeReportInputAction action;
@Before
public void setup() throws IOException {
@BeforeEach
void setup() throws IOException {
this.tmpDirectory = Files.createTempDirectory("validator");
this.action = new SerializeReportInputAction(this.tmpDirectory, new ConversionService());
}
@After
public void tearDown() throws IOException {
@AfterEach
void tearDown() throws IOException {
FileUtils.deleteDirectory(this.tmpDirectory.toFile());
}
@Test
public void testSimpleSerialize() {
void simpleSerialize() {
final CheckAction.Bag b = new CheckAction.Bag(InputFactory.read("someBytes".getBytes(), "someDoc"));
assertThat(this.action.isSkipped(b)).isFalse();
this.action.check(b);

19
src/test/java/de/kosit/validationtool/config/ConfigurationBuilderTest.java
View file

@ -20,15 +20,14 @@ import static de.kosit.validationtool.config.ConfigurationBuilder.report;
import static de.kosit.validationtool.config.ConfigurationBuilder.schematron;
import static de.kosit.validationtool.config.TestConfigurationFactory.createSimpleConfiguration;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertThrows;
import java.net.URI;
import java.time.LocalDate;
import java.util.Date;
import org.junit.Test;
import de.kosit.validationtool.impl.Helper;
import org.junit.jupiter.api.Test;
/**
* Test {@link ConfigurationBuilder}.
@ -40,12 +39,12 @@ public class ConfigurationBuilderTest {
public static final LocalDate EPOCH = LocalDate.of(1970, 1, 1);
@Test
public void testNoConfiguration() {
void noConfiguration() {
assertThrows(IllegalStateException.class, () -> new ConfigurationBuilder().build(Helper.getTestProcessor()));
}
@Test
public void testNoFallback() {
void noFallback() {
final ConfigurationBuilder builder = createSimpleConfiguration();
builder.with((FallbackBuilder) null);
Throwable e = assertThrows(IllegalStateException.class, () -> builder.build(Helper.getTestProcessor()));
@ -53,7 +52,7 @@ public class ConfigurationBuilderTest {
}
@Test
public void testNoSchema() {
void noSchema() {
final ConfigurationBuilder builder = createSimpleConfiguration();
builder.getScenarios().get(0).validate((SchemaBuilder) null);
Throwable e = assertThrows(IllegalStateException.class, () -> builder.build(Helper.getTestProcessor()));
@ -61,7 +60,7 @@ public class ConfigurationBuilderTest {
}
@Test
public void testInvalidSchematron() {
void invalidSchematron() {
final ConfigurationBuilder builder = createSimpleConfiguration();
builder.getScenarios().get(0).validate(schematron("invalid").source(URI.create("DoesNotExist")));
Throwable e = assertThrows(IllegalStateException.class, () -> builder.build(Helper.getTestProcessor()));
@ -69,7 +68,7 @@ public class ConfigurationBuilderTest {
}
@Test
public void testInsufficientSchematron() {
void insufficientSchematron() {
final ConfigurationBuilder builder = createSimpleConfiguration();
builder.getScenarios().get(0).validate(schematron("invalid"));
Throwable e = assertThrows(IllegalStateException.class, () -> builder.build(Helper.getTestProcessor()));
@ -77,7 +76,7 @@ public class ConfigurationBuilderTest {
}
@Test
public void testNoReport() {
void noReport() {
final ConfigurationBuilder builder = createSimpleConfiguration();
builder.getScenarios().get(0).with(report("invalid"));
Throwable e = assertThrows(IllegalStateException.class, () -> builder.build(Helper.getTestProcessor()));
@ -85,7 +84,7 @@ public class ConfigurationBuilderTest {
}
@Test
public void testDate() {
void date() {
assertThat(createSimpleConfiguration().date(EPOCH).build(Helper.getTestProcessor()).getDate()).isEqualTo("1970-01-01");
assertThat(createSimpleConfiguration().date(new Date(EPOCH.toEpochDay())).build(Helper.getTestProcessor()).getDate())
.isEqualTo("1970-01-01");

7
src/test/java/de/kosit/validationtool/config/ConfigurationLoaderTest.java
View file

@ -18,21 +18,20 @@ package de.kosit.validationtool.config;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import de.kosit.validationtool.api.Configuration;
import de.kosit.validationtool.impl.Helper;
import de.kosit.validationtool.impl.ResolvingMode;
import de.kosit.validationtool.impl.xml.RemoteResolvingStrategy;
import de.kosit.validationtool.impl.xml.StrictRelativeResolvingStrategy;
import org.junit.jupiter.api.Test;
/**
* @author Andreas Penski
*/
public class ConfigurationLoaderTest {
class ConfigurationLoaderTest {
@Test
public void testCustomResolvingStrategy() {
void customResolvingStrategy() {
final ConfigurationLoader loader = TestConfigurationFactory.loadSimpleConfiguration();
loader.setResolvingStrategy(new StrictRelativeResolvingStrategy());
loader.setResolvingMode(ResolvingMode.ALLOW_REMOTE);

25
src/test/java/de/kosit/validationtool/config/ScenarioBuilderTest.java
View file

@ -24,8 +24,7 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.text.RandomStringGenerator;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import de.kosit.validationtool.impl.ContentRepository;
import de.kosit.validationtool.impl.Helper.Simple;
import de.kosit.validationtool.impl.Scenario;
@ -40,17 +39,17 @@ import net.sf.saxon.s9api.XPathExecutable;
*
* @author Andreas Penski
*/
public class ScenarioBuilderTest {
class ScenarioBuilderTest {
@Test
public void simpleValid() {
void simpleValid() {
final Result<Scenario, String> result = createScenario().build(Simple.createContentRepository());
assertThat(result.isValid()).isTrue();
assertThat(result.getObject().getConfiguration()).isNotNull();
}
@Test
public void testNoSchema() {
void noSchema() {
final ScenarioBuilder builder = createScenario();
builder.validate((SchemaBuilder) null);
final Result<Scenario, String> result = builder.build(Simple.createContentRepository());
@ -59,7 +58,7 @@ public class ScenarioBuilderTest {
}
@Test
public void testNoMatch() {
void noMatch() {
final ScenarioBuilder builder = createScenario();
builder.match((String) null);
final Result<Scenario, String> result = builder.build(Simple.createContentRepository());
@ -68,7 +67,7 @@ public class ScenarioBuilderTest {
}
@Test
public void testInvalidMatch() {
void invalidMatch() {
final ScenarioBuilder builder = createScenario();
builder.match("/////");
final Result<Scenario, String> result = builder.build(Simple.createContentRepository());
@ -77,7 +76,7 @@ public class ScenarioBuilderTest {
}
@Test
public void testNoAccept() {
void noAccept() {
final ScenarioBuilder builder = createScenario();
builder.acceptWith((String) null);
final Result<Scenario, String> result = builder.build(Simple.createContentRepository());
@ -85,7 +84,7 @@ public class ScenarioBuilderTest {
}
@Test
public void testInvalidAccept() {
void invalidAccept() {
final ScenarioBuilder builder = createScenario();
builder.acceptWith("/////");
final Result<Scenario, String> result = builder.build(Simple.createContentRepository());
@ -94,7 +93,7 @@ public class ScenarioBuilderTest {
}
@Test
public void testCombinedNamespaces() {
void combinedNamespaces() {
final ContentRepository repository = Simple.createContentRepository();
final Map<String, String> ns1 = new HashMap<>();
ns1.put("n1", "http://n1.org");
@ -118,7 +117,7 @@ public class ScenarioBuilderTest {
}
@Test
public void testConfigureWithExecutable() {
void configureWithExecutable() {
final ContentRepository repository = Simple.createContentRepository();
final XPathExecutable match = repository.createXPath("//*", null);
final XPathExecutable accept = repository.createXPath("//*", null);
@ -136,7 +135,7 @@ public class ScenarioBuilderTest {
}
@Test
public void testBasicAttributes() {
void basicAttributes() {
final ContentRepository repository = Simple.createContentRepository();
final String random = getRandomString(5);
final ScenarioBuilder builder = createScenario();
@ -150,7 +149,7 @@ public class ScenarioBuilderTest {
}
@Test
public void testNoBasicAttributes() {
void noBasicAttributes() {
final ContentRepository repository = Simple.createContentRepository();
final ScenarioBuilder builder = createScenario();
builder.name(null);

21
src/test/java/de/kosit/validationtool/config/SchemaBuilderTest.java
View file

@ -24,8 +24,7 @@ import java.nio.file.Paths;
import javax.xml.validation.Schema;
import org.apache.commons.lang3.tuple.Pair;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import de.kosit.validationtool.impl.ContentRepository;
import de.kosit.validationtool.impl.Helper.Simple;
import de.kosit.validationtool.impl.model.Result;
@ -37,10 +36,10 @@ import de.kosit.validationtool.model.scenarios.ValidateWithXmlSchema;
*
* @author Andreas Penski
*/
public class SchemaBuilderTest {
class SchemaBuilderTest {
@Test
public void testBuildSchema() {
void buildSchema() {
final SchemaBuilder builder = schema(Simple.SCHEMA);
final Result<Pair<ValidateWithXmlSchema, Schema>, String> result = builder.build(Simple.createContentRepository());
assertThat(result).isNotNull();
@ -48,7 +47,7 @@ public class SchemaBuilderTest {
}
@Test
public void testNoConfiguration() {
void noConfiguration() {
final SchemaBuilder builder = schema("no-config");
final Result<Pair<ValidateWithXmlSchema, Schema>, String> result = builder.build(Simple.createContentRepository());
assertThat(result).isNotNull();
@ -56,7 +55,7 @@ public class SchemaBuilderTest {
}
@Test
public void testBuildNamedSchema() {
void buildNamedSchema() {
final SchemaBuilder builder = schema("myname").schemaLocation(Simple.SCHEMA);
final Result<Pair<ValidateWithXmlSchema, Schema>, String> result = builder.build(Simple.createContentRepository());
assertThat(result).isNotNull();
@ -66,7 +65,7 @@ public class SchemaBuilderTest {
}
@Test
public void testInvalidSchema() {
void invalidSchema() {
final SchemaBuilder builder = schema("myname").schemaLocation(Simple.SCHEMA_INVALID);
final Result<Pair<ValidateWithXmlSchema, Schema>, String> result = builder.build(Simple.createContentRepository());
assertThat(result).isNotNull();
@ -74,7 +73,7 @@ public class SchemaBuilderTest {
}
@Test
public void testNonExisting() {
void nonExisting() {
final SchemaBuilder builder = schema("myname").schemaLocation(Simple.REPOSITORY_URI.resolve("doesNotExist.xsd"));
final Result<Pair<ValidateWithXmlSchema, Schema>, String> result = builder.build(Simple.createContentRepository());
assertThat(result).isNotNull();
@ -82,7 +81,7 @@ public class SchemaBuilderTest {
}
@Test
public void testPath() {
void path() {
final SchemaBuilder builder = schema("myname").schemaLocation(Paths.get(Simple.SCHEMA));
final Result<Pair<ValidateWithXmlSchema, Schema>, String> result = builder.build(Simple.createContentRepository());
assertThat(result).isNotNull();
@ -90,7 +89,7 @@ public class SchemaBuilderTest {
}
@Test
public void testStringLocation() {
void stringLocation() {
final SchemaBuilder builder = schema("myname").schemaLocation("simple.xsd");
final Result<Pair<ValidateWithXmlSchema, Schema>, String> result = builder.build(Simple.createContentRepository());
assertThat(result).isNotNull();
@ -98,7 +97,7 @@ public class SchemaBuilderTest {
}
@Test
public void testPrecompiled() {
void precompiled() {
final ContentRepository repository = Simple.createContentRepository();
final Schema schema = repository.createSchema(Simple.SCHEMA);

11
src/test/java/de/kosit/validationtool/config/SimpleConfigTest.java
View file

@ -19,25 +19,24 @@ package de.kosit.validationtool.config;
import static de.kosit.validationtool.config.TestConfigurationFactory.createSimpleConfiguration;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import de.kosit.validationtool.api.Configuration;
import de.kosit.validationtool.api.InputFactory;
import de.kosit.validationtool.api.Result;
import de.kosit.validationtool.impl.DefaultCheck;
import de.kosit.validationtool.impl.Helper;
import de.kosit.validationtool.impl.Helper.Simple;
import org.junit.jupiter.api.Test;
/**
* @author Andreas Penski
*/
public class SimpleConfigTest {
class SimpleConfigTest {
@Test
public void testSimpleWithApi() {
//@formatter:off
void simpleWithApi() {
// @formatter:off
final Configuration config = createSimpleConfiguration().build(Helper.getTestProcessor());
//@formatter:on
// @formatter:on
final DefaultCheck check = new DefaultCheck(config);
final Result result = check.checkInput(InputFactory.read(Simple.SIMPLE_VALID));
assertThat(result).isNotNull();

3
src/test/java/de/kosit/validationtool/config/TestConfigurationFactory.java
View file

@ -51,4 +51,7 @@ public class TestConfigurationFactory {
.declareNamespace("rpt", "http://validator.kosit.de/test-report")
.declareNamespace("test", "http://validator.kosit.de/test-sample").match("/test:simple");
}
private TestConfigurationFactory() {
}
}

19
src/test/java/de/kosit/validationtool/config/XPathBuilderTest.java
View file

@ -23,8 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.text.RandomStringGenerator;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import de.kosit.validationtool.impl.ContentRepository;
import de.kosit.validationtool.impl.Helper.Simple;
import de.kosit.validationtool.impl.model.Result;
@ -36,10 +35,10 @@ import net.sf.saxon.s9api.XPathExecutable;
*
* @author Andreas Penski
*/
public class XPathBuilderTest {
class XPathBuilderTest {
@Test
public void testSimpleString() {
void simpleString() {
final String name = getRandomString(5);
final XPathBuilder b = new XPathBuilder(name);
b.setXpath("//*");
@ -53,7 +52,7 @@ public class XPathBuilderTest {
}
@Test
public void testStringWithNamespace() {
void stringWithNamespace() {
final String name = getRandomString(5);
final XPathBuilder b = new XPathBuilder(name);
final Map<String, String> ns = new HashMap<>();
@ -68,7 +67,7 @@ public class XPathBuilderTest {
}
@Test
public void testStringWithUnknownNamespace() {
void stringWithUnknownNamespace() {
final String name = getRandomString(5);
final XPathBuilder b = new XPathBuilder(name);
final Map<String, String> ns = new HashMap<>();
@ -81,7 +80,7 @@ public class XPathBuilderTest {
}
@Test
public void testExecutable() {
void executable() {
final String name = getRandomString(5);
final ContentRepository repository = Simple.createContentRepository();
final XPathExecutable xpath = repository.createXPath("//*", Collections.emptyMap());
@ -95,7 +94,7 @@ public class XPathBuilderTest {
}
@Test
public void testExecutableWithNamespace() {
void executableWithNamespace() {
final String name = getRandomString(5);
final ContentRepository repository = Simple.createContentRepository();
final Map<String, String> ns = new HashMap<>();
@ -112,7 +111,7 @@ public class XPathBuilderTest {
}
@Test
public void testNoName() {
void noName() {
final XPathBuilder b = new XPathBuilder(null);
b.setXpath("//*");
final Result<XPathExecutable, String> result = b.build(Simple.createContentRepository());
@ -122,7 +121,7 @@ public class XPathBuilderTest {
}
@Test
public void testNoConfig() {
void noConfig() {
final String name = getRandomString(5);
final XPathBuilder b = new XPathBuilder(name);
final Result<XPathExecutable, String> result = b.build(Simple.createContentRepository());

5
src/test/java/de/kosit/validationtool/daemon/BaseIT.java
View file

@ -16,9 +16,8 @@
package de.kosit.validationtool.daemon;
import org.junit.Before;
import io.restassured.RestAssured;
import org.junit.jupiter.api.BeforeEach;
/**
* Base for integration tests.
@ -27,7 +26,7 @@ import io.restassured.RestAssured;
*/
public abstract class BaseIT {
@Before
@BeforeEach
public void setup() {
final String port = System.getProperty("daemon.port");
if (port != null) {

17
src/test/java/de/kosit/validationtool/daemon/CheckHandlerIT.java
View file

@ -25,8 +25,7 @@ import java.io.InputStream;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpStatus;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import de.kosit.validationtool.impl.Helper;
import de.kosit.validationtool.impl.Helper.Simple;
@ -40,24 +39,24 @@ import io.restassured.specification.MultiPartSpecification;
* @author Roula Antoun
* @author Andreas Penski
*/
public class CheckHandlerIT extends BaseIT {
class CheckHandlerIT extends BaseIT {
private static final String APPLICATION_XML = "application/xml";
@Test
public void simpleTest() throws IOException {
void simpleTest() throws IOException {
try ( final InputStream io = Simple.SIMPLE_VALID.toURL().openStream() ) {
given().contentType(ContentType.XML).body(toContent(io)).when().post("/").then().statusCode(SC_OK);
}
}
@Test
public void noInputTest() {
void noInputTest() {
given().body("").contentType(APPLICATION_XML).when().post("/").then().statusCode(HttpStatus.SC_BAD_REQUEST);
}
@Test
public void testUnknown() throws IOException {
void unknown() throws IOException {
try ( final InputStream io = Simple.UNKNOWN.toURL().openStream() ) {
given().contentType(APPLICATION_XML).body(toContent(io)).when().post("/").then().statusCode(SC_NOT_ACCEPTABLE);
}
@ -68,14 +67,14 @@ public class CheckHandlerIT extends BaseIT {
}
@Test
public void xmlResultTest() throws IOException {
void xmlResultTest() throws IOException {
try ( final InputStream io = Simple.SIMPLE_VALID.toURL().openStream() ) {
given().body(toContent(io)).when().post("/").then().contentType(APPLICATION_XML).and().statusCode(SC_OK);
}
}
@Test
public void testMultipart() throws IOException {
void multipart() throws IOException {
try ( final InputStream io = Simple.SIMPLE_VALID.toURL().openStream() ) {
final MultiPartSpecification spec = new MultiPartSpecBuilder(io).fileName("file").controlName("file").build();
given().multiPart(spec).when().post("/").then().statusCode(HttpStatus.SC_BAD_REQUEST);
@ -83,7 +82,7 @@ public class CheckHandlerIT extends BaseIT {
}
@Test
public void testLarge() throws IOException {
void large() throws IOException {
try ( final InputStream io = Helper.LARGE_XML.toURL().openStream() ) {
given().contentType(APPLICATION_XML).body(toContent(io)).when().post("/").then().statusCode(SC_NOT_ACCEPTABLE);
}

7
src/test/java/de/kosit/validationtool/daemon/ConfigHandlerIT.java
View file

@ -18,19 +18,18 @@ package de.kosit.validationtool.daemon;
import static io.restassured.RestAssured.given;
import org.junit.Test;
import io.restassured.http.ContentType;
import org.junit.jupiter.api.Test;
/**
* Integration test for the {@link ConfigHandler}.
*
* @author Andreas Penski
*/
public class ConfigHandlerIT extends BaseIT {
class ConfigHandlerIT extends BaseIT {
@Test
public void checkHealth() {
void checkHealth() {
given().when().get("/server/config").then().statusCode(200).and().contentType(ContentType.XML);
}
}

9
src/test/java/de/kosit/validationtool/daemon/ConfigHandlerTest.java
View file

@ -29,8 +29,7 @@ import static org.mockito.Mockito.when;
import java.io.IOException;
import java.io.OutputStream;
import java.util.Collections;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import com.sun.net.httpserver.Headers;
@ -44,10 +43,10 @@ import de.kosit.validationtool.impl.Helper;
/**
* @author Andreas Penski
*/
public class ConfigHandlerTest {
class ConfigHandlerTest {
@Test
public void testApiConfiguration() throws IOException {
void apiConfiguration() throws IOException {
final HttpExchange exchange = mock(HttpExchange.class);
final Headers headers = mock(Headers.class);
final OutputStream stream = mock(OutputStream.class);
@ -61,7 +60,7 @@ public class ConfigHandlerTest {
}
@Test
public void testError() throws IOException {
void error() throws IOException {
final HttpExchange exchange = mock(HttpExchange.class);
final Headers headers = mock(Headers.class);
final OutputStream stream = mock(OutputStream.class);

7
src/test/java/de/kosit/validationtool/daemon/GuiHandlerIT.java
View file

@ -18,14 +18,13 @@ package de.kosit.validationtool.daemon;
import static io.restassured.RestAssured.given;
import org.junit.Test;
import io.restassured.http.ContentType;
import org.junit.jupiter.api.Test;
public class GuiHandlerIT extends BaseIT {
class GuiHandlerIT extends BaseIT {
@Test
public void checkGui() {
void checkGui() {
given().when().get("/").then().statusCode(200).and().contentType(ContentType.HTML);
given().when().get("/index.html").then().statusCode(200).and().contentType("text/html");
given().when().get("/unknown.md").then().statusCode(404).and().contentType(ContentType.TEXT);

7
src/test/java/de/kosit/validationtool/daemon/HealthHandlerIT.java
View file

@ -18,19 +18,18 @@ package de.kosit.validationtool.daemon;
import static io.restassured.RestAssured.given;
import org.junit.Test;
import io.restassured.http.ContentType;
import org.junit.jupiter.api.Test;
/**
* Checks the health endpoint.
*
* @author Andreas Penski
*/
public class HealthHandlerIT extends BaseIT {
class HealthHandlerIT extends BaseIT {
@Test
public void checkHealth() {
void checkHealth() {
given().when().get("/server/health").then().statusCode(200).and().contentType(ContentType.XML);
}
}

29
src/test/java/de/kosit/validationtool/impl/ContentRepositoryTest.java
View file

@ -17,7 +17,7 @@
package de.kosit.validationtool.impl;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertThrows;
import java.net.MalformedURLException;
import java.net.URI;
@ -28,9 +28,8 @@ import java.util.Map;
import javax.xml.validation.Schema;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import de.kosit.validationtool.impl.Helper.Simple;
import net.sf.saxon.s9api.XPathExecutable;
@ -41,39 +40,39 @@ import net.sf.saxon.s9api.XsltExecutable;
*
* @author Andreas Penski
*/
public class ContentRepositoryTest {
class ContentRepositoryTest {
private ContentRepository repository;
@Before
public void setup() {
@BeforeEach
void setup() {
this.repository = Simple.createContentRepository();
}
@Test
public void testCreateSchema() throws MalformedURLException {
void createSchema() throws MalformedURLException {
final Schema schema = this.repository.createSchema(Helper.ASSERTION_SCHEMA.toURL());
assertThat(schema).isNotNull();
}
@Test
public void testCreateSchemaNotExisting() {
void createSchemaNotExisting() {
assertThrows(IllegalStateException.class, () -> this.repository.createSchema(Simple.NOT_EXISTING.toURL()));
}
@Test
public void testLoadXSLT() {
void loadXSLT() {
final XsltExecutable executable = this.repository.loadXsltScript(Simple.REPORT_XSL);
assertThat(executable).isNotNull();
}
@Test
public void testLoadXSLTNotExisting() {
void loadXSLTNotExisting() {
assertThrows(IllegalStateException.class, () -> this.repository.loadXsltScript(Simple.NOT_EXISTING));
}
@Test
public void testXpathCreation() {
void xpathCreation() {
XPathExecutable xPath = this.repository.createXPath("//html", null);
assertThat(xPath).isNotNull();
xPath = this.repository.createXPath("//html", Collections.emptyMap());
@ -85,17 +84,17 @@ public class ContentRepositoryTest {
}
@Test
public void testXpathCreationWithoutNamespace() {
void xpathCreationWithoutNamespace() {
assertThrows(IllegalStateException.class, () -> this.repository.createXPath("//html:html", null));
}
@Test
public void testIllegalXpath() {
void illegalXpath() {
assertThrows(IllegalStateException.class, () -> this.repository.createXPath("kein Xpath Ausdruck", null));
}
@Test
public void loadFromJar() throws URISyntaxException {
void loadFromJar() throws URISyntaxException {
assert Helper.JAR_REPOSITORY != null;
this.repository = new ContentRepository(Helper.getTestProcessor(), ResolvingMode.STRICT_RELATIVE.getStrategy(),
Helper.JAR_REPOSITORY.toURI());

31
src/test/java/de/kosit/validationtool/impl/ConversionServiceTest.java
View file

@ -17,14 +17,13 @@
package de.kosit.validationtool.impl;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.Serializable;
import java.net.URL;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import de.kosit.validationtool.impl.Helper.Invalid;
import de.kosit.validationtool.impl.Helper.Simple;
import de.kosit.validationtool.model.scenarios.Scenarios;
@ -34,7 +33,7 @@ import de.kosit.validationtool.model.scenarios.Scenarios;
*
* @author apenski
*/
public class ConversionServiceTest {
class ConversionServiceTest {
private static final URL SCHEMA = ConversionServiceTest.class.getResource("/xsd/scenarios.xsd");
@ -42,19 +41,19 @@ public class ConversionServiceTest {
private ContentRepository repository;
@Before
public void setup() {
@BeforeEach
void setup() {
this.service = new ConversionService();
this.repository = Simple.createContentRepository();
}
@Test
public void testMarshalNull() {
void marshalNull() {
assertThrows(ConversionService.ConversionException.class, () -> this.service.writeXml(null));
}
@Test
public void testMarshalUnknown() {
void marshalUnknown() {
assertThrows(ConversionService.ConversionException.class, () -> this.service.writeXml(new Serializable() {
private static final long serialVersionUID = 8745690876369610705L;
@ -62,43 +61,43 @@ public class ConversionServiceTest {
}
@Test
public void testUnmarshal() {
void unmarshal() {
final Scenarios s = this.service.readXml(Simple.SCENARIOS, Scenarios.class);
assertThat(s).isNotNull();
assertThat(s.getName()).isEqualToIgnoringCase("HTML-TestSuite");
}
@Test
public void testUnmarshalWithSchema() {
void unmarshalWithSchema() {
final Scenarios s = this.service.readXml(Simple.SCENARIOS, Scenarios.class, this.repository.createSchema(SCHEMA));
assertThat(s).isNotNull();
assertThat(s.getName()).isEqualToIgnoringCase("HTML-TestSuite");
}
@Test
public void testUnmarshalInvalidXml() {
void unmarshalInvalidXml() {
assertThrows(ConversionService.ConversionException.class,
() -> this.service.readXml(Invalid.SCENARIOS, Scenarios.class, this.repository.createSchema(SCHEMA)));
}
@Test
public void testUnmarshalIllFormed() {
void unmarshalIllFormed() {
assertThrows(ConversionService.ConversionException.class,
() -> this.service.readXml(Invalid.SCENARIOS_ILL_FORMED, Scenarios.class, this.repository.createSchema(SCHEMA)));
}
@Test
public void testUnmarshalEmpty() {
void unmarshalEmpty() {
assertThrows(ConversionService.ConversionException.class, () -> this.service.readXml(null, Scenarios.class));
}
@Test
public void testUnmarshalUnknownType() {
void unmarshalUnknownType() {
assertThrows(ConversionService.ConversionException.class, () -> this.service.readXml(Simple.SCENARIOS, ConversionService.class));
}
@Test
public void testUnmarshalWithoutType() {
void unmarshalWithoutType() {
assertThrows(ConversionService.ConversionException.class, () -> this.service.readXml(Simple.SCENARIOS, null));
}

38
src/test/java/de/kosit/validationtool/impl/DefaultCheckTest.java
View file

@ -23,8 +23,8 @@ import de.kosit.validationtool.api.InputFactory;
import de.kosit.validationtool.api.Result;
import de.kosit.validationtool.impl.Helper.Simple;
import net.sf.saxon.s9api.XdmNode;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import javax.xml.transform.stream.StreamSource;
@ -54,8 +54,8 @@ public class DefaultCheckTest {
private DefaultCheck jarScenarioCheck;
@Before
public void setup() throws URISyntaxException {
@BeforeEach
void setup() throws URISyntaxException {
final Configuration validConfig = Configuration.load(Simple.SCENARIOS, Simple.REPOSITORY_URI).build(Helper.getTestProcessor());
this.validCheck = new DefaultCheck(validConfig);
@ -72,7 +72,7 @@ public class DefaultCheckTest {
}
@Test
public void testHappyCase() {
void happyCase() {
final Result doc = this.validCheck.checkInput(read(SIMPLE_VALID));
assertThat(doc).isNotNull();
assertThat(doc.getReport()).isNotNull();
@ -90,7 +90,7 @@ public class DefaultCheckTest {
}
@Test
public void testJarCase() {
void jarCase() {
final Result doc = this.jarScenarioCheck.checkInput(read(SIMPLE_VALID));
assertThat(doc).isNotNull();
assertThat(doc.getReport()).isNotNull();
@ -101,7 +101,7 @@ public class DefaultCheckTest {
}
@Test
public void testWithoutAcceptMatch() {
void withoutAcceptMatch() {
final Result doc = this.validCheck.checkInput(read(Simple.FOO));
assertThat(doc).isNotNull();
assertThat(doc.getReport()).isNotNull();
@ -110,27 +110,27 @@ public class DefaultCheckTest {
}
@Test
public void testHappyCaseDocument() {
void happyCaseDocument() {
final Document doc = this.validCheck.check(read(SIMPLE_VALID));
assertThat(doc).isNotNull();
}
@Test
public void testMultipleCase() {
void multipleCase() {
final List<Input> input = IntStream.range(0, MULTI_COUNT).mapToObj(i -> read(SIMPLE_VALID)).collect(Collectors.toList());
final List<Result> docs = this.validCheck.checkInput(input);
assertThat(docs).hasSize(MULTI_COUNT);
}
@Test
public void testMultipleCaseDocument() {
void multipleCaseDocument() {
final List<Input> input = IntStream.range(0, MULTI_COUNT).mapToObj(i -> read(SIMPLE_VALID)).collect(Collectors.toList());
final List<Document> docs = this.validCheck.check(input);
assertThat(docs).hasSize(MULTI_COUNT);
}
@Test
public void testExtractHtml() {
void extractHtml() {
final DefaultResult doc = (DefaultResult) this.validCheck.checkInput(read(SIMPLE_VALID));
assertThat(doc).isNotNull();
assertThat(doc.getReport()).isNotNull();
@ -141,7 +141,7 @@ public class DefaultCheckTest {
}
@Test
public void testGarbage() {
void garbage() {
final Result result = this.validCheck.checkInput(read(GARBAGE));
assertThat(result).isNotNull();
assertThat(result.isWellFormed()).isFalse();
@ -150,7 +150,7 @@ public class DefaultCheckTest {
}
@Test
public void testNoScenario() {
void noScenario() {
final Result result = this.validCheck.checkInput(read(UNKNOWN));
assertThat(result).isNotNull();
assertThat(result.isWellFormed()).isTrue();
@ -161,7 +161,7 @@ public class DefaultCheckTest {
}
@Test
public void testNotWellFormed() {
void notWellFormed() {
final Result result = this.validCheck.checkInput(read(NOT_WELL_FORMED));
assertThat(result).isNotNull();
assertThat(result.isWellFormed()).isFalse();
@ -173,7 +173,7 @@ public class DefaultCheckTest {
}
@Test
public void testRejectAcceptMatch() {
void rejectAcceptMatch() {
final Result result = this.validCheck.checkInput(read(REJECTED));
assertThat(result).isNotNull();
assertThat(result.isWellFormed()).isTrue();
@ -186,7 +186,7 @@ public class DefaultCheckTest {
}
@Test
public void testSchematronFailed() {
void schematronFailed() {
final Result result = this.validCheck.checkInput(read(SCHEMATRON_INVALID));
assertThat(result).isNotNull();
assertThat(result.isWellFormed()).isTrue();
@ -204,7 +204,7 @@ public class DefaultCheckTest {
}
@Test
public void testSchematronFailedWithoutAcceptMatch() {
void schematronFailedWithoutAcceptMatch() {
final Result result = this.validCheck.checkInput(read(FOO_SCHEMATRON_INVALID));
assertThat(result).isNotNull();
assertThat(result.isWellFormed()).isTrue();
@ -220,7 +220,7 @@ public class DefaultCheckTest {
}
@Test
public void testSchematronExecutionError() {
void schematronExecutionError() {
final Result result = this.errorCheck.checkInput(read(SIMPLE_VALID));
assertThat(result).isNotNull();
assertThat(result.isProcessingSuccessful()).isFalse();
@ -233,7 +233,7 @@ public class DefaultCheckTest {
}
@Test
public void testXdmNode() throws Exception {
void xdmNode() throws Exception {
XdmNode node = TestObjectFactory.createProcessor().newDocumentBuilder().build(new StreamSource(SIMPLE_VALID.toASCIIString()));
Input domInput = InputFactory.read(node, "node test");
Result result = this.validCheck.checkInput(domInput);

16
src/test/java/de/kosit/validationtool/impl/Helper.java
View file

@ -21,6 +21,7 @@ import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
import de.kosit.validationtool.impl.model.Result;
import de.kosit.validationtool.impl.tasks.DocumentParseAction;
import de.kosit.validationtool.impl.xml.ProcessorProvider;
import de.kosit.validationtool.model.reportInput.ObjectFactory;
import de.kosit.validationtool.model.reportInput.XMLSyntaxError;
import net.sf.saxon.s9api.Processor;
import net.sf.saxon.s9api.SaxonApiException;
@ -91,6 +92,9 @@ public class Helper {
public static URI getSchemaLocation() {
return SCHEMA;
}
private Simple() {
}
}
public static class Invalid {
@ -101,6 +105,9 @@ public class Helper {
public static final URI SCENARIOS_ILL_FORMED = ROOT.resolve("scenarios-illformed.xml");
private Invalid() {
}
}
public static class Resolving {
@ -110,6 +117,9 @@ public class Helper {
public static final URI SCHEMA_WITH_REMOTE_REFERENCE = ROOT.resolve("withRemote.xsd");
public static final URI SCHEMA_WITH_REFERENCE = ROOT.resolve("main.xsd");
private Resolving() {
}
}
public static final URI MODEL_ROOT = Paths.get("src/main/model").toUri();
@ -144,8 +154,7 @@ public class Helper {
public static <T> T load(final URL url, final Class<T> type) throws URISyntaxException {
final ConversionService c = new ConversionService();
c.initialize(de.kosit.validationtool.model.reportInput.ObjectFactory.class.getPackage(),
de.kosit.validationtool.cmd.assertions.ObjectFactory.class.getPackage(),
c.initialize(ObjectFactory.class.getPackage(), de.kosit.validationtool.cmd.assertions.ObjectFactory.class.getPackage(),
de.kosit.validationtool.model.scenarios.ObjectFactory.class.getPackage());
return c.readXml(url.toURI(), type);
}
@ -177,4 +186,7 @@ public class Helper {
public static Processor createProcessor() {
return ProcessorProvider.getProcessor();
}
private Helper() {
}
}

17
src/test/java/de/kosit/validationtool/impl/RelativeUriResolverTest.java
View file

@ -17,7 +17,7 @@
package de.kosit.validationtool.impl;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertThrows;
import java.net.URI;
import java.net.URISyntaxException;
@ -28,16 +28,15 @@ import javax.xml.transform.Source;
import javax.xml.transform.TransformerException;
import javax.xml.transform.URIResolver;
import org.junit.Test;
import de.kosit.validationtool.impl.xml.RelativeUriResolver;
import org.junit.jupiter.api.Test;
/**
* Testet den Uri-Resolver der relative auflösen soll
*
* @author Andreas Penski
*/
public class RelativeUriResolverTest {
class RelativeUriResolverTest {
private static final URI BASE;
@ -52,23 +51,23 @@ public class RelativeUriResolverTest {
private URIResolver resolver = new RelativeUriResolver(BASE);
@Test
public void testSuccess() throws TransformerException {
void success() throws TransformerException {
final Source resource = this.resolver.resolve("ubl-0001.xml", BASE.toASCIIString());
assertThat(resource).isNotNull();
}
@Test
public void testNotExisting() {
void notExisting() {
assertThrows(TransformerException.class, () -> this.resolver.resolve("ubl-0001", BASE.toASCIIString()));
}
@Test
public void testOutOfPath() {
void outOfPath() {
assertThrows(TransformerException.class, () -> this.resolver.resolve("../results/report.xml", BASE.toASCIIString()));
}
@Test
public void testClasspathLocal() throws URISyntaxException, TransformerException {
void classpathLocal() throws URISyntaxException, TransformerException {
this.resolver = new RelativeUriResolver(
Objects.requireNonNull(RelativeUriResolver.class.getClassLoader().getResource("loading")).toURI());
final URL moz = RelativeUriResolverTest.class.getClassLoader().getResource("loading/main.xsd");
@ -78,7 +77,7 @@ public class RelativeUriResolverTest {
}
@Test
public void testClasspathJAR() throws URISyntaxException, TransformerException {
void classpathJAR() throws URISyntaxException, TransformerException {
this.resolver = new RelativeUriResolver(
Objects.requireNonNull(RelativeUriResolver.class.getClassLoader().getResource("packaged")).toURI());
final URL moz = RelativeUriResolverTest.class.getClassLoader().getResource("packaged/main.xsd");

23
src/test/java/de/kosit/validationtool/impl/ScenarioRepositoryTest.java
View file

@ -18,16 +18,15 @@ package de.kosit.validationtool.impl;
import static de.kosit.validationtool.api.InputFactory.read;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.IOException;
import java.net.URI;
import java.util.ArrayList;
import java.util.HashMap;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import de.kosit.validationtool.config.TestConfiguration;
import de.kosit.validationtool.impl.Helper.Simple;
import de.kosit.validationtool.impl.model.Result;
@ -42,14 +41,14 @@ import net.sf.saxon.s9api.XdmNode;
* @author Andreas Penski
*/
public class ScenarioRepositoryTest {
class ScenarioRepositoryTest {
private ScenarioRepository repository;
private TestConfiguration configInstance;
@Before
public void setup() {
@BeforeEach
void setup() {
this.configInstance = new TestConfiguration();
this.configInstance
.setContentRepository(new ContentRepository(Helper.getTestProcessor(), ResolvingMode.STRICT_RELATIVE.getStrategy(), null));
@ -67,14 +66,14 @@ public class ScenarioRepositoryTest {
}
@Test
public void testHappyCase() throws Exception {
void happyCase() throws Exception {
final Result<Scenario, String> scenario = this.repository.selectScenario(load(Simple.SCENARIOS));
assertThat(scenario).isNotNull();
assertThat(scenario.isValid()).isTrue();
}
@Test
public void testNonMatch() throws Exception {
void nonMatch() throws Exception {
this.configInstance.setScenarios(new ArrayList<>());
final Scenario fallback = createFallback();
this.configInstance.setFallbackScenario(fallback);
@ -94,7 +93,7 @@ public class ScenarioRepositoryTest {
}
@Test
public void testMultiMatch() throws Exception {
void multiMatch() throws Exception {
this.configInstance.getScenarios().add(createScenario());
this.configInstance.setFallbackScenario(createFallback());
final Result<Scenario, String> scenario = this.repository.selectScenario(load(Simple.SCENARIOS));
@ -104,12 +103,12 @@ public class ScenarioRepositoryTest {
}
@Test
public void testNoConfiguration() {
void noConfiguration() {
assertThrows(IllegalArgumentException.class, () -> this.repository = new ScenarioRepository());
}
@Test
public void testFallbackOnMultipleConfigurations() {
void fallbackOnMultipleConfigurations() {
final TestConfiguration first = this.configInstance;
first.setFallbackScenario(createFallback());
setup();// create new one;

19
src/test/java/de/kosit/validationtool/impl/SimpleScenarioCheckTest.java
View file

@ -20,9 +20,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.net.MalformedURLException;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import de.kosit.validationtool.api.AcceptRecommendation;
import de.kosit.validationtool.api.Configuration;
import de.kosit.validationtool.api.InputFactory;
@ -34,25 +33,25 @@ import de.kosit.validationtool.impl.Helper.Simple;
*
* @author Andreas Penski
*/
public class SimpleScenarioCheckTest {
class SimpleScenarioCheckTest {
private DefaultCheck implementation;
@Before
public void setup() {
@BeforeEach
void setup() {
final Configuration d = Configuration.load(Simple.SCENARIOS, Simple.REPOSITORY_URI).build(Helper.getTestProcessor());
this.implementation = new DefaultCheck(d);
}
@Test
public void testSimple() throws MalformedURLException {
void simple() throws MalformedURLException {
final Result result = this.implementation.checkInput(InputFactory.read(Simple.SIMPLE_VALID.toURL()));
assertThat(result).isNotNull();
assertThat(result.getAcceptRecommendation()).isEqualTo(AcceptRecommendation.ACCEPTABLE);
}
@Test
public void testInvalid() throws MalformedURLException {
void invalid() throws MalformedURLException {
final Result result = this.implementation.checkInput(InputFactory.read(Simple.SCHEMA_INVALID.toURL()));
assertThat(result).isNotNull();
assertThat(result.getAcceptRecommendation()).isEqualTo(AcceptRecommendation.REJECT);
@ -60,7 +59,7 @@ public class SimpleScenarioCheckTest {
}
@Test
public void testUnknown() throws MalformedURLException {
void unknown() throws MalformedURLException {
final Result result = this.implementation.checkInput(InputFactory.read(Simple.UNKNOWN.toURL()));
assertThat(result).isNotNull();
assertThat(result.isProcessingSuccessful()).isTrue();
@ -70,7 +69,7 @@ public class SimpleScenarioCheckTest {
}
@Test
public void testWithoutAcceptMatch() throws MalformedURLException {
void withoutAcceptMatch() throws MalformedURLException {
final Result result = this.implementation.checkInput(InputFactory.read(Simple.FOO.toURL()));
assertThat(result).isNotNull();
assertThat(result.getAcceptRecommendation()).isEqualTo(AcceptRecommendation.ACCEPTABLE);

3
src/test/java/de/kosit/validationtool/impl/TestObjectFactory.java
View file

@ -31,4 +31,7 @@ public class TestObjectFactory {
}
return processor;
}
private TestObjectFactory() {
}
}

34
src/test/java/de/kosit/validationtool/impl/VersioningTest.java
View file

@ -17,21 +17,21 @@
package de.kosit.validationtool.impl;
import de.kosit.validationtool.model.scenarios.Scenarios;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.net.URISyntaxException;
import java.net.URL;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Testet die Versionierung von Scenario-Dateien aka Konfigurationsdaten.
*
* @author Andreas Penski
*/
public class VersioningTest {
class VersioningTest {
private static final URL BASE = VersioningTest.class.getResource("/examples/versioning/scenarios-base.xml");
@ -43,38 +43,36 @@ public class VersioningTest {
private ConversionService service;
@Before
public void setup() {
@BeforeEach
void setup() {
this.service = new ConversionService();
}
@Test
public void testBase() throws URISyntaxException {
void base() throws URISyntaxException {
assert BASE != null;
final Scenarios result = this.service.readXml(BASE.toURI(), Scenarios.class, SchemaProvider.getScenarioSchema());
assertThat(result).isNotNull();
}
@Test
public void testFrameworkIncrement() throws URISyntaxException {
void frameworkIncrement() throws URISyntaxException {
assert INCREMENT != null;
final Scenarios result = this.service.readXml(INCREMENT.toURI(), Scenarios.class, SchemaProvider.getScenarioSchema());
assertThat(result).isNotNull();
}
@Test
public void testNewFeature() {
assertThrows(ConversionService.ConversionException.class, () -> {
assert NEW_FEATURE != null;
this.service.readXml(NEW_FEATURE.toURI(), Scenarios.class, SchemaProvider.getScenarioSchema());
});
void newFeature() {
assert NEW_FEATURE != null;
assertThrows(ConversionService.ConversionException.class,
() -> this.service.readXml(NEW_FEATURE.toURI(), Scenarios.class, SchemaProvider.getScenarioSchema()));
}
@Test
public void testNewVersion() {
assertThrows(ConversionService.ConversionException.class, () -> {
assert NEW_VERSION != null;
this.service.readXml(NEW_VERSION.toURI(), Scenarios.class, SchemaProvider.getScenarioSchema());
});
void newVersion() {
assert NEW_VERSION != null;
assertThrows(ConversionService.ConversionException.class,
() -> this.service.readXml(NEW_VERSION.toURI(), Scenarios.class, SchemaProvider.getScenarioSchema()));
}
}

6
src/test/java/de/kosit/validationtool/impl/input/StreamHelperTest.java
View file

@ -17,7 +17,7 @@
package de.kosit.validationtool.impl.input;
import org.apache.commons.io.IOUtils;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Andreas Penski
*/
public class StreamHelperTest {
class StreamHelperTest {
/**
* Simulates a stream that is return 0 for {@link InputStream#available()} even though content is supplied.
@ -49,7 +49,7 @@ public class StreamHelperTest {
}
@Test
public void testLazyStream() throws IOException {
void lazyStream() throws IOException {
final String myContent = "SomeBytes";
try ( final InputStream in = new MyLazyStream(new ByteArrayInputStream(myContent.getBytes())) ) {
final BufferedInputStream peekable = StreamHelper.wrapPeekable(in);

24
src/test/java/de/kosit/validationtool/impl/tasks/ComputeAcceptanceActionTest.java
View file

@ -22,7 +22,7 @@ import de.kosit.validationtool.impl.Helper;
import de.kosit.validationtool.impl.ResolvingMode;
import de.kosit.validationtool.impl.tasks.CheckAction.Bag;
import net.sf.saxon.s9api.XPathExecutable;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import java.util.Collections;
import java.util.HashMap;
@ -35,14 +35,14 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Andreas Penski
*/
public class ComputeAcceptanceActionTest {
class ComputeAcceptanceActionTest {
private static final String DOES_NOT_EXIST = "count(//doesnotExist) = 0";
private final ComputeAcceptanceAction action = new ComputeAcceptanceAction();
@Test
public void simpleTest() {
void simpleTest() {
final Bag bag = createBag(true, true);
assertThat(bag.getAcceptStatus()).isEqualTo(AcceptRecommendation.UNDEFINED);
this.action.check(bag);
@ -50,21 +50,21 @@ public class ComputeAcceptanceActionTest {
}
@Test
public void testSchemaFailed() {
void schemaFailed() {
final Bag bag = createBag(false, true);
this.action.check(bag);
assertThat(bag.getAcceptStatus()).isEqualTo(AcceptRecommendation.REJECT);
}
@Test
public void testSchematronFailed() {
void schematronFailed() {
final Bag bag = createBag(true, false);
this.action.check(bag);
assertThat(bag.getAcceptStatus()).isEqualTo(AcceptRecommendation.REJECT);
}
@Test
public void testValidAcceptMatch() {
void validAcceptMatch() {
final Bag bag = createBag(true, true);
bag.getScenarioSelectionResult().getObject().setAcceptExecutable(createXpath(DOES_NOT_EXIST));
this.action.check(bag);
@ -72,7 +72,7 @@ public class ComputeAcceptanceActionTest {
}
@Test
public void testAcceptMatchNotSatisfied() {
void acceptMatchNotSatisfied() {
final Bag bag = createBag(true, true);
bag.getScenarioSelectionResult().getObject().setAcceptExecutable(createXpath("count(//doesnotExist) = 1"));
this.action.check(bag);
@ -80,7 +80,7 @@ public class ComputeAcceptanceActionTest {
}
@Test
public void testAcceptMatchOverridesSchematronErrors() {
void acceptMatchOverridesSchematronErrors() {
final Bag bag = createBag(true, false);
bag.getScenarioSelectionResult().getObject().setAcceptExecutable(createXpath(DOES_NOT_EXIST));
this.action.check(bag);
@ -88,7 +88,7 @@ public class ComputeAcceptanceActionTest {
}
@Test
public void testValidAcceptMatchOnSchemaFailed() {
void validAcceptMatchOnSchemaFailed() {
final Bag bag = createBag(false, true);
bag.getScenarioSelectionResult().getObject().setAcceptExecutable(createXpath(DOES_NOT_EXIST));
this.action.check(bag);
@ -96,14 +96,14 @@ public class ComputeAcceptanceActionTest {
}
@Test
public void testMissingSchemaCheck() {
void missingSchemaCheck() {
final Bag bag = createBag(null, Collections.emptyList());
this.action.check(bag);
assertThat(bag.getAcceptStatus()).isEqualTo(AcceptRecommendation.REJECT);
}
@Test
public void testNoSchematronCheck() {
void noSchematronCheck() {
final Bag bag = createBag(true, true);
// remove schematron results
bag.getReportInput().getValidationResultsSchematron().clear();
@ -112,7 +112,7 @@ public class ComputeAcceptanceActionTest {
}
@Test
public void testMissingReport() {
void missingReport() {
final Bag bag = createBag(false, true);
bag.setReport(null);
this.action.check(bag);

16
src/test/java/de/kosit/validationtool/impl/tasks/CreateReportActionTest.java
View file

@ -26,8 +26,8 @@ import de.kosit.validationtool.impl.tasks.CheckAction.Bag;
import net.sf.saxon.s9api.DocumentBuilder;
import net.sf.saxon.s9api.Processor;
import net.sf.saxon.s9api.SaxonApiException;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import javax.xml.transform.Source;
@ -43,20 +43,20 @@ import static org.mockito.Mockito.when;
*
* @author Andreas Penski
*/
public class CreateReportActionTest {
class CreateReportActionTest {
private CreateReportAction action;
private ContentRepository repository;
@Before
public void setup() {
@BeforeEach
void setup() {
this.repository = Simple.createContentRepository();
this.action = new CreateReportAction(this.repository.getProcessor(), new ConversionService());
}
@Test
public void testSimpleCreate() {
void simpleCreate() {
final Bag bag = TestBagBuilder.createBag(true, true);
final Scenario scenario = createScenario().build(this.repository).getObject();
bag.setScenarioSelectionResult(new Result<>(scenario));
@ -66,7 +66,7 @@ public class CreateReportActionTest {
}
@Test
public void testNoValidParseResult() {
void noValidParseResult() {
// e.g. no valid xml file specified
final Bag bag = TestBagBuilder.createBag(InputFactory.read("someBytes".getBytes(), "invalid"), true);
final Scenario scenario = createScenario().build(this.repository).getObject();
@ -79,7 +79,7 @@ public class CreateReportActionTest {
}
@Test
public void testExecutionException() throws SaxonApiException {
void executionException() throws SaxonApiException {
final Processor p = mock(Processor.class);
final DocumentBuilder documentBuilder = mock(DocumentBuilder.class);
this.action = new CreateReportAction(p, new ConversionService());

18
src/test/java/de/kosit/validationtool/impl/tasks/DocumentParseActionTest.java
View file

@ -21,29 +21,29 @@ import de.kosit.validationtool.impl.Helper.Simple;
import de.kosit.validationtool.impl.model.Result;
import de.kosit.validationtool.model.reportInput.XMLSyntaxError;
import net.sf.saxon.s9api.XdmNode;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static de.kosit.validationtool.api.InputFactory.read;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Testet die Document Parsing-Funktionalitäten.
*
* @author Andreas Penski
*/
public class DocumentParseActionTest {
class DocumentParseActionTest {
private DocumentParseAction action;
@Before
public void setup() {
@BeforeEach
void setup() {
this.action = new DocumentParseAction(Helper.createProcessor());
}
@Test
public void testSimple() {
void simple() {
final Result<XdmNode, XMLSyntaxError> result = this.action.parseDocument(read(Simple.SIMPLE_VALID));
assertThat(result).isNotNull();
assertThat(result.getObject()).isNotNull();
@ -52,7 +52,7 @@ public class DocumentParseActionTest {
}
@Test
public void testIllFormed() {
void illFormed() {
final Result<XdmNode, XMLSyntaxError> result = this.action.parseDocument(read(Simple.NOT_WELL_FORMED));
assertThat(result).isNotNull();
assertThat(result.getErrors()).isNotEmpty();
@ -61,7 +61,7 @@ public class DocumentParseActionTest {
}
@Test
public void testNullInput() {
void nullInput() {
assertThrows(IllegalArgumentException.class, () -> this.action.parseDocument(null));
}
}

26
src/test/java/de/kosit/validationtool/impl/tasks/SchemaValidatorActionTest.java
View file

@ -26,8 +26,8 @@ import de.kosit.validationtool.impl.SchemaProvider;
import de.kosit.validationtool.impl.TestObjectFactory;
import de.kosit.validationtool.impl.input.SourceInput;
import de.kosit.validationtool.impl.tasks.CheckAction.Bag;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.xml.sax.SAXException;
import javax.xml.transform.stream.StreamSource;
@ -48,17 +48,17 @@ import static org.mockito.Mockito.*;
*
* @author Andreas Penski
*/
public class SchemaValidatorActionTest {
class SchemaValidatorActionTest {
private SchemaValidationAction service;
@Before
public void setup() {
@BeforeEach
void setup() {
this.service = new SchemaValidationAction(TestObjectFactory.createProcessor());
}
@Test
public void testSimple() throws MalformedURLException {
void simple() throws MalformedURLException {
final CheckAction.Bag bag = createBag(InputFactory.read(Simple.SIMPLE_VALID.toURL()));
this.service.check(bag);
assertThat(bag.getSchemaValidationResult().isValid()).isTrue();
@ -67,7 +67,7 @@ public class SchemaValidatorActionTest {
}
@Test
public void testValidationFailure() throws MalformedURLException {
void validationFailure() throws MalformedURLException {
final Input input = InputFactory.read(Simple.SCHEMA_INVALID.toURL());
final CheckAction.Bag bag = createBag(input);
this.service.check(bag);
@ -80,13 +80,13 @@ public class SchemaValidatorActionTest {
}
@Test
public void testSchemaReferences() {
void schemaReferences() {
final Schema reportInputSchema = SchemaProvider.getReportInputSchema();
assertThat(reportInputSchema).isNotNull();
}
@Test
public void testNoRepeatableRead() throws Exception {
void noRepeatableRead() throws Exception {
try ( final InputStream inputStream = Simple.SIMPLE_VALID.toURL().openStream() ) {
final Bag bag = createBag(InputFactory.read(new StreamSource(inputStream)));
// don't read the real input stream here!
@ -98,7 +98,7 @@ public class SchemaValidatorActionTest {
}
@Test
public void testNoRepeatableReadBigFile() throws Exception {
void noRepeatableReadBigFile() throws Exception {
try ( final InputStream inputStream = Simple.SIMPLE_VALID.toURL().openStream() ) {
final SourceInput input = (SourceInput) InputFactory.read(new StreamSource(inputStream));
final Bag bag = createBag(input);
@ -114,7 +114,7 @@ public class SchemaValidatorActionTest {
}
@Test
public void testNoRepeatableReaderInput() throws Exception {
void noRepeatableReaderInput() throws Exception {
try ( final InputStream inputStream = Simple.SIMPLE_VALID.toURL().openStream();
final Reader reader = new InputStreamReader(inputStream) ) {
final SourceInput input = (SourceInput) InputFactory.read(new StreamSource(reader));
@ -128,7 +128,7 @@ public class SchemaValidatorActionTest {
}
@Test
public void testNoRepeatableReaderInputBigFile() throws Exception {
void noRepeatableReaderInputBigFile() throws Exception {
try ( final InputStream inputStream = Simple.SIMPLE_VALID.toURL().openStream();
final Reader reader = new InputStreamReader(inputStream) ) {
final SourceInput input = (SourceInput) InputFactory.read(new StreamSource(reader));
@ -144,7 +144,7 @@ public class SchemaValidatorActionTest {
}
@Test
public void testProcessingError() throws IOException, SAXException {
void processingError() throws IOException, SAXException {
final CheckAction.Bag bag = createBag(InputFactory.read(Simple.SIMPLE_VALID.toURL()));
final Scenario scenario = bag.getScenarioSelectionResult().getObject();
final Schema schema = mock(Schema.class);

12
src/test/java/de/kosit/validationtool/impl/tasks/SchematronValidationActionTest.java
View file

@ -25,8 +25,8 @@ import de.kosit.validationtool.model.scenarios.ResourceType;
import net.sf.saxon.s9api.SaxonApiException;
import net.sf.saxon.s9api.XsltExecutable;
import net.sf.saxon.s9api.XsltTransformer;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.io.IOException;
import java.util.Collections;
@ -40,17 +40,17 @@ import static org.mockito.Mockito.*;
*
* @author Andreas Penski
*/
public class SchematronValidationActionTest {
class SchematronValidationActionTest {
private SchematronValidationAction action;
@Before
public void setup() {
@BeforeEach
void setup() {
this.action = new SchematronValidationAction(new ConversionService());
}
@Test
public void testProcessingError() throws IOException, SaxonApiException {
void processingError() throws IOException, SaxonApiException {
final CheckAction.Bag bag = createBag(InputFactory.read(Simple.SIMPLE_VALID.toURL()), true);
final Scenario scenario = bag.getScenarioSelectionResult().getObject();

3
src/test/java/de/kosit/validationtool/impl/tasks/TestBagBuilder.java
View file

@ -125,4 +125,7 @@ public class TestBagBuilder {
b.setReport(createReport());
return b;
}
private TestBagBuilder() {
}
}

10
src/test/java/de/kosit/validationtool/impl/xml/BaseResolverConfigurationTest.java
View file

@ -17,14 +17,14 @@
package de.kosit.validationtool.impl.xml;
import lombok.RequiredArgsConstructor;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.xml.sax.SAXNotRecognizedException;
import org.xml.sax.SAXNotSupportedException;
import javax.xml.XMLConstants;
import javax.xml.validation.SchemaFactory;
import static org.junit.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.*;
/**
@ -46,7 +46,7 @@ public class BaseResolverConfigurationTest {
public static final String NOT_EXISTING_SCHEME = "not-existing-scheme";
@Test
public void testIgnoreUnsupportedProperty() throws SAXNotRecognizedException, SAXNotSupportedException {
void ignoreUnsupportedProperty() throws SAXNotRecognizedException, SAXNotSupportedException {
final SchemaFactory sf = mock(SchemaFactory.class);
final TestResolvingStrategy s = new TestResolvingStrategy();
doThrow(new SAXNotRecognizedException("not supported")).when(sf).setProperty(any(), any());
@ -54,7 +54,7 @@ public class BaseResolverConfigurationTest {
}
@Test
public void testFailOnUnsupportedProperty() throws SAXNotRecognizedException, SAXNotSupportedException {
void failOnUnsupportedProperty() throws SAXNotRecognizedException, SAXNotSupportedException {
final SchemaFactory sf = mock(SchemaFactory.class);
final TestResolvingStrategy s = new TestResolvingStrategy();
doThrow(new SAXNotRecognizedException("not supported")).when(sf).setProperty(any(), any());
@ -62,7 +62,7 @@ public class BaseResolverConfigurationTest {
}
@Test
public void testSimpleSuccess() throws SAXNotRecognizedException, SAXNotSupportedException {
void simpleSuccess() throws SAXNotRecognizedException, SAXNotSupportedException {
final SchemaFactory sf = mock(SchemaFactory.class);
final TestResolvingStrategy s = new TestResolvingStrategy();
s.setInternalProperty(sf, true);

8
src/test/java/de/kosit/validationtool/impl/xml/RemoteResolvingStrategyTest.java
View file

@ -18,7 +18,7 @@ package de.kosit.validationtool.impl.xml;
import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
import de.kosit.validationtool.impl.Helper.Resolving;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
@ -30,10 +30,10 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Andreas Penski
*/
public class RemoteResolvingStrategyTest {
class RemoteResolvingStrategyTest {
@Test
public void testRemoteSchemaResolving() throws Exception {
void remoteSchemaResolving() throws Exception {
final ResolvingConfigurationStrategy s = new RemoteResolvingStrategy();
final SchemaFactory schemaFactory = s.createSchemaFactory();
final Schema schema = schemaFactory.newSchema(Resolving.SCHEMA_WITH_REMOTE_REFERENCE.toURL());
@ -41,7 +41,7 @@ public class RemoteResolvingStrategyTest {
}
@Test
public void testLocalSchemaResolving() throws Exception {
void localSchemaResolving() throws Exception {
final ResolvingConfigurationStrategy s = new StrictLocalResolvingStrategy();
final SchemaFactory schemaFactory = s.createSchemaFactory();
final Schema schema = schemaFactory.newSchema(Resolving.SCHEMA_WITH_REFERENCE.toURL());

12
src/test/java/de/kosit/validationtool/impl/xml/SaxonSecurityTest.java
View file

@ -31,7 +31,7 @@ import net.sf.saxon.s9api.XsltCompiler;
import net.sf.saxon.s9api.XsltExecutable;
import net.sf.saxon.s9api.XsltTransformer;
import org.apache.commons.lang3.StringUtils;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import javax.xml.transform.Source;
import javax.xml.transform.stream.StreamSource;
@ -40,7 +40,7 @@ import java.net.URL;
import java.util.stream.Collectors;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
import static org.junit.jupiter.api.Assertions.fail;
/**
* Testet verschiedene Saxon Security Einstellungen.
@ -48,11 +48,11 @@ import static org.junit.Assert.fail;
* @author Andreas Penski
*/
@Slf4j
public class SaxonSecurityTest {
class SaxonSecurityTest {
@SuppressWarnings("deprecation")
@Test
public void testEvilStylesheets() throws IOException {
void evilStylesheets() throws IOException {
final Processor p = TestObjectFactory.createProcessor();
for (int i = 1; i <= 5; i++) {
try {
@ -80,13 +80,13 @@ public class SaxonSecurityTest {
}
} catch (final SaxonApiException | RuntimeException e) {
log.info("Expected exception detected {}", e.getMessage(), e);
log.error("Expected exception detected {}", e.getMessage(), e);
}
}
}
@Test
public void testXxe() {
void xxe() {
final URL resource = SaxonSecurityTest.class.getResource("/evil/xxe.xml");
final Result<XdmNode, XMLSyntaxError> result = Helper.parseDocument(InputFactory.read(resource));
assertThat(result.isValid()).isFalse();

10
src/test/java/de/kosit/validationtool/impl/xml/StrictLocalResolvingTest.java
View file

@ -18,24 +18,24 @@ package de.kosit.validationtool.impl.xml;
import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
import de.kosit.validationtool.impl.Helper.Resolving;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.xml.sax.SAXParseException;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Tests {@link StrictLocalResolvingStrategy}
*
* @author Andreas Penski
*/
public class StrictLocalResolvingTest {
class StrictLocalResolvingTest {
@Test
public void testRemoteSchemaResolving() {
void remoteSchemaResolving() {
final ResolvingConfigurationStrategy s = new StrictLocalResolvingStrategy();
final SchemaFactory schemaFactory = s.createSchemaFactory();
Throwable e = assertThrows(SAXParseException.class, () -> schemaFactory.newSchema(Resolving.SCHEMA_WITH_REMOTE_REFERENCE.toURL()));
@ -43,7 +43,7 @@ public class StrictLocalResolvingTest {
}
@Test
public void testLocalSchemaResolving() throws Exception {
void localSchemaResolving() throws Exception {
final ResolvingConfigurationStrategy s = new StrictLocalResolvingStrategy();
final SchemaFactory schemaFactory = s.createSchemaFactory();
final Schema schema = schemaFactory.newSchema(Resolving.SCHEMA_WITH_REFERENCE.toURL());

10
src/test/java/de/kosit/validationtool/impl/xml/StrictRelativeResolvingTest.java
View file

@ -18,24 +18,24 @@ package de.kosit.validationtool.impl.xml;
import de.kosit.validationtool.api.ResolvingConfigurationStrategy;
import de.kosit.validationtool.impl.Helper.Resolving;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.xml.sax.SAXParseException;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertThrows;
import static org.junit.jupiter.api.Assertions.assertThrows;
/**
* Tests {@link StrictRelativeResolvingStrategy}.
*
* @author Andreas Penski
*/
public class StrictRelativeResolvingTest {
class StrictRelativeResolvingTest {
@Test
public void testRemoteSchemaResolving() {
void remoteSchemaResolving() {
final ResolvingConfigurationStrategy s = new StrictLocalResolvingStrategy();
final SchemaFactory schemaFactory = s.createSchemaFactory();
Throwable e = assertThrows(SAXParseException.class, () -> schemaFactory.newSchema(Resolving.SCHEMA_WITH_REMOTE_REFERENCE.toURL()));
@ -43,7 +43,7 @@ public class StrictRelativeResolvingTest {
}
@Test
public void testLocalSchemaResolving() throws Exception {
void localSchemaResolving() throws Exception {
final ResolvingConfigurationStrategy s = new StrictLocalResolvingStrategy();
final SchemaFactory schemaFactory = s.createSchemaFactory();
final Schema schema = schemaFactory.newSchema(Resolving.SCHEMA_WITH_REFERENCE.toURL());

4
src/test/resources/examples/simple/otherScenarios.xml
View file

@ -59,8 +59,8 @@
<scenario>
<name>NoAcceptMatch</name>
<description>
<p>Nur Schemaprüfung. Keine AcceptMatch deklaration</p>
<p>Testen, ob auch alte Konfiguration funktionioeren</p>
<p>Nur Schemaprüfung. Keine AcceptMatch Deklaration</p>
<p>Testen, ob auch alte Konfiguration funktionieren</p>
</description>
<namespace prefix="test">http://validator.kosit.de/test-sample</namespace>
<match>/test:DoesNotMatchfoo</match>

2
src/test/resources/examples/simple/scenarios.xml
View file

@ -60,7 +60,7 @@
<name>NoAcceptMatch</name>
<description>
<p>Nur Schemaprüfung. Keine AcceptMatch deklaration</p>
<p>Testen, ob auch alte Konfiguration funktionioeren</p>
<p>Testen, ob auch alte Konfiguration funktionieren</p>
</description>
<namespace prefix="test">http://validator.kosit.de/test-sample</namespace>
<match>/test:foo</match>