From b7cb36aba7d32c506ee921cb7558b8effd4b2fa1 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 13 Feb 2015 16:54:48 -0800 Subject: Merge to XFA: Run javascript/pixel tests via automated script. This pulls in: 7435e8e Run pixel tests via automated script. 83c87e5 run_javascript_tests.py: Be more flexible about directory layout. 5898509 Test top-level Document JS properties. 9f93baf Create run_javascript_tests.py TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/923293002 --- testing/resources/javascript/app_alert.pdf | 60 --------- testing/resources/javascript/consts.pdf | 86 ------------- testing/resources/javascript/document_props.in | 143 +++++++++++++++++++++ .../javascript/document_props_expected.txt | 97 ++++++++++++++ .../resources/pixel/font_size_expected.pdf.0.ppm | Bin 0 -> 120033 bytes testing/tools/fixup_pdf_template.py | 26 ++-- testing/tools/run_javascript_tests.py | 92 +++++++++++++ testing/tools/run_pixel_tests.py | 99 ++++++++++++++ 8 files changed, 449 insertions(+), 154 deletions(-) delete mode 100644 testing/resources/javascript/app_alert.pdf delete mode 100644 testing/resources/javascript/consts.pdf create mode 100644 testing/resources/javascript/document_props.in create mode 100644 testing/resources/javascript/document_props_expected.txt create mode 100644 testing/resources/pixel/font_size_expected.pdf.0.ppm create mode 100755 testing/tools/run_javascript_tests.py create mode 100755 testing/tools/run_pixel_tests.py (limited to 'testing') diff --git a/testing/resources/javascript/app_alert.pdf b/testing/resources/javascript/app_alert.pdf deleted file mode 100644 index 091992cbd7..0000000000 --- a/testing/resources/javascript/app_alert.pdf +++ /dev/null @@ -1,60 +0,0 @@ -%PDF-1.7 -% ò¤ô -1 0 obj << - /Type /Catalog - /Pages 2 0 R - /OpenAction 10 0 R ->> -endobj -2 0 obj << - /Type /Pages - /Count 1 - /Kids [ - 3 0 R - ] ->> -endobj -% Page number 0. -3 0 obj << - /Type /Page - /Parent 2 0 R - /Resources << - /Font <> - >> - /Contents [21 0 R] - /MediaBox [0 0 612 792] ->> -% OpenAction action -10 0 obj << - /Type /Action - /S /JavaScript - /JS 11 0 R ->> -endobj -% JS program to exexute -11 0 obj << ->> -stream -app.alert("This test passes if alert() logs output under the test utiltiy."); -endstream -endobj -xref -0 12 -0000000000 65535 f -0000000015 00000 n -0000000089 00000 n -0000000177 00000 n -0000000000 65535 f -0000000000 65535 f -0000000000 65535 f -0000000000 65535 f -0000000000 65535 f -0000000000 65535 f -0000000334 00000 n -0000000426 00000 n -trailer << - /Root 1 0 R ->> -startxref -543 -%%EOF diff --git a/testing/resources/javascript/consts.pdf b/testing/resources/javascript/consts.pdf deleted file mode 100644 index 0e436e5bab..0000000000 --- a/testing/resources/javascript/consts.pdf +++ /dev/null @@ -1,86 +0,0 @@ -%PDF-1.7 -% ò¤ô -1 0 obj << - /Type /Catalog - /Pages 2 0 R - /OpenAction 10 0 R ->> -endobj -2 0 obj << - /Type /Pages - /Count 1 - /Kids [ - 3 0 R - ] ->> -endobj -% Page number 0. -3 0 obj << - /Type /Page - /Parent 2 0 R - /Resources << - /Font <> - >> - /Contents [21 0 R] - /MediaBox [0 0 612 792] ->> -% OpenAction action -10 0 obj << - /Type /Action - /S /JavaScript - /JS 11 0 R ->> -endobj -% JS program to exexute -11 0 obj << ->> -stream - -function doTest(name, props) { - for (var i = 0; i < props.length; ++i) { - var expr = name + "." + props[i]; - app.alert(expr + " is " + eval(expr)); - } -} - -try { - doTest("border", ["s", "b", "d", "i", "u", "nonesuch"]); - doTest("display", ["visible", "hidden", "noPrint", "noView", "nonesuch"]); - doTest("font", ["Times", "TimesB", "TimesI", "TimesBI", "Helv", "HelvB", - "HelvI", "HelvBI", "Cour", "CourB", "CourI", "CourBI", - "Symbol", "ZapfD", "Nonesuch"]); - - doTest("highlight", ["n", "i", "p", "o", "nonesuch"]); - doTest("position", ["textOnly", "iconOnly", "iconTextV", "textIconV", - "iconTextH", "textIconH", "overlay", "nonesuch"]); - - doTest("scaleHow", ["proportional", "anamorphic", "nonesuch"]); - doTest("scaleWhen", ["always", "never", "tooBig", "tooSmall", "nonesuch"]); - doTest("style", ["ch", "cr", "di", "ci", "st", "sq", "nonesuch"]); - doTest("zoomtype", ["none", "fitP", "fitW", "fitH", "fitV", "pref", "refW", - "nonesuch"]); -} catch (e) { - app.alert("ERROR: " + e.toString()); -} -endstream -endobj -xref -0 12 -0000000000 65535 f -0000000015 00000 n -0000000089 00000 n -0000000177 00000 n -0000000000 65535 f -0000000000 65535 f -0000000000 65535 f -0000000000 65535 f -0000000000 65535 f -0000000000 65535 f -0000000334 00000 n -0000000426 00000 n -trailer << - /Root 1 0 R ->> -startxref -1555 -%%EOF diff --git a/testing/resources/javascript/document_props.in b/testing/resources/javascript/document_props.in new file mode 100644 index 0000000000..8ab7e3d566 --- /dev/null +++ b/testing/resources/javascript/document_props.in @@ -0,0 +1,143 @@ +{{header}} +{{object 1 0}} << + /Type /Catalog + /Pages 2 0 R + /OpenAction 10 0 R +>> +endobj +{{object 2 0}} << + /Type /Pages + /Count 4 + /Kids [ + 3 0 R + 4 0 R + 5 0 R + 6 0 R + ] +>> +endobj +% Page number 0. +{{object 3 0}} << + /Type /Page + /Parent 2 0 R + /Resources << + /Font <> + >> + /MediaBox [0 0 612 792] +>> +% Page number 1. +{{object 4 0}} << + /Type /Page + /Parent 2 0 R + /Resources << + /Font <> + >> + /MediaBox [0 0 612 792] +>> +% Page number 2. +{{object 5 0}} << + /Type /Page + /Parent 2 0 R + /Resources << + /Font <> + >> + /MediaBox [0 0 612 792] +>> +% Page number 3. +{{object 6 0}} << + /Type /Page + /Parent 2 0 R + /Resources << + /Font <> + >> + /MediaBox [0 0 612 792] +>> + +% Info +{{object 9 0}} << + /Author (Joe Random Author) + /Creator (Joe Random Creator) +>> +endobj +% OpenAction action +{{object 10 0}} << + /Type /Action + /S /JavaScript + /JS 11 0 R +>> +endobj +% JS program to exexute +{{object 11 0}} << +>> +stream +var document_props = [ + 'ADBE', + 'author', + 'baseURL', + 'bookmarkRoot', + 'calculate', + 'Collab', + 'creationDate', + 'creator', + 'delay', + 'dirty', + 'documentFileName', + 'external', + 'filesize', + 'icons', + 'info', + 'keywords', + 'layout', + 'media', + 'modDate', + 'mouseX', + 'mouseY', + 'numFields', + 'numPages', + 'pageNum', + 'pageWindowRect', + 'path', + 'producer', + 'subject', + 'title', + 'zoom', + 'zoomType', +]; + +function testGetProps(props) { + try { + app.alert('*** Getting properties ***'); + for (var i = 0; i < props.length; ++i) { + var expr1 = "this." + props[i]; + var expr2 = "typeof " + expr1; + app.alert(expr1 + " is " + eval(expr2) + ' ' + eval(expr1)); + } + } catch (e) { + app.alert("ERROR: " + e.toString()); + } +} + +function testSetProps(props) { + try { + app.alert('*** Setting properties ***'); + for (var i = 0; i < props.length; ++i) { + var expr1 = "this." + props[i] + ' = 3;' + app.alert(expr1 + " yields " + eval(expr1)); + } + } catch (e) { + app.alert("ERROR: " + e.toString()); + } +} + +testGetProps(document_props); +testSetProps(document_props); +testGetProps(document_props); +endstream +endobj +{{xref}} +trailer << + /Root 1 0 R + /Info 9 0 R +>> +{{startxref}} +%%EOF diff --git a/testing/resources/javascript/document_props_expected.txt b/testing/resources/javascript/document_props_expected.txt new file mode 100644 index 0000000000..38bea97acb --- /dev/null +++ b/testing/resources/javascript/document_props_expected.txt @@ -0,0 +1,97 @@ +Alert: *** Getting properties *** +Alert: this.ADBE is undefined undefined +Alert: this.author is string Joe Random Author +Alert: this.baseURL is string +Alert: this.bookmarkRoot is undefined undefined +Alert: this.calculate is boolean true +Alert: this.Collab is undefined undefined +Alert: this.creationDate is string +Alert: this.creator is string Joe Random Creator +Alert: this.delay is number 0 +Alert: this.dirty is boolean false +Alert: this.documentFileName is string +Alert: this.external is number 1 +Alert: this.filesize is number 0 +Alert: this.icons is undefined undefined +Alert: this.info is object [object Object] +Alert: this.keywords is string +Alert: this.layout is undefined undefined +Alert: this.media is undefined undefined +Alert: this.modDate is string +Alert: this.mouseX is undefined undefined +Alert: this.mouseY is undefined undefined +Alert: this.numFields is number 0 +Alert: this.numPages is number 4 +Alert: this.pageNum is undefined undefined +Alert: this.pageWindowRect is undefined undefined +Alert: this.path is string / +Alert: this.producer is string +Alert: this.subject is string +Alert: this.title is string +Alert: this.zoom is undefined undefined +Alert: this.zoomType is undefined undefined +Alert: *** Setting properties *** +Alert: this.ADBE = 3; yields 3 +Alert: this.author = 3; yields 3 +Alert: this.baseURL = 3; yields 3 +Alert: this.bookmarkRoot = 3; yields 3 +Alert: this.calculate = 3; yields 3 +Alert: this.Collab = 3; yields 3 +Alert: this.creationDate = 3; yields 3 +Alert: this.creator = 3; yields 3 +Alert: this.delay = 3; yields 3 +Alert: this.dirty = 3; yields 3 +Alert: this.documentFileName = 3; yields 3 +Alert: this.external = 3; yields 3 +Alert: this.filesize = 3; yields 3 +Alert: this.icons = 3; yields 3 +Alert: this.info = 3; yields 3 +Alert: this.keywords = 3; yields 3 +Alert: this.layout = 3; yields 3 +Alert: this.media = 3; yields 3 +Alert: this.modDate = 3; yields 3 +Alert: this.mouseX = 3; yields 3 +Alert: this.mouseY = 3; yields 3 +Alert: this.numFields = 3; yields 3 +Alert: this.numPages = 3; yields 3 +Goto Page: 3 +Alert: this.pageNum = 3; yields 3 +Alert: this.pageWindowRect = 3; yields 3 +Alert: this.path = 3; yields 3 +Alert: this.producer = 3; yields 3 +Alert: this.subject = 3; yields 3 +Alert: this.title = 3; yields 3 +Alert: this.zoom = 3; yields 3 +Alert: this.zoomType = 3; yields 3 +Alert: *** Getting properties *** +Alert: this.ADBE is undefined undefined +Alert: this.author is string 3 +Alert: this.baseURL is string 3 +Alert: this.bookmarkRoot is undefined undefined +Alert: this.calculate is boolean true +Alert: this.Collab is undefined undefined +Alert: this.creationDate is string 3 +Alert: this.creator is string 3 +Alert: this.delay is number 1 +Alert: this.dirty is boolean true +Alert: this.documentFileName is string +Alert: this.external is number 1 +Alert: this.filesize is number 0 +Alert: this.icons is undefined undefined +Alert: this.info is object [object Object] +Alert: this.keywords is string 3 +Alert: this.layout is undefined undefined +Alert: this.media is undefined undefined +Alert: this.modDate is string 3 +Alert: this.mouseX is undefined undefined +Alert: this.mouseY is undefined undefined +Alert: this.numFields is number 0 +Alert: this.numPages is number 4 +Alert: this.pageNum is undefined undefined +Alert: this.pageWindowRect is undefined undefined +Alert: this.path is string / +Alert: this.producer is string 3 +Alert: this.subject is string 3 +Alert: this.title is string 3 +Alert: this.zoom is undefined undefined +Alert: this.zoomType is undefined undefined diff --git a/testing/resources/pixel/font_size_expected.pdf.0.ppm b/testing/resources/pixel/font_size_expected.pdf.0.ppm new file mode 100644 index 0000000000..a433b39c44 Binary files /dev/null and b/testing/resources/pixel/font_size_expected.pdf.0.ppm differ diff --git a/testing/tools/fixup_pdf_template.py b/testing/tools/fixup_pdf_template.py index 87996a42cd..a43db55ee9 100755 --- a/testing/tools/fixup_pdf_template.py +++ b/testing/tools/fixup_pdf_template.py @@ -70,22 +70,32 @@ class TemplateProcessor: self.offset += len(line) return line -def expand_file(input_filename): - (input_root, extension) = os.path.splitext(input_filename) - output_filename = input_root + '.pdf' + +def expand_file(input_path, output_path): processor = TemplateProcessor() try: - with open(input_filename, 'r') as infile: - with open(output_filename, 'w') as outfile: + with open(input_path, 'r') as infile: + with open(output_path, 'w') as outfile: for line in infile: outfile.write(processor.process_line(line)) except IOError: - print >> sys.stderr, 'failed to process %s' % input_filename + print >> sys.stderr, 'failed to process %s' % input_path + def main(): - for arg in sys.argv[1:]: - expand_file(arg) + parser = optparse.OptionParser() + parser.add_option('--output-dir', default='') + options, args = parser.parse_args() + for testcase_path in args: + testcase_filename = os.path.basename(testcase_path) + testcase_root, _ = os.path.splitext(testcase_filename) + output_dir = os.path.dirname(testcase_path) + if options.output_dir: + output_dir = options.output_dir + output_path = os.path.join(output_dir, testcase_root + '.pdf') + expand_file(testcase_path, output_path) return 0 + if __name__ == '__main__': sys.exit(main()) diff --git a/testing/tools/run_javascript_tests.py b/testing/tools/run_javascript_tests.py new file mode 100755 index 0000000000..4361ea08f9 --- /dev/null +++ b/testing/tools/run_javascript_tests.py @@ -0,0 +1,92 @@ +#!/usr/bin/env python +# Copyright 2015 The PDFium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import optparse +import os +import re +import subprocess +import sys + +# Nomenclature: +# x_root - "x" +# x_filename - "x.ext" +# x_path - "path/to/a/b/c/x.ext" +# c_dir - "path/to/a/b/c" + +def generate_and_test(input_filename, source_dir, working_dir, + fixup_path, pdfium_test_path): + input_root, _ = os.path.splitext(input_filename) + input_path = os.path.join(source_dir, input_root + '.in') + pdf_path = os.path.join(working_dir, input_root + '.pdf') + txt_path = os.path.join(working_dir, input_root + '.txt') + expected_path = os.path.join(source_dir, input_root + '_expected.txt') + try: + subprocess.check_call( + [fixup_path, '--output-dir=' + working_dir, input_path]) + with open(txt_path, 'w') as outfile: + subprocess.check_call([pdfium_test_path, pdf_path], stdout=outfile) + subprocess.check_call(['diff', expected_path, txt_path]) + except subprocess.CalledProcessError as e: + print "FAILURE: " + input_filename + "; " + str(e) + +def main(): + parser = optparse.OptionParser() + parser.add_option('--build-dir', default=os.path.join('out', 'Debug'), + help='relative path from the base source directory') + options, args = parser.parse_args() + + # Expect |my_dir| to be .../pdfium/testing/tools. + my_dir = os.path.dirname(os.path.realpath(__file__)) + testing_dir = os.path.dirname(my_dir) + pdfium_dir = os.path.dirname(testing_dir) + if (os.path.basename(my_dir) != 'tools' or + os.path.basename(testing_dir) != 'testing'): + print 'Confused, can not find pdfium root directory, aborting.' + return 1 + + # Other scripts are found in the same directory as this one. + fixup_path = os.path.join(my_dir, 'fixup_pdf_template.py') + + # test files are in .../pdfium/testing/resources/javascript. + source_dir = os.path.join(testing_dir, 'resources', 'javascript') + + # Find path to build directory. This depends on whether this is a + # standalone build vs. a build as part of a chromium checkout. For + # standalone, we expect a path like .../pdfium/out/Debug, but for + # chromium, we expect a path like .../src/out/Debug two levels + # higher (to skip over the third_party/pdfium path component under + # which chromium sticks pdfium). + base_dir = pdfium_dir + one_up_dir = os.path.dirname(base_dir) + two_up_dir = os.path.dirname(one_up_dir) + if (os.path.basename(two_up_dir) == 'src' and + os.path.basename(one_up_dir) == 'third_party'): + base_dir = two_up_dir + build_dir = os.path.join(base_dir, options.build_dir) + + # Compiled binaries are found under the build path. + pdfium_test_path = os.path.join(build_dir, 'pdfium_test') + if sys.platform.startswith('win'): + pdfium_test_path = pdfium_test_path + '.exe' + # TODO(tsepez): Mac may require special handling here. + + # Place generated files under the build directory, not source directory. + gen_dir = os.path.join(build_dir, 'gen', 'pdfium') + working_dir = os.path.join(gen_dir, 'testing', 'javascript') + if not os.path.exists(working_dir): + os.makedirs(working_dir) + + input_file_re = re.compile('^[a-zA-Z0-9_.]+[.]in$') + for input_filename in os.listdir(source_dir): + if input_file_re.match(input_filename): + input_path = os.path.join(source_dir, input_filename) + if os.path.isfile(input_path): + generate_and_test(input_filename, source_dir, working_dir, + fixup_path, pdfium_test_path) + return 0 + + +if __name__ == '__main__': + sys.exit(main()) diff --git a/testing/tools/run_pixel_tests.py b/testing/tools/run_pixel_tests.py new file mode 100755 index 0000000000..07ea7d8ed8 --- /dev/null +++ b/testing/tools/run_pixel_tests.py @@ -0,0 +1,99 @@ +#!/usr/bin/env python +# Copyright 2015 The PDFium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import optparse +import os +import re +import subprocess +import sys + +# Nomenclature: +# x_root - "x" +# x_filename - "x.ext" +# x_path - "path/to/a/b/c/x.ext" +# c_dir - "path/to/a/b/c" + +def generate_and_test(input_filename, source_dir, working_dir, + fixup_path, pdfium_test_path): + input_root, _ = os.path.splitext(input_filename) + input_path = os.path.join(source_dir, input_root + '.in') + pdf_path = os.path.join(working_dir, input_root + '.pdf') + actual_path_template = os.path.join(working_dir, input_root + '.pdf.%d.ppm') + expected_path_template = os.path.join(source_dir, + input_root + '_expected.pdf.%d.ppm') + try: + subprocess.check_call( + [fixup_path, '--output-dir=' + working_dir, input_path]) + subprocess.check_call([pdfium_test_path, '--ppm', pdf_path]) + i = 0; + while True: + expected_path = expected_path_template % i; + actual_path = actual_path_template % i; + if not os.path.exists(expected_path): + break + subprocess.check_call(['diff', expected_path, actual_path]) + i += 1 + except subprocess.CalledProcessError as e: + print "FAILURE: " + input_filename + "; " + str(e) + +def main(): + parser = optparse.OptionParser() + parser.add_option('--build-dir', default=os.path.join('out', 'Debug'), + help='relative path from the base source directory') + options, args = parser.parse_args() + + # Expect |my_dir| to be .../pdfium/testing/tools. + my_dir = os.path.dirname(os.path.realpath(__file__)) + testing_dir = os.path.dirname(my_dir) + pdfium_dir = os.path.dirname(testing_dir) + if (os.path.basename(my_dir) != 'tools' or + os.path.basename(testing_dir) != 'testing'): + print 'Confused, can not find pdfium root directory, aborting.' + return 1 + + # Other scripts are found in the same directory as this one. + fixup_path = os.path.join(my_dir, 'fixup_pdf_template.py') + + # test files are in .../pdfium/testing/resources/pixel. + source_dir = os.path.join(testing_dir, 'resources', 'pixel') + + # Find path to build directory. This depends on whether this is a + # standalone build vs. a build as part of a chromium checkout. For + # standalone, we expect a path like .../pdfium/out/Debug, but for + # chromium, we expect a path like .../src/out/Debug two levels + # higher (to skip over the third_party/pdfium path component under + # which chromium sticks pdfium). + base_dir = pdfium_dir + one_up_dir = os.path.dirname(base_dir) + two_up_dir = os.path.dirname(one_up_dir) + if (os.path.basename(two_up_dir) == 'src' and + os.path.basename(one_up_dir) == 'third_party'): + base_dir = two_up_dir + build_dir = os.path.join(base_dir, options.build_dir) + + # Compiled binaries are found under the build path. + pdfium_test_path = os.path.join(build_dir, 'pdfium_test') + if sys.platform.startswith('win'): + pdfium_test_path = pdfium_test_path + '.exe' + # TODO(tsepez): Mac may require special handling here. + + # Place generated files under the build directory, not source directory. + gen_dir = os.path.join(build_dir, 'gen', 'pdfium') + working_dir = os.path.join(gen_dir, 'testing', 'pixel') + if not os.path.exists(working_dir): + os.makedirs(working_dir) + + input_file_re = re.compile('^[a-zA-Z0-9_.]+[.]in$') + for input_filename in os.listdir(source_dir): + if input_file_re.match(input_filename): + input_path = os.path.join(source_dir, input_filename) + if os.path.isfile(input_path): + generate_and_test(input_filename, source_dir, working_dir, + fixup_path, pdfium_test_path) + return 0 + + +if __name__ == '__main__': + sys.exit(main()) -- cgit v1.2.3