summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2018-10-22 22:40:05 +0000
committerChromium commit bot <commit-bot@chromium.org>2018-10-22 22:40:05 +0000
commitc87b9348a4f2ffcad1992d26504efa46548b5d83 (patch)
treef8534fe878d78b74ebc56689d5b0391d9016d653
parent36623f65c39c38effe681aa82e3a11f1d4d6cc7b (diff)
downloadpdfium-c87b9348a4f2ffcad1992d26504efa46548b5d83.tar.xz
Consolidate app_*.in tests into app_methods.in
One file per method is excessive. Change-Id: I02e3e9dffd2fc2d98f77f15a4669bd15c0119dd3 Reviewed-on: https://pdfium-review.googlesource.com/c/44412 Commit-Queue: Tom Sepez <tsepez@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org>
-rw-r--r--testing/resources/javascript/app_alert.in70
-rw-r--r--testing/resources/javascript/app_alert_expected.txt15
-rw-r--r--testing/resources/javascript/app_beep.in41
-rw-r--r--testing/resources/javascript/app_beep_expected.txt1
-rw-r--r--testing/resources/javascript/app_mailmsg.in71
-rw-r--r--testing/resources/javascript/app_mailmsg_expected.txt10
-rw-r--r--testing/resources/javascript/app_methods.in129
-rw-r--r--testing/resources/javascript/app_methods_expected.txt34
-rw-r--r--testing/resources/javascript/app_repsonse.in74
-rw-r--r--testing/resources/javascript/app_repsonse_expected.txt10
10 files changed, 163 insertions, 292 deletions
diff --git a/testing/resources/javascript/app_alert.in b/testing/resources/javascript/app_alert.in
deleted file mode 100644
index 27d816eb36..0000000000
--- a/testing/resources/javascript/app_alert.in
+++ /dev/null
@@ -1,70 +0,0 @@
-{{header}}
-{{object 1 0}} <<
- /Type /Catalog
- /Pages 2 0 R
- /OpenAction 10 0 R
->>
-endobj
-{{object 2 0}} <<
- /Type /Pages
- /Count 1
- /Kids [
- 3 0 R
- ]
->>
-endobj
-% Page number 0.
-{{object 3 0}} <<
- /Type /Page
- /Parent 2 0 R
- /Resources <<
- /Font <</F1 15 0 R>>
- >>
- /Contents [21 0 R]
- /MediaBox [0 0 612 792]
->>
-% OpenAction action
-{{object 10 0}} <<
- /Type /Action
- /S /JavaScript
- /JS 11 0 R
->>
-endobj
-% JS program to exexute
-{{object 11 0}} <<
- {{streamlen}}
->>
-stream
-app.alert("This test passes if alert() logs output under the test utility.");
-app.alert("message", 1, 2, "title");
-app.alert({"cMsg": "message", "cTitle": "title"});
-app.alert({"cMsg": "message", "cTitle": "title", "nIcon": 3, "nType": 4});
-app.alert(undefined);
-app.alert(null);
-app.alert(true);
-app.alert(false);
-app.alert(42);
-app.alert([1, 2, 3]);
-app.alert([1, 2, {"color": "red"}]);
-app.alert({"color": "red"}, 5, 6, "title");
-try {
- app.alert();
-} catch (e) {
- app.alert("Caught expected error " + e);
-}
-try {
- app.alert({});
-} catch (e) {
- app.alert("Caught expected error " + e);
-}
-try {
- app.alert({"color": "red", "size": 42});
-} catch (e) {
- app.alert("Caught expected error " + e);
-}
-endstream
-endobj
-{{xref}}
-{{trailer}}
-{{startxref}}
-%%EOF
diff --git a/testing/resources/javascript/app_alert_expected.txt b/testing/resources/javascript/app_alert_expected.txt
deleted file mode 100644
index b44fa73a94..0000000000
--- a/testing/resources/javascript/app_alert_expected.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Alert: This test passes if alert() logs output under the test utility.
-title[icon=1,type=2]: message
-title: message
-title[icon=3,type=4]: message
-Alert: undefined
-Alert: null
-Alert: true
-Alert: false
-Alert: 42
-Alert: [1, 2, 3]
-Alert: [1, 2, [object Object]]
-title[icon=5,type=6]: [object Object]
-Alert: Caught expected error app.alert: Incorrect number of parameters passed to function.
-Alert: Caught expected error app.alert: Incorrect number of parameters passed to function.
-Alert: Caught expected error app.alert: Incorrect number of parameters passed to function.
diff --git a/testing/resources/javascript/app_beep.in b/testing/resources/javascript/app_beep.in
deleted file mode 100644
index e2fc9001ed..0000000000
--- a/testing/resources/javascript/app_beep.in
+++ /dev/null
@@ -1,41 +0,0 @@
-{{header}}
-{{object 1 0}} <<
- /Type /Catalog
- /Pages 2 0 R
- /OpenAction 10 0 R
->>
-endobj
-{{object 2 0}} <<
- /Type /Pages
- /Count 1
- /Kids [
- 3 0 R
- ]
->>
-endobj
-% Page number 0.
-{{object 3 0}} <<
- /Type /Page
- /Parent 2 0 R
- /MediaBox [0 0 612 792]
->>
-endobj
-% OpenAction action
-{{object 10 0}} <<
- /Type /Action
- /S /JavaScript
- /JS 11 0 R
->>
-endobj
-% JS program to exexute
-{{object 11 0}} <<
- {{streamlen}}
->>
-stream
-app.beep(1);
-endstream
-endobj
-{{xref}}
-{{trailer}}
-{{startxref}}
-%%EOF
diff --git a/testing/resources/javascript/app_beep_expected.txt b/testing/resources/javascript/app_beep_expected.txt
deleted file mode 100644
index 65ad640558..0000000000
--- a/testing/resources/javascript/app_beep_expected.txt
+++ /dev/null
@@ -1 +0,0 @@
-BEEP!!! 1
diff --git a/testing/resources/javascript/app_mailmsg.in b/testing/resources/javascript/app_mailmsg.in
deleted file mode 100644
index 73a7261a68..0000000000
--- a/testing/resources/javascript/app_mailmsg.in
+++ /dev/null
@@ -1,71 +0,0 @@
-{{header}}
-{{object 1 0}} <<
- /Type /Catalog
- /Pages 2 0 R
- /OpenAction 10 0 R
->>
-endobj
-{{object 2 0}} <<
- /Type /Pages
- /Count 1
- /Kids [
- 3 0 R
- ]
->>
-endobj
-% Page number 0.
-{{object 3 0}} <<
- /Type /Page
- /Parent 2 0 R
- /Resources <<
- /Font <</F1 15 0 R>>
- >>
- /Contents [21 0 R]
- /MediaBox [0 0 612 792]
->>
-% OpenAction action
-{{object 10 0}} <<
- /Type /Action
- /S /JavaScript
- /JS 11 0 R
->>
-endobj
-% JS program to exexute
-{{object 11 0}} <<
- {{streamlen}}
->>
-stream
-app.alert("This test passes if mailMsg() logs output under the test utility.");
-app.mailMsg(true);
-app.mailMsg(false, "user@example.com");
-app.mailMsg(false, "user@example.com", "cc@example.com",
- "bcc@example.com", "subject", "body");
-app.mailMsg({"bUI": true});
-app.mailMsg({"bUI": false, "cTo": "user@example.com"});
-app.mailMsg({"bUI": false,
- "cTo": "user@example.com",
- "cCc": "cc@example.com",
- "cBcc": "bcc@example.com",
- "cSubject": "subject",
- "cMsg": "body"});
-try {
- app.mailMsg();
-} catch (e) {
- app.alert("Caught expected error " + e);
-}
-try {
- app.mailMsg(false);
-} catch (e) {
- app.alert("Caught expected error " + e);
-}
-try {
- app.mailMsg({"color": "red", "size": 42});
-} catch (e) {
- app.alert("Caught expected error " + e);
-}
-endstream
-endobj
-{{xref}}
-{{trailer}}
-{{startxref}}
-%%EOF
diff --git a/testing/resources/javascript/app_mailmsg_expected.txt b/testing/resources/javascript/app_mailmsg_expected.txt
deleted file mode 100644
index 59928ae954..0000000000
--- a/testing/resources/javascript/app_mailmsg_expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Alert: This test passes if mailMsg() logs output under the test utility.
-Mail Msg: 1, to=, cc=, bcc=, subject=, body=
-Mail Msg: 0, to=user@example.com, cc=, bcc=, subject=, body=
-Mail Msg: 0, to=user@example.com, cc=cc@example.com, bcc=bcc@example.com, subject=subject, body=body
-Mail Msg: 1, to=, cc=, bcc=, subject=, body=
-Mail Msg: 0, to=user@example.com, cc=, bcc=, subject=, body=
-Mail Msg: 0, to=user@example.com, cc=cc@example.com, bcc=bcc@example.com, subject=subject, body=body
-Alert: Caught expected error app.mailMsg: Incorrect number of parameters passed to function.
-Alert: Caught expected error app.mailMsg: Incorrect number of parameters passed to function.
-Alert: Caught expected error app.mailMsg: Incorrect number of parameters passed to function.
diff --git a/testing/resources/javascript/app_methods.in b/testing/resources/javascript/app_methods.in
new file mode 100644
index 0000000000..c925dee651
--- /dev/null
+++ b/testing/resources/javascript/app_methods.in
@@ -0,0 +1,129 @@
+{{header}}
+{{object 1 0}} <<
+ /Type /Catalog
+ /Pages 2 0 R
+ /OpenAction 10 0 R
+>>
+endobj
+{{object 2 0}} <<
+ /Type /Pages
+ /Count 1
+ /Kids [
+ 3 0 R
+ ]
+>>
+endobj
+% Page number 0.
+{{object 3 0}} <<
+ /Type /Page
+ /Parent 2 0 R
+ /MediaBox [0 0 612 792]
+>>
+% OpenAction action
+{{object 10 0}} <<
+ /Type /Action
+ /S /JavaScript
+ /JS 11 0 R
+>>
+endobj
+% JS program to exexute
+{{object 11 0}} <<
+ {{streamlen}}
+>>
+stream
+
+app.alert("message", 1, 2, "title");
+app.alert({"cMsg": "message", "cTitle": "title"});
+app.alert({"cMsg": "message", "cTitle": "title", "nIcon": 3, "nType": 4});
+app.alert(undefined);
+app.alert(null);
+app.alert(true);
+app.alert(false);
+app.alert(42);
+app.alert([1, 2, 3]);
+app.alert([1, 2, {"color": "red"}]);
+app.alert({"color": "red"}, 5, 6, "title");
+try {
+ app.alert();
+} catch (e) {
+ app.alert("Caught expected error " + e);
+}
+try {
+ app.alert({});
+} catch (e) {
+ app.alert("Caught expected error " + e);
+}
+try {
+ app.alert({"color": "red", "size": 42});
+} catch (e) {
+ app.alert("Caught expected error " + e);
+}
+
+app.beep(1);
+
+app.mailMsg(true);
+app.mailMsg(false, "user@example.com");
+app.mailMsg(false, "user@example.com", "cc@example.com",
+ "bcc@example.com", "subject", "body");
+app.mailMsg({"bUI": true});
+app.mailMsg({"bUI": false, "cTo": "user@example.com"});
+app.mailMsg({"bUI": false,
+ "cTo": "user@example.com",
+ "cCc": "cc@example.com",
+ "cBcc": "bcc@example.com",
+ "cSubject": "subject",
+ "cMsg": "body"});
+try {
+ app.mailMsg();
+} catch (e) {
+ app.alert("Caught expected error " + e);
+}
+try {
+ app.mailMsg(false);
+} catch (e) {
+ app.alert("Caught expected error " + e);
+}
+try {
+ app.mailMsg({"color": "red", "size": 42});
+} catch (e) {
+ app.alert("Caught expected error " + e);
+}
+
+var result;
+try {
+ result = app.response("question");
+ app.alert("result: " + result);
+ result = app.response("question", "title", "default", true, "label");
+ app.alert("result: " + result);
+ result = app.response({"cQuestion": "question"});
+ app.alert("result: " + result);
+ result = app.response({
+ "cQuestion": "question",
+ "cTitle": "title",
+ "cDefault": "default",
+ "bPassword": true,
+ "cLabel": "label"
+ });
+ app.alert("result: " + result);
+} catch (e) {
+ app.alert("unexpected error " + e);
+}
+try {
+ app.response();
+ app.alert("unexpected success");
+} catch (e) {
+ app.alert("Caught expected error " + e);
+}
+try {
+ app.response({});
+ app.alert("unexpected success");
+} catch (e) {
+ app.alert("Caught expected error " + e);
+}
+
+endstream
+endobj
+{{xref}}
+{{trailer}}
+{{startxref}}
+%%EOF
diff --git a/testing/resources/javascript/app_methods_expected.txt b/testing/resources/javascript/app_methods_expected.txt
new file mode 100644
index 0000000000..ecd89ad72f
--- /dev/null
+++ b/testing/resources/javascript/app_methods_expected.txt
@@ -0,0 +1,34 @@
+title[icon=1,type=2]: message
+title: message
+title[icon=3,type=4]: message
+Alert: undefined
+Alert: null
+Alert: true
+Alert: false
+Alert: 42
+Alert: [1, 2, 3]
+Alert: [1, 2, [object Object]]
+title[icon=5,type=6]: [object Object]
+Alert: Caught expected error app.alert: Incorrect number of parameters passed to function.
+Alert: Caught expected error app.alert: Incorrect number of parameters passed to function.
+Alert: Caught expected error app.alert: Incorrect number of parameters passed to function.
+BEEP!!! 1
+Mail Msg: 1, to=, cc=, bcc=, subject=, body=
+Mail Msg: 0, to=user@example.com, cc=, bcc=, subject=, body=
+Mail Msg: 0, to=user@example.com, cc=cc@example.com, bcc=bcc@example.com, subject=subject, body=body
+Mail Msg: 1, to=, cc=, bcc=, subject=, body=
+Mail Msg: 0, to=user@example.com, cc=, bcc=, subject=, body=
+Mail Msg: 0, to=user@example.com, cc=cc@example.com, bcc=bcc@example.com, subject=subject, body=body
+Alert: Caught expected error app.mailMsg: Incorrect number of parameters passed to function.
+Alert: Caught expected error app.mailMsg: Incorrect number of parameters passed to function.
+Alert: Caught expected error app.mailMsg: Incorrect number of parameters passed to function.
+PDF: question, defaultValue=, label=, isPassword=0, length=2048
+Alert: result: No
+title: question, defaultValue=default, label=label, isPassword=1, length=2048
+Alert: result: No
+PDF: question, defaultValue=, label=, isPassword=0, length=2048
+Alert: result: No
+title: question, defaultValue=default, label=label, isPassword=1, length=2048
+Alert: result: No
+Alert: Caught expected error app.response: Incorrect number of parameters passed to function.
+Alert: Caught expected error app.response: Incorrect number of parameters passed to function.
diff --git a/testing/resources/javascript/app_repsonse.in b/testing/resources/javascript/app_repsonse.in
deleted file mode 100644
index 08d9fc3109..0000000000
--- a/testing/resources/javascript/app_repsonse.in
+++ /dev/null
@@ -1,74 +0,0 @@
-{{header}}
-{{object 1 0}} <<
- /Type /Catalog
- /Pages 2 0 R
- /OpenAction 10 0 R
->>
-endobj
-{{object 2 0}} <<
- /Type /Pages
- /Count 1
- /Kids [
- 3 0 R
- ]
->>
-endobj
-% Page number 0.
-{{object 3 0}} <<
- /Type /Page
- /Parent 2 0 R
- /Resources <<
- /Font <</F1 15 0 R>>
- >>
- /Contents [21 0 R]
- /MediaBox [0 0 612 792]
->>
-% OpenAction action
-{{object 10 0}} <<
- /Type /Action
- /S /JavaScript
- /JS 11 0 R
->>
-endobj
-% JS program to exexute
-{{object 11 0}} <<
- {{streamlen}}
->>
-stream
-var result;
-try {
- result = app.response("question");
- app.alert("result: " + result);
- result = app.response("question", "title", "default", true, "label");
- app.alert("result: " + result);
- result = app.response({"cQuestion": "question"});
- app.alert("result: " + result);
- result = app.response({
- "cQuestion": "question",
- "cTitle": "title",
- "cDefault": "default",
- "bPassword": true,
- "cLabel": "label"
- });
- app.alert("result: " + result);
-} catch (e) {
- app.alert("unexpected error " + e);
-}
-try {
- app.response();
- app.alert("unexpected success");
-} catch (e) {
- app.alert("Caught expected error " + e);
-}
-try {
- app.response({});
- app.alert("unexpected success");
-} catch (e) {
- app.alert("Caught expected error " + e);
-}
-endstream
-endobj
-{{xref}}
-{{trailer}}
-{{startxref}}
-%%EOF
diff --git a/testing/resources/javascript/app_repsonse_expected.txt b/testing/resources/javascript/app_repsonse_expected.txt
deleted file mode 100644
index 8a2995986b..0000000000
--- a/testing/resources/javascript/app_repsonse_expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-PDF: question, defaultValue=, label=, isPassword=0, length=2048
-Alert: result: No
-title: question, defaultValue=default, label=label, isPassword=1, length=2048
-Alert: result: No
-PDF: question, defaultValue=, label=, isPassword=0, length=2048
-Alert: result: No
-title: question, defaultValue=default, label=label, isPassword=1, length=2048
-Alert: result: No
-Alert: Caught expected error app.response: Incorrect number of parameters passed to function.
-Alert: Caught expected error app.response: Incorrect number of parameters passed to function.