From 1b015d3cee6db8af7cf8c3178beaeb24854b5cfb Mon Sep 17 00:00:00 2001 From: Andre Kemper Date: Tue, 9 Apr 2019 23:35:44 +0200 Subject: [PATCH] merge master --- .../ZUGFeRD/MustangReaderWriterTest.java | 35 +++++-------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java b/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java index e2fdc9f1..066863c3 100644 --- a/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java +++ b/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java @@ -514,34 +514,17 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta } // now check the contents (like MustangReaderTest) - ZUGFeRDImporter zi = new ZUGFeRDImporter(); - zi.extract(TARGET_PDF); + ZUGFeRDImporter zi = new ZUGFeRDImporter(TARGET_PDF); + // Reading ZUGFeRD - - String amount = null; - String bic = null; - String iban = null; - String kto = null; - String holder = null; - String ref = null; - if (zi.canParse()) { - zi.parse(); - amount = zi.getAmount(); - bic = zi.getBIC(); - iban = zi.getIBAN(); - kto = zi.getKTO(); - holder = zi.getHolder(); - ref = zi.getForeignReference(); - } - - assertEquals(amount, "571.04"); - assertEquals(bic, getOwnBIC()); - assertEquals(iban, getOwnIBAN()); - assertEquals(kto, getOwnKto()); - assertEquals(holder, getOwnOrganisationName()); - assertEquals(ref, getNumber()); - + assertEquals(zi.getAmount(), "571.04"); + assertEquals(zi.getBIC(), getOwnBIC()); + assertEquals(zi.getIBAN(), getOwnIBAN()); + assertEquals(zi.getKTO(), getOwnKto()); + assertEquals(zi.getHolder(), getOwnOrganisationName()); + assertEquals(zi.getForeignReference(), getNumber()); } + /* public void testFXExport() throws Exception {