louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation errors mainly due to merge conflicts

Browse Source
This commit is contained in:
Yannik Hampe
2017-06-09 15:06:27 +02:00
parent a47bf95ea6
commit 366c2a3228
6 changed files with 85 additions and 1144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java
View File

@@ -401,22 +401,19 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp
public void testZExport() throws Exception
{
final String TARGET_PDF = "./target/testout-MustangGnuaccountingBeispielRE-20170509_505newEdge.pdf";
final String TARGET_PDF = "./target/testout-MustangGnuaccountingBeispielRE-20170509_505newEdge.pdf";
// the writing part
ZUGFeRDExporter ze = null;
try {
// automatically add Zugferd to all outgoing invoices
ze = new ZUGFeRDExporterFromA1Factory()
try(InputStream SOURCE_PDF =
this.getClass().getResourceAsStream("/MustangGnuaccountingBeispielRE-20170509_505blanko.pdf");
ZUGFeRDExporter ze = new ZUGFeRDExporterFromA1Factory()
.setProducer("My Application")
.setCreator(System.getProperty("user.name"))
.loadFromPDFA1(SOURCE_PDF);
.loadFromPDFA1(SOURCE_PDF)) {
ze.PDFattachZugferdFile(this);
ze.export(TARGET_PDF);
} finally {
if (ze != null) {
ze.close();
}
}
// now check the contents (like MustangReaderTest)

16
src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java
View File

@@ -402,23 +402,19 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta
public void testZExport() throws Exception
{
final String TARGET_PDF = "./target/testout-MustangGnuaccountingBeispielRE-20170509_505new.pdf";
final String TARGET_PDF = "./target/testout-MustangGnuaccountingBeispielRE-20170509_505new.pdf";
// the writing part
ZUGFeRDExporter ze = null;
try {
// automatically add Zugferd to all outgoing invoices
ze = new ZUGFeRDExporterFromA1Factory()
try(InputStream SOURCE_PDF =
this.getClass().getResourceAsStream("/MustangGnuaccountingBeispielRE-20170509_505blanko.pdf");
ZUGFeRDExporter ze = new ZUGFeRDExporterFromA1Factory()
.setProducer("My Application")
.setCreator(System.getProperty("user.name"))
.loadFromPDFA1(SOURCE_PDF);
.loadFromPDFA1(SOURCE_PDF)) {
ze.PDFattachZugferdFile(this);
ze.export(TARGET_PDF);
} finally {
if (ze != null) {
ze.close();
}
}
// now check the contents (like MustangReaderTest)