aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Berkenbilt <ejb@ql.org>2018-06-22 22:13:42 +0200
committerJay Berkenbilt <ejb@ql.org>2018-06-22 22:14:54 +0200
commitc852af2a570e67dfe6a275f4d3866191fec36829 (patch)
tree362b522142f69ae1d0b26e292a25796699e79ef9
parentd34ab8a936d8198c86efa84b214c21e93e0cbbf5 (diff)
downloadqpdf-c852af2a570e67dfe6a275f4d3866191fec36829.tar.zst
Add tests for progress and verbose changes
-rw-r--r--qpdf/qtest/qpdf.test6
-rw-r--r--qpdf/qtest/qpdf/filter-progress.pl23
-rw-r--r--qpdf/qtest/qpdf/verbose-merge.out14
3 files changed, 41 insertions, 2 deletions
diff --git a/qpdf/qtest/qpdf.test b/qpdf/qtest/qpdf.test
index f1ef3a1d..6a71fab8 100644
--- a/qpdf/qtest/qpdf.test
+++ b/qpdf/qtest/qpdf.test
@@ -1235,8 +1235,10 @@ my $pages_options = "--pages page-labels-and-outlines.pdf 1,3,5-7,z" .
$td->runtest("merge three files",
{$td->COMMAND => "qpdf page-labels-and-outlines.pdf a.pdf" .
- " $pages_options --static-id"},
- {$td->STRING => "", $td->EXIT_STATUS => 0});
+ " $pages_options --static-id --verbose --progress",
+ $td->FILTER => "perl filter-progress.pl"},
+ {$td->FILE => "verbose-merge.out", $td->EXIT_STATUS => 0},
+ $td->NORMALIZE_NEWLINES);
# Manually verified about this file: make sure that outline entries
# that pointed to pages that were preserved still work in the copy,
# and verify that all pages are as expected. page-labels-and-outlines
diff --git a/qpdf/qtest/qpdf/filter-progress.pl b/qpdf/qtest/qpdf/filter-progress.pl
new file mode 100644
index 00000000..97453fcb
--- /dev/null
+++ b/qpdf/qtest/qpdf/filter-progress.pl
@@ -0,0 +1,23 @@
+use strict;
+use warnings;
+
+my $seen = 0;
+while (<>)
+{
+ if (m/write progress: (?:10)?0\%/)
+ {
+ print;
+ }
+ elsif (m/write progress: /)
+ {
+ if (! $seen)
+ {
+ $seen = 1;
+ print "....other write progress....\n";
+ }
+ }
+ else
+ {
+ print;
+ }
+}
diff --git a/qpdf/qtest/qpdf/verbose-merge.out b/qpdf/qtest/qpdf/verbose-merge.out
new file mode 100644
index 00000000..ae8c3113
--- /dev/null
+++ b/qpdf/qtest/qpdf/verbose-merge.out
@@ -0,0 +1,14 @@
+qpdf: processing 20-pages.pdf
+qpdf: processing ./20-pages.pdf
+qpdf: processing minimal.pdf
+qpdf: removing unreferenced pages from primary input
+qpdf: adding pages from page-labels-and-outlines.pdf
+qpdf: adding pages from 20-pages.pdf
+qpdf: adding pages from page-labels-and-outlines.pdf
+qpdf: adding pages from 20-pages.pdf
+qpdf: adding pages from ./20-pages.pdf
+qpdf: adding pages from minimal.pdf
+qpdf: a.pdf: write progress: 0%
+....other write progress....
+qpdf: a.pdf: write progress: 100%
+qpdf: wrote file a.pdf