Author: msahyoun
Date: Tue Dec 29 14:17:41 2020
New Revision: 1884909
URL: http://svn.apache.org/viewvc?rev=1884909&view=rev
Log:
PDFBOX-2602: fix test; remove obsolete test method
Modified:
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java
pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/TestExtractText.java
Modified:
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java?rev=1884909&r1=1884908&r2=1884909&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java
(original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java
Tue Dec 29 14:17:41 2020
@@ -109,7 +109,7 @@ public final class ExtractText implemen
@Option(names = {"-i", "--input"}, description = "the PDF file", required
= true)
private File infile;
- @Option(names = {"-o", "--output"}, description = "the exported text
file", required = true)
+ @Option(names = {"-o", "--output"}, description = "the exported text file")
private File outfile;
/**
@@ -126,15 +126,6 @@ public final class ExtractText implemen
System.exit(exitCode);
}
- /*
- * For testing as SureFire doesn't support testing methods which
- * call System.exit
- */
- static int test (String[] args)
- {
- return new CommandLine(new ExtractText()).execute(args);
- }
-
/**
* Starts the text extraction.
*
@@ -256,7 +247,8 @@ public final class ExtractText implemen
}
catch (IOException ioe)
{
- SYSERR.println( "Error extracting test for document: " +
ioe.getMessage());
+ System.out.println(ioe.getMessage());
+ SYSERR.println( "Error extracting text for document: " +
ioe.getMessage());
return 4;
}
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java?rev=1884909&r1=1884908&r2=1884909&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java
(original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFBox.java Tue
Dec 29 14:17:41 2020
@@ -32,27 +32,6 @@ import picocli.CommandLine.Spec;
footer = {
"See 'pdfbox help <command>' to read about a specific subcommand"
},
- subcommands = {
- PDFDebugger.class,
- Decrypt.class,
- Encrypt.class,
- ExportFDF.class,
- ExportXFDF.class,
- ImportFDF.class,
- ImportXFDF.class,
- ExtractText.class,
- ExtractImages.class,
- OverlayPDF.class,
- PrintPDF.class,
- PDFMerger.class,
- PDFSplit.class,
- PDFToImage.class,
- ImageToPDF.class,
- TextToPDF.class,
- WriteDecodedDoc.class,
- Version.class,
- CommandLine.HelpCommand.class
- },
versionProvider = Version.class)
public final class PDFBox implements Runnable
{
@@ -68,7 +47,28 @@ public final class PDFBox implements Run
// suppress the Dock icon on OS X
System.setProperty("apple.awt.UIElement", "true");
- new CommandLine(new
PDFBox()).setSubcommandsCaseInsensitive(true).execute(args);
+ CommandLine commandLine = new CommandLine(new
PDFBox()).setSubcommandsCaseInsensitive(true);
+ commandLine.addSubcommand("debug", PDFDebugger.class);
+ commandLine.addSubcommand("decrypt", Decrypt.class);
+ commandLine.addSubcommand("encrypt", Encrypt.class);
+ commandLine.addSubcommand("decode", WriteDecodedDoc.class);
+ commandLine.addSubcommand("export:images", ExtractText.class);
+ commandLine.addSubcommand("export:text", ExtractImages.class);
+ commandLine.addSubcommand("export:fdf", ExportFDF.class);
+ commandLine.addSubcommand("export:xfdf", ExportXFDF.class);
+ commandLine.addSubcommand("import:fdf", ImportFDF.class);
+ commandLine.addSubcommand("import:xfdf", ImportXFDF.class);
+ commandLine.addSubcommand("overlay", OverlayPDF.class);
+ commandLine.addSubcommand("print", PrintPDF.class);
+ commandLine.addSubcommand("render", PDFToImage.class);
+ commandLine.addSubcommand("merge", PDFMerger.class);
+ commandLine.addSubcommand("split", PDFSplit.class);
+ commandLine.addSubcommand("fromimage", ImageToPDF.class);
+ commandLine.addSubcommand("fromtext", TextToPDF.class);
+ commandLine.addSubcommand("version", Version.class);
+ commandLine.addSubcommand("help", CommandLine.HelpCommand.class);
+
+ commandLine.execute(args);
}
@Override
Modified:
pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/TestExtractText.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/TestExtractText.java?rev=1884909&r1=1884908&r2=1884909&view=diff
==============================================================================
---
pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/TestExtractText.java
(original)
+++
pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/TestExtractText.java
Tue Dec 29 14:17:41 2020
@@ -16,6 +16,7 @@
*/
package org.apache.pdfbox.tools;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.ByteArrayOutputStream;
@@ -23,6 +24,8 @@ import java.io.PrintStream;
import org.junit.jupiter.api.Test;
+import picocli.CommandLine;
+
/**
* Test suite for ExtractText.
@@ -43,8 +46,11 @@ class TestExtractText
System.setOut(new PrintStream(outBytes));
try
{
- ExtractText.test(new
String[]{"src/test/resources/org/apache/pdfbox/testPDFPackage.pdf",
- "-console", "-encoding", "UTF-8"});
+ ExtractText app = new ExtractText();
+ CommandLine cmd = new CommandLine(app);
+ int exitCode = cmd.execute("-i",
"src/test/resources/org/apache/pdfbox/testPDFPackage.pdf",
+ "-console", "-encoding", "UTF-8");
+ assertEquals(0, exitCode);
}
finally
{
