From 0720c76b504d64c4f75fd8c9f5267dba18742c49 Mon Sep 17 00:00:00 2001 From: jstaerk Date: Fri, 17 May 2024 14:24:42 +0200 Subject: [PATCH] corrected test cases --- .../mustangproject/validator/PDFValidator.java | 18 +++++++++--------- .../mustangproject/validator/LibraryTest.java | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/validator/src/main/java/org/mustangproject/validator/PDFValidator.java b/validator/src/main/java/org/mustangproject/validator/PDFValidator.java index a2c18b16..629c632e 100644 --- a/validator/src/main/java/org/mustangproject/validator/PDFValidator.java +++ b/validator/src/main/java/org/mustangproject/validator/PDFValidator.java @@ -1,14 +1,8 @@ package org.mustangproject.validator; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.PrintWriter; -import java.io.StringReader; -import java.io.StringWriter; -import java.io.UnsupportedEncodingException; +import java.io.*; +import java.nio.file.Files; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; @@ -324,6 +318,12 @@ public class PDFValidator extends Validator { @Override public void setFilename(String filename) throws IrrecoverableValidationError { this.pdfFilename = filename; + try { + fileContents=Files.readAllBytes(Paths.get(pdfFilename)); + } catch (IOException ex) { + throw new IrrecoverableValidationError("Could not read file"); + } + } diff --git a/validator/src/test/java/org/mustangproject/validator/LibraryTest.java b/validator/src/test/java/org/mustangproject/validator/LibraryTest.java index 420e394d..81bf874c 100644 --- a/validator/src/test/java/org/mustangproject/validator/LibraryTest.java +++ b/validator/src/test/java/org/mustangproject/validator/LibraryTest.java @@ -181,13 +181,13 @@ public class LibraryTest extends ResourceCase { String res = zfv.validate(tempFile.getAbsolutePath()); assertThat(res).valueByXPath("count(//error)") .asInt() - .isEqualTo(1);// there is an error inthe XRechnung validatoion artefacts: https://github.com/itplr-kosit/validator-configuration-xrechnung/issues/84 + .isEqualTo(0); assertThat(res).valueByXPath("/validation/summary/@status") .asString() - .isEqualTo("invalid");// expect to be valid because XR notices are, well, only notices + .isEqualTo("valid");// expect to be valid because XR notices are, well, only notices assertThat(res).valueByXPath("/validation/xml/summary/@status") .asString() - .isEqualTo("invalid"); + .isEqualTo("valid"); assertThat(res).valueByXPath("count(//notice)") .asInt()