Commit 656d7bc006c9230beceef4940ed0922ab4cd88f7

Authored by Jay Berkenbilt
1 parent 731c4f71

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
... ... @@ -3100,7 +3100,7 @@ my @encrypted_files =
3100 3100 ['R3,V2', '', # 2
3101 3101 '-accessibility=n -extract=n -print=full -modify=all', -532,
3102 3102 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1],
3103   - ['R3,V2,U=view', 'view', # 3
  3103 + ['R3,V2,U=view,O=view', 'view', # 3
3104 3104 '-accessibility=y -extract=n -print=none -modify=none', -3392,
3105 3105 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0],
3106 3106 ['R3,V2,O=master', 'master', # 4
... ... @@ -3136,7 +3136,7 @@ my @encrypted_files =
3136 3136 ['R2,V1', '', # 14
3137 3137 '-print=n -modify=n -extract=n -annotate=n', -64,
3138 3138 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0],
3139   - ['R2,V1,U=view', 'view', # 15
  3139 + ['R2,V1,U=view,O=view', 'view', # 15
3140 3140 '-print=y -modify=n -extract=n -annotate=n', -60,
3141 3141 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 0],
3142 3142 ['R2,V1,O=master', 'master', # 16
... ... @@ -3342,12 +3342,13 @@ $td->runtest("non-encrypted",
3342 3342  
3343 3343 $td->runtest("invalid password",
3344 3344 {$td->COMMAND => "qpdf -qdf --password=quack" .
3345   - " enc-R2,V1,U=view.pdf a.qdf"},
3346   - {$td->STRING => "enc-R2,V1,U=view.pdf: invalid password\n",
  3345 + " enc-R2,V1,U=view,O=view.pdf a.qdf"},
  3346 + {$td->STRING => "enc-R2,V1,U=view,O=view.pdf: invalid password\n",
3347 3347 $td->EXIT_STATUS => 2},
3348 3348 $td->NORMALIZE_NEWLINES);
3349 3349 $td->runtest("C API: invalid password",
3350   - {$td->COMMAND => "qpdf-ctest 2 enc-R2,V1,U=view.pdf '' a.qdf"},
  3350 + {$td->COMMAND =>
  3351 + "qpdf-ctest 2 enc-R2,V1,U=view,O=view.pdf '' a.qdf"},
3351 3352 {$td->FILE => "c-invalid-password.out", $td->EXIT_STATUS => 0},
3352 3353 $td->NORMALIZE_NEWLINES);
3353 3354  
... ...
qpdf/qtest/qpdf/c-invalid-password.out
1   -error: enc-R2,V1,U=view.pdf: invalid password
  1 +error: enc-R2,V1,U=view,O=view.pdf: invalid password
2 2 code: 4
3   - file: enc-R2,V1,U=view.pdf
  3 + file: enc-R2,V1,U=view,O=view.pdf
4 4 pos : 0
5 5 text: invalid password
... ...
qpdf/qtest/qpdf/enc-R2,V1,U=view.pdf renamed to qpdf/qtest/qpdf/enc-R2,V1,U=view,O=view.pdf
No preview for this file type
qpdf/qtest/qpdf/enc-R3,V2,U=view.pdf renamed to qpdf/qtest/qpdf/enc-R3,V2,U=view,O=view.pdf
No preview for this file type