From 1ef2f828f71e40437d82bb039dcb087c1beb7bd6 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 28 Jun 2017 16:15:06 -0700 Subject: XFA: Add test to show Oneof() works correctly. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The new embedder test shows Oneof() works, whereas the corpus test does not. It turns out the corpus test was bad, and trying to fix it exposed a different bug. So roll DEPS for the testing corpus anyway to get improved tests, but keep the suppression for now. BUG=pdfium:781 Change-Id: I3cc6b9a414384c917f205eff064c5dd2175d09fe Reviewed-on: https://pdfium-review.googlesource.com/6973 Commit-Queue: Lei Zhang Reviewed-by: Nicolás Peña --- DEPS | 2 +- xfa/fxfa/fm2js/cxfa_fm2jscontext_embeddertest.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index e237175cda..f3d6907803 100644 --- a/DEPS +++ b/DEPS @@ -19,7 +19,7 @@ vars = { 'jinja2_revision': 'd34383206fa42d52faa10bb9931d6d538f3a57e0', 'jpeg_turbo_revision': '7260e4d8b8e1e40b17f03fafdf1cd83296900f76', 'markupsafe_revision': '8f45f5cfa0009d2a70589bcda0349b8cb2b72783', - 'pdfium_tests_revision': '8560b223b91206f375bb91907c5dca9da6d08a14', + 'pdfium_tests_revision': 'ac92bac606a593bc9c5159d2dd81bd974850fdf4', 'skia_revision': 'bb581ce30f55360fd3a12e7f5aa1fe324b16d085', 'tools_memory_revision': '427f10475e1a8d72424c29d00bf689122b738e5d', 'trace_event_revision': '06294c8a4a6f744ef284cd63cfe54dbf61eea290', diff --git a/xfa/fxfa/fm2js/cxfa_fm2jscontext_embeddertest.cpp b/xfa/fxfa/fm2js/cxfa_fm2jscontext_embeddertest.cpp index 45f1d16e35..7902bb7c8d 100644 --- a/xfa/fxfa/fm2js/cxfa_fm2jscontext_embeddertest.cpp +++ b/xfa/fxfa/fm2js/cxfa_fm2jscontext_embeddertest.cpp @@ -859,7 +859,10 @@ TEST_F(FM2JSContextEmbedderTest, Oneof) { {"Oneof(3, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1)", true}, {"Oneof(\"John\", \"Bill\", \"Gary\", \"Joan\", \"John\", \"Lisa\")", true}, - {"Oneof(3, 1, 25)", false}}; + {"Oneof(3, 1, 25)", false}, + {"Oneof(3, 3, null)", true}, + {"Oneof(3, null, null)", false}, + }; for (size_t i = 0; i < FX_ArraySize(tests); ++i) { EXPECT_TRUE(Execute(tests[i].program)); -- cgit v1.2.3