diff --git a/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java b/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java index 7b6e281a..adacc6e3 100644 --- a/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java +++ b/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java @@ -42,7 +42,7 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp @Override public String getNumber() { - return "RE-20140703/502"; + return "RE-20151008/504"; } @Override @@ -111,18 +111,6 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp return new Contact(); } - @Override - public BigDecimal getTotal() - { - return new BigDecimal("496.00"); - } - - @Override - public BigDecimal getTotalGross() - { - return new BigDecimal("571.04"); - } - @Override public IZUGFeRDExportableItem[] getZFItems() { @@ -131,9 +119,9 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp Product balloonProduct = new Product("", "Luftballon: Bunt, ca. 500ml", "C62", new BigDecimal("19.000000")); Product airProduct = new Product("", "Heiße Luft pro Liter", "LTR", new BigDecimal("19.000000")); - allItems[0] = new Item(new BigDecimal("160"), new BigDecimal("171.20"), new BigDecimal("1"), new BigDecimal("171.20"), designProduct); - allItems[1] = new Item(new BigDecimal("0.79"), new BigDecimal("0.94"), new BigDecimal("400"), new BigDecimal("376.04"), balloonProduct); - allItems[2] = new Item(new BigDecimal("0.10"), new BigDecimal("0.12"), new BigDecimal("200"), new BigDecimal("23.80"), airProduct); + allItems[0] = new Item(new BigDecimal("160"), new BigDecimal("1"), designProduct); + allItems[1] = new Item(new BigDecimal("0.79"), new BigDecimal("400"), balloonProduct); + allItems[2] = new Item(new BigDecimal("0.10"), new BigDecimal("200"), airProduct); return allItems; } @@ -180,17 +168,15 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp class Item implements IZUGFeRDExportableItem { - public Item(BigDecimal price, BigDecimal priceGross, BigDecimal quantity, BigDecimal totalGross, Product product) + public Item(BigDecimal price, BigDecimal quantity, Product product) { super(); this.price = price; - this.priceGross = priceGross; this.quantity = quantity; - this.totalGross = totalGross; this.product = product; } - private BigDecimal price, priceGross, quantity, totalGross; + private BigDecimal price,quantity; private Product product; @Override @@ -204,17 +190,6 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp this.price = price; } - @Override - public BigDecimal getPriceGross() - { - return priceGross; - } - - public void setPriceGross(BigDecimal priceGross) - { - this.priceGross = priceGross; - } - @Override public BigDecimal getQuantity() { @@ -226,17 +201,6 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp this.quantity = quantity; } - @Override - public BigDecimal getTotalGross() - { - return totalGross; - } - - public void setTotalGross(BigDecimal totalGross) - { - this.totalGross = totalGross; - } - @Override public Product getProduct() { @@ -332,7 +296,7 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp // //////// TESTS ////////////////////////////////////////////////////////////////////////////////////////// /** - * The importer test imports from ./src/test/MustangGnuaccountingBeispielRE-20140703_502.pdf to check the values. + * The importer test imports from ./src/test/MustangGnuaccountingBeispielRE-20151008_504.pdf to check the values. * --> as only Name Ascending is supported for Test Unit sequence, I renamed the this test-A-Export to run before * testZExport * @@ -342,7 +306,7 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp public void testAImport() throws IOException { ZUGFeRDImporter zi = new ZUGFeRDImporter(); - zi.extractLowLevel(this.getClass().getResourceAsStream("/MustangGnuaccountingBeispielRE-20140703_502.pdf")); + zi.extractLowLevel(this.getClass().getResourceAsStream("/MustangGnuaccountingBeispielRE-20151008_504.pdf")); // Reading ZUGFeRD String amount = null; @@ -361,7 +325,7 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp ref = zi.getForeignReference(); } - assertEquals(amount, getTotalGross().toString()); + assertEquals(amount, "406.82"); assertEquals(bic, getOwnBIC()); assertEquals(iban, getOwnIBAN()); assertEquals(holder, getOwnOrganisationName()); @@ -428,7 +392,7 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp ref = zi.getForeignReference(); } - assertEquals(amount, getTotalGross().toString()); + assertEquals(amount, "406.82"); assertEquals(bic, getOwnBIC()); assertEquals(iban, getOwnIBAN()); assertEquals(holder, getOwnOrganisationName()); diff --git a/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java b/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java index b3b7be3f..a36b284e 100644 --- a/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java +++ b/mustang/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java @@ -42,7 +42,7 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta @Override public String getNumber() { - return "RE-20140703/502"; + return "RE-20151008/504"; } @Override @@ -111,18 +111,6 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta return new Contact(); } - @Override - public BigDecimal getTotal() - { - return new BigDecimal("496.00"); - } - - @Override - public BigDecimal getTotalGross() - { - return new BigDecimal("571.04"); - } - @Override public IZUGFeRDExportableItem[] getZFItems() { @@ -131,9 +119,9 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta Product balloonProduct = new Product("", "Luftballon", "C62", new BigDecimal("19.000000")); Product airProduct = new Product("", "Heiße Luft pro Liter", "LTR", new BigDecimal("19.000000")); - allItems[0] = new Item(new BigDecimal("160"), new BigDecimal("171.20"), new BigDecimal("1"), new BigDecimal("171.20"), designProduct); - allItems[1] = new Item(new BigDecimal("0.79"), new BigDecimal("0.94"), new BigDecimal("400"), new BigDecimal("376.04"), balloonProduct); - allItems[2] = new Item(new BigDecimal("0.10"), new BigDecimal("0.12"), new BigDecimal("200"), new BigDecimal("23.80"), airProduct); + allItems[0] = new Item(new BigDecimal("160"), new BigDecimal("1"), designProduct); + allItems[1] = new Item(new BigDecimal("0.79"), new BigDecimal("400"), balloonProduct); + allItems[2] = new Item(new BigDecimal("0.10"), new BigDecimal("200"), airProduct); return allItems; } @@ -180,17 +168,15 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta class Item implements IZUGFeRDExportableItem { - public Item(BigDecimal price, BigDecimal priceGross, BigDecimal quantity, BigDecimal totalGross, Product product) + public Item(BigDecimal price, BigDecimal quantity, Product product) { super(); this.price = price; - this.priceGross = priceGross; this.quantity = quantity; - this.totalGross = totalGross; this.product = product; } - private BigDecimal price, priceGross, quantity, totalGross; + private BigDecimal price, quantity; private Product product; @Override @@ -204,17 +190,6 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta this.price = price; } - @Override - public BigDecimal getPriceGross() - { - return priceGross; - } - - public void setPriceGross(BigDecimal priceGross) - { - this.priceGross = priceGross; - } - @Override public BigDecimal getQuantity() { @@ -226,17 +201,6 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta this.quantity = quantity; } - @Override - public BigDecimal getTotalGross() - { - return totalGross; - } - - public void setTotalGross(BigDecimal totalGross) - { - this.totalGross = totalGross; - } - @Override public Product getProduct() { @@ -332,7 +296,7 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta // //////// TESTS ////////////////////////////////////////////////////////////////////////////////////////// /** - * The importer test imports from ./src/test/MustangGnuaccountingBeispielRE-20140703_502.pdf to check the values. + * The importer test imports from ./src/test/MustangGnuaccountingBeispielRE-20151008_504.pdf to check the values. * --> as only Name Ascending is supported for Test Unit sequence, I renamed the this test-A-Export to run before * testZExport * @@ -342,7 +306,7 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta public void testAImport() throws IOException { ZUGFeRDImporter zi = new ZUGFeRDImporter(); - InputStream inputStream = this.getClass().getResourceAsStream("/MustangGnuaccountingBeispielRE-20140703_502.pdf"); + InputStream inputStream = this.getClass().getResourceAsStream("/MustangGnuaccountingBeispielRE-20151008_504.pdf"); zi.extractLowLevel(inputStream); // Reading ZUGFeRD @@ -362,7 +326,7 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta ref = zi.getForeignReference(); } - assertEquals(amount, getTotalGross().toString()); + assertEquals(amount, "406.82"); assertEquals(bic, getOwnBIC()); assertEquals(iban, getOwnIBAN()); assertEquals(holder, getOwnOrganisationName()); @@ -428,7 +392,7 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta ref = zi.getForeignReference(); } - assertEquals(amount, getTotalGross().toString()); + assertEquals(amount, "406.82"); assertEquals(bic, getOwnBIC()); assertEquals(iban, getOwnIBAN()); assertEquals(holder, getOwnOrganisationName()); diff --git a/mustang/src/test/resources/MustangGnuaccountingBeispielRE-20140703_502.pdf b/mustang/src/test/resources/MustangGnuaccountingBeispielRE-20140703_502.pdf deleted file mode 100644 index 1fb653cf..00000000 Binary files a/mustang/src/test/resources/MustangGnuaccountingBeispielRE-20140703_502.pdf and /dev/null differ diff --git a/mustang/src/test/resources/MustangGnuaccountingBeispielRE-20151008_504.pdf b/mustang/src/test/resources/MustangGnuaccountingBeispielRE-20151008_504.pdf new file mode 100644 index 00000000..4e2f254f Binary files /dev/null and b/mustang/src/test/resources/MustangGnuaccountingBeispielRE-20151008_504.pdf differ