From 33ef46138301690461c08bd115d1d914f97cb23b Mon Sep 17 00:00:00 2001 From: jstaerk Date: Tue, 5 Nov 2024 15:47:36 +0100 Subject: [PATCH] current work --- History.md | 6 +- .../ZUGFeRD/ZF2ImporterTest.java | 431 ++++++++++++++++++ .../ZUGFeRD/ZF2ZInvoiceImporterTest.java | 8 +- 3 files changed, 439 insertions(+), 6 deletions(-) create mode 100644 library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ImporterTest.java diff --git a/History.md b/History.md index d80a30ab..36fa2040 100644 --- a/History.md +++ b/History.md @@ -8,11 +8,11 @@ - 380 Added test for input stream validation - 518 corrently validate more XRechnung versions - make document charges and allowances serializable -- 523 -- 530 +- 523 Verapdf claims PDF-A/3s created witth visualize are invalid +- 530 duedate can not be set directly - 532 support validation warnings! - 534 new signature -- 538 +- 538 Mustang validator always claims PDF is invalid if flavour is PDF/A-3A 2.14.2 diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ImporterTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ImporterTest.java new file mode 100644 index 00000000..08fddcad --- /dev/null +++ b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ImporterTest.java @@ -0,0 +1,431 @@ + +/** + * ********************************************************************* + *

+ * Copyright 2019 Jochen Staerk + *

+ * Use is subject to license terms. + *

+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy + * of the License at http://www.apache.org/licenses/LICENSE-2.0. + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + *

+ * See the License for the specific language governing permissions and + * limitations under the License. + *

+ * ********************************************************************** + */ +package org.mustangproject.ZUGFeRD; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.mustangproject.*; + +import javax.xml.xpath.XPathExpressionException; +import java.io.*; +import java.math.BigDecimal; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Arrays; +import java.util.Date; + + +/*** + * Classname ZF2ZInvoiceImporterTest is alphabetical behind the tests which will create the file + * used for this import, testout-ZF2New.pdf + */ +public class ZF2ZInvoiceImporterTest extends ResourceCase { + + + public void testInvoiceImport() { + + ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter("./target/testout-ZF2new.pdf"); + + boolean hasExceptions = false; + Invoice invoice = null; + try { + invoice = zii.extractInvoice(); + } catch (XPathExpressionException | ParseException e) { + hasExceptions = true; + } + assertFalse(hasExceptions); + // Reading ZUGFeRD + assertEquals("Bei Spiel GmbH", invoice.getOwnOrganisationName()); + assertEquals(3, invoice.getZFItems().length); + assertEquals("400.0000", invoice.getZFItems()[1].getQuantity().toString()); + + assertEquals("AB321", invoice.getReferenceNumber()); + assertEquals("160.0000", invoice.getZFItems()[0].getPrice().toString()); + assertEquals("Heiße Luft pro Liter", invoice.getZFItems()[2].getProduct().getName()); + assertEquals("LTR", invoice.getZFItems()[2].getProduct().getUnit()); + assertEquals("7.00", invoice.getZFItems()[0].getProduct().getVATPercent().toString()); + assertEquals("RE-20170509/505", invoice.getNumber()); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + assertEquals("2017-05-09", sdf.format(invoice.getIssueDate())); + assertEquals("2017-05-07", sdf.format(invoice.getDeliveryDate())); + assertEquals("2017-05-30", sdf.format(invoice.getDueDate())); + + assertEquals("Bahnstr. 42", invoice.getRecipient().getStreet()); + assertEquals("Hinterhaus", invoice.getRecipient().getAdditionalAddress()); + assertEquals("Zweiter Stock", invoice.getRecipient().getAdditionalAddressExtension()); + assertEquals("88802", invoice.getRecipient().getZIP()); + assertEquals("DE", invoice.getRecipient().getCountry()); + assertEquals("Spielkreis", invoice.getRecipient().getLocation()); + + assertEquals("Ecke 12", invoice.getSender().getStreet()); + assertEquals("12345", invoice.getSender().getZIP()); + assertEquals("DE", invoice.getSender().getCountry()); + assertEquals("Stadthausen", invoice.getSender().getLocation()); + + TransactionCalculator tc = new TransactionCalculator(invoice); + assertEquals(new BigDecimal("571.04"), tc.getGrandTotal()); + + + // name street location zip country, contact name phone email, total amount + + } + + public void testInvoiceImportUBL() { + + + boolean hasExceptions = false; + + ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter(); + File expectedResult = getResourceAsFile("testout-ZF2new.ubl.xml"); + + Invoice invoice = null; + try { + String xml = new String(Files.readAllBytes(expectedResult.toPath()), StandardCharsets.UTF_8).replace("\r", "").replace("\n", ""); + + zii.fromXML(xml); + + invoice = zii.extractInvoice(); + } catch (XPathExpressionException | ParseException | IOException e) { + hasExceptions = true; + } + assertFalse(hasExceptions); + // Reading ZUGFeRD + assertEquals("Bei Spiel GmbH", invoice.getOwnOrganisationName()); + assertEquals(3, invoice.getZFItems().length); + assertEquals("400", invoice.getZFItems()[1].getQuantity().toString()); + + assertEquals("AB321", invoice.getReferenceNumber()); + assertEquals("160", invoice.getZFItems()[0].getPrice().toString()); + assertEquals("Heiße Luft pro Liter", invoice.getZFItems()[2].getProduct().getName()); + assertEquals("LTR", invoice.getZFItems()[2].getProduct().getUnit()); + assertEquals("7", invoice.getZFItems()[0].getProduct().getVATPercent().toString()); + assertEquals("RE-20170509/505", invoice.getNumber()); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + assertEquals("2017-05-09", sdf.format(invoice.getIssueDate())); + assertEquals("2017-05-07", sdf.format(invoice.getDeliveryDate())); + assertEquals("2017-05-30", sdf.format(invoice.getDueDate())); + + assertEquals("Bahnstr. 42", invoice.getRecipient().getStreet()); + assertEquals("Hinterhaus", invoice.getRecipient().getAdditionalAddress()); + assertEquals("Zweiter Stock", invoice.getRecipient().getAdditionalAddressExtension()); + assertEquals("88802", invoice.getRecipient().getZIP()); + assertEquals("DE", invoice.getRecipient().getCountry()); + assertEquals("Spielkreis", invoice.getRecipient().getLocation()); + + assertEquals("Ecke 12", invoice.getSender().getStreet()); + assertEquals("12345", invoice.getSender().getZIP()); + assertEquals("DE", invoice.getSender().getCountry()); + assertEquals("Stadthausen", invoice.getSender().getLocation()); + + assertTrue(invoice.getPayee() != null); + assertEquals("VR Factoring GmbH", invoice.getPayee().getName()); + + TransactionCalculator tc = new TransactionCalculator(invoice); + assertEquals(new BigDecimal("571.04"), tc.getGrandTotal()); + + + // name street location zip country, contact name phone email, total amount + + } + + public void testEdgeInvoiceImport() { + + ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter("./target/testout-ZF2PushEdge.pdf"); + + boolean hasExceptions = false; + Invoice invoice = null; + try { + invoice = zii.extractInvoice(); + } catch (XPathExpressionException | ParseException e) { + hasExceptions = true; + } + assertFalse(hasExceptions); + // Reading ZUGFeRD + assertEquals("4711", invoice.getZFItems()[0].getProduct().getSellerAssignedID()); + assertEquals("9384", invoice.getSellerOrderReferencedDocumentID()); + assertEquals("sender@test.org", invoice.getSender().getEmail()); + assertEquals("recipient@test.org", invoice.getRecipient().getEmail()); + assertEquals("28934", invoice.getBuyerOrderReferencedDocumentID()); + + } + + + public void testZF1Import() { + + ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter("./target/testout-MustangGnuaccountingBeispielRE-20171118_506zf1.pdf"); + + boolean hasExceptions = false; + Invoice invoice = null; + try { + invoice = zii.extractInvoice(); + } catch (XPathExpressionException | ParseException e) { + hasExceptions = true; + } + assertFalse(hasExceptions); + // Reading ZUGFeRD + assertEquals("Bei Spiel GmbH", invoice.getOwnOrganisationName()); + assertEquals(3, invoice.getZFItems().length); + assertEquals("400.0000", invoice.getZFItems()[1].getQuantity().toString()); + + assertEquals("160.0000", invoice.getZFItems()[0].getPrice().toString()); + assertEquals("Hot air „heiße Luft“ (litres)", invoice.getZFItems()[2].getProduct().getName()); + assertEquals("LTR", invoice.getZFItems()[2].getProduct().getUnit()); + assertEquals("7.00", invoice.getZFItems()[0].getProduct().getVATPercent().toString()); + assertEquals("RE-20190610/507", invoice.getNumber()); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + assertEquals("2019-06-10", sdf.format(invoice.getIssueDate())); + assertEquals("2019-07-01", sdf.format(invoice.getDueDate())); + + assertEquals("street", invoice.getRecipient().getStreet()); + assertEquals("zip", invoice.getRecipient().getZIP()); + assertEquals("DE", invoice.getRecipient().getCountry()); + assertEquals("city", invoice.getRecipient().getLocation()); + + assertEquals("street", invoice.getSender().getStreet()); + assertEquals("zip", invoice.getSender().getZIP()); + assertEquals("DE", invoice.getSender().getCountry()); + assertEquals("city", invoice.getSender().getLocation()); + + TransactionCalculator tc = new TransactionCalculator(invoice); + assertEquals(new BigDecimal("571.04"), tc.getGrandTotal()); + + + // name street location zip country, contact name phone email, total amount + + + } + + public void testItemAllowancesChargesImport() { + + ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter("./target/testout-ZF2PushItemChargesAllowances.pdf"); + + boolean hasExceptions = false; + Invoice invoice = null; + try { + invoice = zii.extractInvoice(); + } catch (XPathExpressionException | ParseException e) { + hasExceptions = true; + } + assertFalse(hasExceptions); + TransactionCalculator tc = new TransactionCalculator(invoice); + assertEquals(new BigDecimal("18.33"), tc.getGrandTotal()); + } + + public void testBasisQuantityImport() { + + ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter("./target/testout-ZF2newEdge.pdf"); + + boolean hasExceptions = false; + Invoice invoice = null; + try { + invoice = zii.extractInvoice(); + } catch (XPathExpressionException | ParseException e) { + hasExceptions = true; + } + assertFalse(hasExceptions); + TransactionCalculator tc = new TransactionCalculator(invoice); + assertEquals(new BigDecimal("337.60"), tc.getGrandTotal()); + } + + public void testAllowancesChargesImport() { + + ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter("./target/testout-ZF2PushChargesAllowances.pdf"); + + boolean hasExceptions = false; + Invoice invoice = null; + try { + invoice = zii.extractInvoice(); + } catch (XPathExpressionException | ParseException e) { + hasExceptions = true; + } + assertFalse(hasExceptions); + TransactionCalculator tc = new TransactionCalculator(invoice); + assertEquals(new BigDecimal("11.07"), tc.getGrandTotal()); + + } + + public void testXRImport() { + boolean hasExceptions = false; + + ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter(); + try { + zii.fromXML(new String(Files.readAllBytes(Paths.get("./target/testout-XR-Edge.xml")), StandardCharsets.UTF_8)); + + } catch (IOException e) { + hasExceptions = true; + } + + Invoice invoice = null; + try { + invoice = zii.extractInvoice(); + } catch (XPathExpressionException | ParseException e) { + hasExceptions = true; + } + assertFalse(hasExceptions); + TransactionCalculator tc = new TransactionCalculator(invoice); + assertEquals(new BigDecimal("1.00"), tc.getGrandTotal()); + assertTrue(invoice.getTradeSettlement().length==1); + assertTrue(invoice.getTradeSettlement()[0] instanceof IZUGFeRDTradeSettlementPayment); + IZUGFeRDTradeSettlementPayment paym=(IZUGFeRDTradeSettlementPayment)invoice.getTradeSettlement()[0]; + assertEquals("DE12500105170648489890", paym.getOwnIBAN()); + assertEquals("COBADEFXXX", paym.getOwnBIC()); + + + assertTrue(invoice.getPayee() != null); + assertEquals("VR Factoring GmbH", invoice.getPayee().getName()); + } + + /** + * testing if other files embedded in pdf additionally to the invoice can be read correctly + * */ + public void testDetach() { + boolean hasExceptions = false; + + byte[] fileA=null; + byte[] fileB=null; + + ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter("./target/testout-ZF2PushAttachments.pdf"); + for (FileAttachment fa:zii.getFileAttachmentsPDF()) { + if (fa.getFilename().equals("one.pdf")) { + fileA=fa.getData(); + } else if (fa.getFilename().equals("two.pdf")) { + fileB=fa.getData(); + } + } + byte[] b = {12, 13}; // the sample data that was used to write the files + + assertTrue(Arrays.equals(fileA, b)); + assertEquals(fileA.length, 2); + assertTrue(Arrays.equals(fileB, b)); + assertEquals(fileB.length, 2); + } + + + + public void testImportDebit() { + File CIIinputFile = getResourceAsFile("cii/minimalDebit.xml"); + try { + ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter(new FileInputStream(CIIinputFile)); + Invoice i=zii.extractInvoice(); + + assertEquals("DE21860000000086001055", i.getSender().getBankDetails().get(0).getIBAN()); + ObjectMapper mapper = new ObjectMapper(); + + String jsonArray = mapper.writeValueAsString(i); + + // assertEquals("",jsonArray); + + } catch (IOException e) { + fail("IOException not expected"); + } catch (XPathExpressionException e) { + throw new RuntimeException(e); + } catch (ParseException e) { + throw new RuntimeException(e); + } + + + } + + + + + + public void testImportMinimum() { + File CIIinputFile = getResourceAsFile("cii/facturFrMinimum.xml"); + try { + ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter(new FileInputStream(CIIinputFile)); + + + CalculatedInvoice i=new CalculatedInvoice(); + zii.extractInto(i); + assertEquals("671.15", i.getGrandTotal().toString()); + + } catch (IOException e) { + fail("IOException not expected"); + } catch (XPathExpressionException e) { + throw new RuntimeException(e); + } catch (ParseException e) { + throw new RuntimeException(e); + } + + + } + + + public void testEEISI_300_cii_Import() throws XPathExpressionException, ParseException { + boolean hasExceptions = false; + File inputCII = getResourceAsFile("not_validating_full_invoice_based_onTest_EeISI_300_CENfullmodel.cii.xml"); + File inputUBL = getResourceAsFile("not_validating_full_invoice_based_onTest_EeISI_300_CENfullmodel.ubl.xml"); + + + ZUGFeRDInvoiceImporter zii = new ZUGFeRDInvoiceImporter(); + try { + zii.fromXML(new String(Files.readAllBytes(inputCII.toPath()), StandardCharsets.UTF_8)); + + } catch (IOException e) { + hasExceptions = true; + } + + Invoice invoiceUBL = null; + invoiceUBL = zii.extractInvoice(); + + try { + zii.fromXML(new String(Files.readAllBytes(inputUBL.toPath()), StandardCharsets.UTF_8)); + + } catch (IOException e) { + hasExceptions = true; + } + + Invoice invoiceCII = null; + try { + invoiceCII = zii.extractInvoice(); + ObjectMapper mapper = new ObjectMapper(); + String ubl=mapper.writeValueAsString(invoiceUBL); + String cii=mapper.writeValueAsString(invoiceCII); + + assertEquals(cii,ubl); + + + /* + Seller contact point + +41 345 654455 + seller@contact.de);*/ + } catch (XPathExpressionException | ParseException e) { + hasExceptions = true; + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + assertFalse(hasExceptions); + + TransactionCalculator tc = new TransactionCalculator(invoiceCII); + assertEquals(new BigDecimal("205.00"), tc.getGrandTotal()); + + } + + +} diff --git a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java index 08fddcad..db7256cf 100644 --- a/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java +++ b/library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java @@ -375,7 +375,9 @@ public class ZF2ZInvoiceImporterTest extends ResourceCase { } - +/* +this would test if for all elements/attributes + */ public void testEEISI_300_cii_Import() throws XPathExpressionException, ParseException { boolean hasExceptions = false; @@ -414,7 +416,7 @@ public class ZF2ZInvoiceImporterTest extends ResourceCase { /* Seller contact point +41 345 654455 - seller@contact.de);*/ + seller@contact.de);* } catch (XPathExpressionException | ParseException e) { hasExceptions = true; } catch (JsonProcessingException e) { @@ -426,6 +428,6 @@ public class ZF2ZInvoiceImporterTest extends ResourceCase { assertEquals(new BigDecimal("205.00"), tc.getGrandTotal()); } - +*/ }