diff --git a/.gitignore b/.gitignore
index bc3c63d..b0d4fc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,8 @@
# Package Files #
*.jar
+!libs/**/*.jar
+
**/generated
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
diff --git a/libs/de/kosit/validationtool/packaged-test-scenarios/1.0.0/packaged-test-scenarios-1.0.0.jar b/libs/de/kosit/validationtool/packaged-test-scenarios/1.0.0/packaged-test-scenarios-1.0.0.jar
deleted file mode 100644
index 6b511a6..0000000
Binary files a/libs/de/kosit/validationtool/packaged-test-scenarios/1.0.0/packaged-test-scenarios-1.0.0.jar and /dev/null differ
diff --git a/libs/de/kosit/validationtool/packaged-test-scenarios/1.0.0/packaged-test-scenarios-1.0.0.pom b/libs/de/kosit/validationtool/packaged-test-scenarios/1.0.0/packaged-test-scenarios-1.0.0.pom
deleted file mode 100644
index 27d8896..0000000
--- a/libs/de/kosit/validationtool/packaged-test-scenarios/1.0.0/packaged-test-scenarios-1.0.0.pom
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
- 4.0.0
- de.kosit.validationtool
- packaged-test-scenarios
- 1.0.0
- POM was created from install:install-file
-
diff --git a/libs/de/kosit/validationtool/packaged-test-scenarios/1.0.1/packaged-test-scenarios-1.0.1.jar b/libs/de/kosit/validationtool/packaged-test-scenarios/1.0.1/packaged-test-scenarios-1.0.1.jar
new file mode 100644
index 0000000..984b0c3
Binary files /dev/null and b/libs/de/kosit/validationtool/packaged-test-scenarios/1.0.1/packaged-test-scenarios-1.0.1.jar differ
diff --git a/libs/de/kosit/validationtool/packaged-test-scenarios/1.0.1/packaged-test-scenarios-1.0.1.pom b/libs/de/kosit/validationtool/packaged-test-scenarios/1.0.1/packaged-test-scenarios-1.0.1.pom
new file mode 100644
index 0000000..be718d2
--- /dev/null
+++ b/libs/de/kosit/validationtool/packaged-test-scenarios/1.0.1/packaged-test-scenarios-1.0.1.pom
@@ -0,0 +1,10 @@
+
+
+ 4.0.0
+ de.kosit.validationtool
+ packaged-test-scenarios
+ 1.0.1/version>
+ POM was created from install:install-file
+
diff --git a/libs/de/kosit/validationtool/packaged-test-scenarios/maven-metadata-local.xml b/libs/de/kosit/validationtool/packaged-test-scenarios/maven-metadata-local.xml
index 617d5cb..4b08828 100644
--- a/libs/de/kosit/validationtool/packaged-test-scenarios/maven-metadata-local.xml
+++ b/libs/de/kosit/validationtool/packaged-test-scenarios/maven-metadata-local.xml
@@ -3,10 +3,10 @@
de.kosit.validationtool
packaged-test-scenarios
- 1.0.0
+ 1.0.1
- 1.0.0
+ 1.0.1
- 20190507064929
+ 20200507064929
diff --git a/pom.xml b/pom.xml
index f7ef36f..0c0651b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
-
+
4.0.0
KoSIT XML Prüftool Implementierung
@@ -132,7 +132,7 @@
de.kosit.validationtool
packaged-test-scenarios
- 1.0.0
+ 1.0.1
test
@@ -430,6 +430,7 @@
true
true
+
${jacocoFailsafe}
-classpath
diff --git a/src/test/java/de/kosit/validationtool/impl/ContentRepositoryTest.java b/src/test/java/de/kosit/validationtool/impl/ContentRepositoryTest.java
index fe1959c..90a0355 100644
--- a/src/test/java/de/kosit/validationtool/impl/ContentRepositoryTest.java
+++ b/src/test/java/de/kosit/validationtool/impl/ContentRepositoryTest.java
@@ -116,7 +116,7 @@ public class ContentRepositoryTest {
public void loadFromJar() throws URISyntaxException {
assert Helper.JAR_REPOSITORY != null;
this.repository = new ContentRepository(ResolvingMode.STRICT_RELATIVE.getStrategy(), Helper.JAR_REPOSITORY.toURI());
- final XsltExecutable xsltExecutable = this.repository.loadXsltScript(URI.create("resources/eRechnung/report.xsl"));
+ final XsltExecutable xsltExecutable = this.repository.loadXsltScript(URI.create("report.xsl"));
assertThat(xsltExecutable).isNotNull();
}
diff --git a/src/test/java/de/kosit/validationtool/impl/DefaultCheckTest.java b/src/test/java/de/kosit/validationtool/impl/DefaultCheckTest.java
index c3e5e1b..5215357 100644
--- a/src/test/java/de/kosit/validationtool/impl/DefaultCheckTest.java
+++ b/src/test/java/de/kosit/validationtool/impl/DefaultCheckTest.java
@@ -27,8 +27,10 @@ import static de.kosit.validationtool.impl.Helper.Simple.REJECTED;
import static de.kosit.validationtool.impl.Helper.Simple.SCHEMATRON_INVALID;
import static de.kosit.validationtool.impl.Helper.Simple.SIMPLE_VALID;
import static de.kosit.validationtool.impl.Helper.Simple.UNKNOWN;
+import static java.util.Objects.requireNonNull;
import static org.assertj.core.api.Assertions.assertThat;
+import java.net.URISyntaxException;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@@ -57,13 +59,22 @@ public class DefaultCheckTest {
// for checking certain error scenarios.
private DefaultCheck errorCheck;
+ private DefaultCheck jarScenarioCheck;
+
@Before
- public void setup() {
+ public void setup() throws URISyntaxException {
final Configuration validConfig = Configuration.load(Simple.SCENARIOS, Simple.REPOSITORY_URI).build();
this.validCheck = new DefaultCheck(validConfig);
final Configuration errorConfig = Configuration.load(Simple.ERROR_SCENARIOS, Simple.REPOSITORY_URI).build();
this.errorCheck = new DefaultCheck(errorConfig);
+
+ final Configuration jarConfig = Configuration
+ .load(requireNonNull(DefaultCheckTest.class.getClassLoader().getResource("simple/packaged/scenarios.xml")).toURI(),
+ requireNonNull(DefaultCheckTest.class.getClassLoader().getResource("simple/packaged/repository/")).toURI())
+ .build();
+
+ this.jarScenarioCheck = new DefaultCheck(jarConfig);
}
@Test
@@ -77,6 +88,17 @@ public class DefaultCheckTest {
assertThat(doc.getAcceptRecommendation()).isEqualTo(AcceptRecommendation.ACCEPTABLE);
}
+ @Test
+ public void testJarCase() {
+ final Result doc = this.jarScenarioCheck.checkInput(read(SIMPLE_VALID));
+ assertThat(doc).isNotNull();
+ assertThat(doc.getReport()).isNotNull();
+ assertThat(doc.isAcceptable()).isTrue();
+ assertThat(doc.isSchematronValid()).isTrue();
+ assertThat(doc.isSchemaValid()).isTrue();
+ assertThat(doc.getAcceptRecommendation()).isEqualTo(AcceptRecommendation.ACCEPTABLE);
+ }
+
@Test
public void testWithoutAcceptMatch() {
final Result doc = this.validCheck.checkInput(read(Simple.FOO));
diff --git a/src/test/java/de/kosit/validationtool/impl/Helper.java b/src/test/java/de/kosit/validationtool/impl/Helper.java
index 57a5a5a..88f048e 100644
--- a/src/test/java/de/kosit/validationtool/impl/Helper.java
+++ b/src/test/java/de/kosit/validationtool/impl/Helper.java
@@ -123,7 +123,7 @@ public class Helper {
public static final URI ASSERTIONS = EXAMPLES_DIR.resolve("assertions/tests-xrechnung.xml");
- public static final URL JAR_REPOSITORY = Helper.class.getClassLoader().getResource("xrechnung/repository/");
+ public static final URL JAR_REPOSITORY = Helper.class.getClassLoader().getResource("simple/packaged/repository/");
/**
* Lädt ein XML-Dokument von der gegebenen URL