You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2021/01/15 16:05:57 UTC
svn commit: r1885527 - in /pdfbox/trunk/examples/src:
main/java/org/apache/pdfbox/examples/interactive/form/
test/java/org/apache/pdfbox/examples/interactive/form/
test/java/org/apache/pdfbox/examples/pdmodel/
Author: tilman
Date: Fri Jan 15 16:05:57 2021
New Revision: 1885527
URL: http://svn.apache.org/viewvc?rev=1885527&view=rev
Log:
PDFBOX-5017: generate different files for different tests
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/interactive/form/AddBorderToField.java
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/interactive/form/CreateSimpleForm.java
pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/interactive/form/TestCreateSimpleForms.java
pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/interactive/form/AddBorderToField.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/interactive/form/AddBorderToField.java?rev=1885527&r1=1885526&r2=1885527&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/interactive/form/AddBorderToField.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/interactive/form/AddBorderToField.java Fri Jan 15 16:05:57 2021
@@ -40,6 +40,8 @@ import org.apache.pdfbox.pdmodel.interac
*/
public final class AddBorderToField
{
+ static final String RESULT_FILENAME = "target/AddBorderToField.pdf";
+
private AddBorderToField()
{
}
@@ -47,7 +49,7 @@ public final class AddBorderToField
public static void main(String[] args) throws IOException
{
// Load the PDF document created by SimpleForm.java
- try (PDDocument document = Loader.loadPDF(new File("target/SimpleForm.pdf")))
+ try (PDDocument document = Loader.loadPDF(new File(CreateSimpleForm.DEFAULT_FILENAME)))
{
PDAcroForm acroForm = document.getDocumentCatalog().getAcroForm();
@@ -66,7 +68,7 @@ public final class AddBorderToField
// for the visual style of the form field.
widget.setAppearanceCharacteristics(fieldAppearance);
- document.save("target/AddBorderToField.pdf");
+ document.save(RESULT_FILENAME);
}
}
}
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/interactive/form/CreateSimpleForm.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/interactive/form/CreateSimpleForm.java?rev=1885527&r1=1885526&r2=1885527&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/interactive/form/CreateSimpleForm.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/interactive/form/CreateSimpleForm.java Fri Jan 15 16:05:57 2021
@@ -44,6 +44,8 @@ import org.apache.pdfbox.pdmodel.interac
*/
public final class CreateSimpleForm
{
+ static final String DEFAULT_FILENAME = "target/SimpleForm.pdf";
+
private CreateSimpleForm()
{
}
@@ -125,7 +127,14 @@ public final class CreateSimpleForm
cs.endText();
}
- document.save("target/SimpleForm.pdf");
+ if (args == null || args.length == 0)
+ {
+ document.save(DEFAULT_FILENAME);
+ }
+ else
+ {
+ document.save(args[0]); // used for concurrent build tests
+ }
}
}
}
Modified: pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/interactive/form/TestCreateSimpleForms.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/interactive/form/TestCreateSimpleForms.java?rev=1885527&r1=1885526&r2=1885527&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/interactive/form/TestCreateSimpleForms.java (original)
+++ pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/interactive/form/TestCreateSimpleForms.java Fri Jan 15 16:05:57 2021
@@ -44,12 +44,15 @@ import org.apache.pdfbox.pdmodel.interac
import org.apache.pdfbox.pdmodel.interactive.form.PDTextField;
import org.apache.pdfbox.rendering.PDFRenderer;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
/**
* Test of some the form examples.
*
* @author Tilman Hausherr
*/
+@Execution(ExecutionMode.CONCURRENT)
class TestCreateSimpleForms
{
@@ -61,8 +64,10 @@ class TestCreateSimpleForms
@Test
void testCreateSimpleForm() throws IOException
{
- CreateSimpleForm.main(null);
- try (PDDocument doc = Loader.loadPDF(new File("target/SimpleForm.pdf")))
+ String filename = "target/TestCreateSimpleForm.pdf";
+ CreateSimpleForm.main(new String[] { filename });
+
+ try (PDDocument doc = Loader.loadPDF(new File(filename)))
{
new PDFRenderer(doc).renderImage(0);
PDAcroForm acroForm = doc.getDocumentCatalog().getAcroForm();
@@ -88,7 +93,7 @@ class TestCreateSimpleForms
{
CreateSimpleForm.main(null);
- try (PDDocument doc = Loader.loadPDF(new File("target/SimpleForm.pdf")))
+ try (PDDocument doc = Loader.loadPDF(new File(CreateSimpleForm.DEFAULT_FILENAME)))
{
PDAcroForm acroForm = doc.getDocumentCatalog().getAcroForm();
PDTextField textBox = (PDTextField) acroForm.getField("SampleField");
@@ -104,7 +109,7 @@ class TestCreateSimpleForms
AddBorderToField.main(null);
- try (PDDocument doc = Loader.loadPDF(new File("target/AddBorderToField.pdf")))
+ try (PDDocument doc = Loader.loadPDF(new File(AddBorderToField.RESULT_FILENAME)))
{
new PDFRenderer(doc).renderImage(0);
PDAcroForm acroForm = doc.getDocumentCatalog().getAcroForm();
Modified: pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java?rev=1885527&r1=1885526&r2=1885527&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java (original)
+++ pdfbox/trunk/examples/src/test/java/org/apache/pdfbox/examples/pdmodel/TestCreateSignature.java Fri Jan 15 16:05:57 2021
@@ -134,6 +134,7 @@ class TestCreateSignature
private static final String JPEG_PATH = IN_DIR + "stamp.jpg";
private static final String PASSWORD = "123456";
private static final String TSA_RESPONSE = "tsa_response.asn1";
+ private static final String SIMPLE_FORM_FILENAME = "target/TestCreateSignatureSimpleForm.pdf";
private static CertificateFactory certificateFactory = null;
private static KeyStore keyStore = null;
@@ -165,7 +166,7 @@ class TestCreateSignature
certificate = keyStore.getCertificateChain(keyStore.aliases().nextElement())[0];
tsa = System.getProperty("org.apache.pdfbox.examples.pdmodel.tsa");
- CreateSimpleForm.main(new String[0]); // creates "target/SimpleForm.pdf"
+ CreateSimpleForm.main(new String[] { SIMPLE_FORM_FILENAME });
}
/**
@@ -613,9 +614,9 @@ class TestCreateSignature
try
{
LOG.info("huhu1: " + new File(OUT_DIR + fileNameSigned));
- signing.signDetached(new File("target/SimpleForm.pdf"), new File(OUT_DIR + fileNameSigned));
+ signing.signDetached(new File(SIMPLE_FORM_FILENAME), new File(OUT_DIR + fileNameSigned));
- checkSignature(new File("target/SimpleForm.pdf"), new File(OUT_DIR, fileNameSigned), false);
+ checkSignature(new File(SIMPLE_FORM_FILENAME), new File(OUT_DIR, fileNameSigned), false);
LOG.info("huhu3: " + new File(OUT_DIR + fileNameSigned));
}
catch (Exception ex)
@@ -658,7 +659,7 @@ class TestCreateSignature
appearance.getNormalAppearance().getCOSObject().setNeedToBeUpdated(true);
doc.saveIncremental(fileOutputStream);
}
- checkSignature(new File("target/SimpleForm.pdf"), new File(OUT_DIR, fileNameResaved1), false);
+ checkSignature(new File(SIMPLE_FORM_FILENAME), new File(OUT_DIR, fileNameResaved1), false);
try (PDDocument doc = Loader.loadPDF(new File(OUT_DIR, fileNameResaved1)))
{
PDField field = doc.getDocumentCatalog().getAcroForm().getField("SampleField");
@@ -696,7 +697,7 @@ class TestCreateSignature
objectsToWrite.add(field.getWidgets().get(0).getAppearance().getNormalAppearance().getCOSObject());
doc.saveIncremental(fileOutputStream, objectsToWrite);
}
- checkSignature(new File("target/SimpleForm.pdf"), new File(OUT_DIR, fileNameResaved2), false);
+ checkSignature(new File(SIMPLE_FORM_FILENAME), new File(OUT_DIR, fileNameResaved2), false);
try (PDDocument doc = Loader.loadPDF(new File(OUT_DIR, fileNameResaved2)))
{
PDField field = doc.getDocumentCatalog().getAcroForm().getField("SampleField");