From 656d7bc006c9230beceef4940ed0922ab4cd88f7 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Sun, 26 Jan 2020 14:38:44 -0500 Subject: Rename test files This change makes it possible to get both the user and owner password from the file name of all the encryption test files. --- qpdf/qtest/qpdf.test | 11 ++++++----- qpdf/qtest/qpdf/c-invalid-password.out | 4 ++-- qpdf/qtest/qpdf/enc-R2,V1,U=view,O=view.pdf | Bin 0 -> 17137 bytes qpdf/qtest/qpdf/enc-R2,V1,U=view.pdf | Bin 17137 -> 0 bytes qpdf/qtest/qpdf/enc-R3,V2,U=view,O=view.pdf | Bin 0 -> 17142 bytes qpdf/qtest/qpdf/enc-R3,V2,U=view.pdf | Bin 17142 -> 0 bytes 6 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 qpdf/qtest/qpdf/enc-R2,V1,U=view,O=view.pdf delete mode 100644 qpdf/qtest/qpdf/enc-R2,V1,U=view.pdf create mode 100644 qpdf/qtest/qpdf/enc-R3,V2,U=view,O=view.pdf delete mode 100644 qpdf/qtest/qpdf/enc-R3,V2,U=view.pdf diff --git a/qpdf/qtest/qpdf.test b/qpdf/qtest/qpdf.test index 78184971..57308291 100644 --- a/qpdf/qtest/qpdf.test +++ b/qpdf/qtest/qpdf.test @@ -3100,7 +3100,7 @@ my @encrypted_files = ['R3,V2', '', # 2 '-accessibility=n -extract=n -print=full -modify=all', -532, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1], - ['R3,V2,U=view', 'view', # 3 + ['R3,V2,U=view,O=view', 'view', # 3 '-accessibility=y -extract=n -print=none -modify=none', -3392, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0], ['R3,V2,O=master', 'master', # 4 @@ -3136,7 +3136,7 @@ my @encrypted_files = ['R2,V1', '', # 14 '-print=n -modify=n -extract=n -annotate=n', -64, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0], - ['R2,V1,U=view', 'view', # 15 + ['R2,V1,U=view,O=view', 'view', # 15 '-print=y -modify=n -extract=n -annotate=n', -60, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0], ['R2,V1,O=master', 'master', # 16 @@ -3342,12 +3342,13 @@ $td->runtest("non-encrypted", $td->runtest("invalid password", {$td->COMMAND => "qpdf -qdf --password=quack" . - " enc-R2,V1,U=view.pdf a.qdf"}, - {$td->STRING => "enc-R2,V1,U=view.pdf: invalid password\n", + " enc-R2,V1,U=view,O=view.pdf a.qdf"}, + {$td->STRING => "enc-R2,V1,U=view,O=view.pdf: invalid password\n", $td->EXIT_STATUS => 2}, $td->NORMALIZE_NEWLINES); $td->runtest("C API: invalid password", - {$td->COMMAND => "qpdf-ctest 2 enc-R2,V1,U=view.pdf '' a.qdf"}, + {$td->COMMAND => + "qpdf-ctest 2 enc-R2,V1,U=view,O=view.pdf '' a.qdf"}, {$td->FILE => "c-invalid-password.out", $td->EXIT_STATUS => 0}, $td->NORMALIZE_NEWLINES); diff --git a/qpdf/qtest/qpdf/c-invalid-password.out b/qpdf/qtest/qpdf/c-invalid-password.out index 679643f0..c7aa8b1a 100644 --- a/qpdf/qtest/qpdf/c-invalid-password.out +++ b/qpdf/qtest/qpdf/c-invalid-password.out @@ -1,5 +1,5 @@ -error: enc-R2,V1,U=view.pdf: invalid password +error: enc-R2,V1,U=view,O=view.pdf: invalid password code: 4 - file: enc-R2,V1,U=view.pdf + file: enc-R2,V1,U=view,O=view.pdf pos : 0 text: invalid password diff --git a/qpdf/qtest/qpdf/enc-R2,V1,U=view,O=view.pdf b/qpdf/qtest/qpdf/enc-R2,V1,U=view,O=view.pdf new file mode 100644 index 00000000..d99bf6f8 Binary files /dev/null and b/qpdf/qtest/qpdf/enc-R2,V1,U=view,O=view.pdf differ diff --git a/qpdf/qtest/qpdf/enc-R2,V1,U=view.pdf b/qpdf/qtest/qpdf/enc-R2,V1,U=view.pdf deleted file mode 100644 index d99bf6f8..00000000 Binary files a/qpdf/qtest/qpdf/enc-R2,V1,U=view.pdf and /dev/null differ diff --git a/qpdf/qtest/qpdf/enc-R3,V2,U=view,O=view.pdf b/qpdf/qtest/qpdf/enc-R3,V2,U=view,O=view.pdf new file mode 100644 index 00000000..a4efba7a Binary files /dev/null and b/qpdf/qtest/qpdf/enc-R3,V2,U=view,O=view.pdf differ diff --git a/qpdf/qtest/qpdf/enc-R3,V2,U=view.pdf b/qpdf/qtest/qpdf/enc-R3,V2,U=view.pdf deleted file mode 100644 index a4efba7a..00000000 Binary files a/qpdf/qtest/qpdf/enc-R3,V2,U=view.pdf and /dev/null differ -- cgit v1.2.3-54-g00ecf