From b426e3edde040089b70d1a223c83b90957aa571d Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Mon, 21 Dec 2015 10:47:59 -0800 Subject: Fix JS seconds since epoch to date conversions. BUG=515137,564736 R=ochang@chromium.org, tsepez@chromium.org Review URL: https://codereview.chromium.org/1533233002 . --- BUILD.gn | 7 +- fpdfsdk/src/javascript/JS_Value.cpp | 6 +- .../src/javascript/public_methods_embeddertest.cpp | 159 +++++++++++++++++++++ fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp | 48 +------ pdfium.gyp | 3 + testing/embedder_test.cpp | 2 +- testing/embedder_test.h | 2 +- 7 files changed, 176 insertions(+), 51 deletions(-) create mode 100644 fpdfsdk/src/javascript/public_methods_embeddertest.cpp diff --git a/BUILD.gn b/BUILD.gn index fd23beea7b..7df4e38672 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -775,7 +775,12 @@ test("pdfium_embeddertests") { ] include_dirs = [] if (pdf_enable_v8) { - sources += [ "fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp" ] + sources += [ + "fpdfsdk/src/javascript/public_methods_embeddertest.cpp", + "fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp", + "testing/js_embedder_test.cpp", + "testing/js_embedder_test.h", + ] deps += [ "//v8", "//v8:v8_libplatform", diff --git a/fpdfsdk/src/javascript/JS_Value.cpp b/fpdfsdk/src/javascript/JS_Value.cpp index ea7bfda57a..bd00adcf49 100644 --- a/fpdfsdk/src/javascript/JS_Value.cpp +++ b/fpdfsdk/src/javascript/JS_Value.cpp @@ -649,7 +649,7 @@ int _DayFromYear(int y) { } double _TimeFromYear(int y) { - return ((double)86400000) * _DayFromYear(y); + return 86400000.0 * _DayFromYear(y); } double _TimeFromYearMonth(int y, int m) { @@ -669,12 +669,12 @@ int _Day(double t) { int _YearFromTime(double t) { // estimate the time. - int y = 1970 + (int)(t / (365.0 * 86400000)); + int y = 1970 + static_cast(t / (365.2425 * 86400000)); if (_TimeFromYear(y) <= t) { while (_TimeFromYear(y + 1) <= t) y++; } else - while (_TimeFromYear(y - 1) > t) + while (_TimeFromYear(y) > t) y--; return y; } diff --git a/fpdfsdk/src/javascript/public_methods_embeddertest.cpp b/fpdfsdk/src/javascript/public_methods_embeddertest.cpp new file mode 100644 index 0000000000..ca38430ae8 --- /dev/null +++ b/fpdfsdk/src/javascript/public_methods_embeddertest.cpp @@ -0,0 +1,159 @@ +// Copyright 2015 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. + +#include + +#include "core/include/fxcrt/fx_string.h" +#include "fpdfsdk/src/javascript/PublicMethods.h" +#include "testing/js_embedder_test.h" +#include "testing/gtest/include/gtest/gtest.h" + +namespace { + +double RoundDownDate(double date) { + return date - fmod(date, 86400000); +} + +} // namespace + +class PublicMethodsEmbedderTest : public JSEmbedderTest {}; + +TEST_F(PublicMethodsEmbedderTest, MakeRegularDate) { + v8::Isolate::Scope isolate_scope(isolate()); + v8::HandleScope handle_scope(isolate()); + v8::Context::Scope context_scope(GetV8Context()); + FX_BOOL bWrongFormat; + double date; + + // 1968 + bWrongFormat = false; + date = CJS_PublicMethods::MakeRegularDate(L"06/25/1968", L"mm/dd/yyyy", + bWrongFormat); + date = RoundDownDate(date); + EXPECT_DOUBLE_EQ(-47865600000, date); + EXPECT_FALSE(bWrongFormat); + + // 1968 + bWrongFormat = false; + date = CJS_PublicMethods::MakeRegularDate(L"25061968", L"ddmmyyyy", + bWrongFormat); + date = RoundDownDate(date); + EXPECT_DOUBLE_EQ(-47865600000, date); + EXPECT_FALSE(bWrongFormat); + + // 1968 + bWrongFormat = false; + date = CJS_PublicMethods::MakeRegularDate(L"19680625", L"yyyymmdd", + bWrongFormat); + date = RoundDownDate(date); + EXPECT_DOUBLE_EQ(-47865600000, date); + EXPECT_FALSE(bWrongFormat); + + // 1985 + bWrongFormat = false; + date = CJS_PublicMethods::MakeRegularDate(L"31121985", L"ddmmyyyy", + bWrongFormat); + date = RoundDownDate(date); + EXPECT_DOUBLE_EQ(504835200000.0, date); + EXPECT_FALSE(bWrongFormat); + + // 2085, the other '85. + bWrongFormat = false; + date = CJS_PublicMethods::MakeRegularDate(L"311285", L"ddmmyy", bWrongFormat); + date = RoundDownDate(date); + EXPECT_DOUBLE_EQ(3660595200000.0, date); + EXPECT_FALSE(bWrongFormat); + + // 1995 + bWrongFormat = false; + date = CJS_PublicMethods::MakeRegularDate(L"01021995", L"ddmmyyyy", + bWrongFormat); + date = RoundDownDate(date); + EXPECT_DOUBLE_EQ(791596800000.0, date); + EXPECT_FALSE(bWrongFormat); + + // 2095, the other '95. + bWrongFormat = false; + date = CJS_PublicMethods::MakeRegularDate(L"010295", L"ddmmyy", bWrongFormat); + date = RoundDownDate(date); + EXPECT_DOUBLE_EQ(3947356800000.0, date); + EXPECT_FALSE(bWrongFormat); + + // 2005 + bWrongFormat = false; + date = CJS_PublicMethods::MakeRegularDate(L"01022005", L"ddmmyyyy", + bWrongFormat); + date = RoundDownDate(date); + EXPECT_DOUBLE_EQ(1107216000000.0, date); + EXPECT_FALSE(bWrongFormat); + + // 2005 + bWrongFormat = false; + date = CJS_PublicMethods::MakeRegularDate(L"010205", L"ddmmyy", bWrongFormat); + date = RoundDownDate(date); + EXPECT_DOUBLE_EQ(1107216000000.0, date); + EXPECT_FALSE(bWrongFormat); +} + +TEST_F(PublicMethodsEmbedderTest, MakeFormatDate) { + v8::Isolate::Scope isolate_scope(isolate()); + v8::HandleScope handle_scope(isolate()); + v8::Context::Scope context_scope(GetV8Context()); + CFX_WideString formatted_date; + + // 1968-06-25 + formatted_date = CJS_PublicMethods::MakeFormatDate(-47952000000, L"ddmmyy"); + EXPECT_STREQ(L"250668", formatted_date); + formatted_date = CJS_PublicMethods::MakeFormatDate(-47952000000, L"yy/mm/dd"); + EXPECT_STREQ(L"68/06/25", formatted_date); + + // 1969-12-31 + formatted_date = CJS_PublicMethods::MakeFormatDate(-0.0001, L"ddmmyy"); + EXPECT_STREQ(L"311269", formatted_date); + formatted_date = CJS_PublicMethods::MakeFormatDate(-0.0001, L"yy!mmdd"); + EXPECT_STREQ(L"69!1231", formatted_date); + + // 1970-01-01 + formatted_date = CJS_PublicMethods::MakeFormatDate(0, L"ddmmyy"); + EXPECT_STREQ(L"010170", formatted_date); + formatted_date = CJS_PublicMethods::MakeFormatDate(0, L"mm-yyyy-dd"); + EXPECT_STREQ(L"01-1970-01", formatted_date); + + // 1985-12-31 + formatted_date = CJS_PublicMethods::MakeFormatDate(504835200000.0, L"ddmmyy"); + EXPECT_STREQ(L"311285", formatted_date); + formatted_date = CJS_PublicMethods::MakeFormatDate(504835200000.0, L"yymmdd"); + EXPECT_STREQ(L"851231", formatted_date); + + // 1995-02-01 + formatted_date = CJS_PublicMethods::MakeFormatDate(791596800000.0, L"ddmmyy"); + EXPECT_STREQ(L"010295", formatted_date); + formatted_date = + CJS_PublicMethods::MakeFormatDate(791596800000.0, L"yyyymmdd"); + EXPECT_STREQ(L"19950201", formatted_date); + + // 2005-02-01 + formatted_date = + CJS_PublicMethods::MakeFormatDate(1107216000000.0, L"ddmmyy"); + EXPECT_STREQ(L"010205", formatted_date); + formatted_date = + CJS_PublicMethods::MakeFormatDate(1107216000000.0, L"yyyyddmm"); + EXPECT_STREQ(L"20050102", formatted_date); + + // 2085-12-31 + formatted_date = + CJS_PublicMethods::MakeFormatDate(3660595200000.0, L"ddmmyy"); + EXPECT_STREQ(L"311285", formatted_date); + formatted_date = + CJS_PublicMethods::MakeFormatDate(3660595200000.0, L"yyyydd"); + EXPECT_STREQ(L"208531", formatted_date); + + // 2095-02-01 + formatted_date = + CJS_PublicMethods::MakeFormatDate(3947356800000.0, L"ddmmyy"); + EXPECT_STREQ(L"010295", formatted_date); + formatted_date = + CJS_PublicMethods::MakeFormatDate(3947356800000.0, L"mmddyyyy"); + EXPECT_STREQ(L"02012095", formatted_date); +} diff --git a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp b/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp index 4b99ef2d83..316cc10196 100644 --- a/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp +++ b/fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp @@ -2,11 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "core/include/fpdfapi/fpdf_parser.h" -#include "fpdfsdk/include/jsapi/fxjs_v8.h" -#include "testing/embedder_test.h" +#include "testing/js_embedder_test.h" #include "testing/gtest/include/gtest/gtest.h" -#include "third_party/base/nonstd_unique_ptr.h" namespace { @@ -14,48 +11,9 @@ const wchar_t kScript[] = L"fred = 7"; } // namespace -class FXJSV8Embeddertest : public EmbedderTest { - public: - FXJSV8Embeddertest() - : m_pArrayBufferAllocator(new FXJS_ArrayBufferAllocator) { - v8::Isolate::CreateParams params; - params.array_buffer_allocator = m_pArrayBufferAllocator.get(); - m_pIsolate = v8::Isolate::New(params); - } +class FXJSV8EmbedderTest : public JSEmbedderTest {}; - ~FXJSV8Embeddertest() override { m_pIsolate->Dispose(); } - - void SetUp() override { - EmbedderTest::SetExternalIsolate(m_pIsolate); - EmbedderTest::SetUp(); - - v8::Isolate::Scope isolate_scope(m_pIsolate); - v8::HandleScope handle_scope(m_pIsolate); - FXJS_PerIsolateData::SetUp(m_pIsolate); - FXJS_InitializeRuntime(m_pIsolate, nullptr, &m_pPersistentContext, - &m_StaticObjects); - } - - void TearDown() override { - FXJS_ReleaseRuntime(m_pIsolate, &m_pPersistentContext, &m_StaticObjects); - m_pPersistentContext.Reset(); - FXJS_Release(); - EmbedderTest::TearDown(); - } - - v8::Isolate* isolate() { return m_pIsolate; } - v8::Local GetV8Context() { - return m_pPersistentContext.Get(m_pIsolate); - } - - private: - nonstd::unique_ptr m_pArrayBufferAllocator; - v8::Isolate* m_pIsolate; - v8::Global m_pPersistentContext; - std::vector*> m_StaticObjects; -}; - -TEST_F(FXJSV8Embeddertest, Getters) { +TEST_F(FXJSV8EmbedderTest, Getters) { v8::Isolate::Scope isolate_scope(isolate()); v8::HandleScope handle_scope(isolate()); v8::Context::Scope context_scope(GetV8Context()); diff --git a/pdfium.gyp b/pdfium.gyp index 117cdb7913..37a9f1c698 100644 --- a/pdfium.gyp +++ b/pdfium.gyp @@ -773,7 +773,10 @@ '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_libplatform', ], 'sources': [ + 'fpdfsdk/src/javascript/public_methods_embeddertest.cpp', 'fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp', + 'testing/js_embedder_test.cpp', + 'testing/js_embedder_test.h', ], }], ], diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp index d277de1e3a..d4ce7eba5a 100644 --- a/testing/embedder_test.cpp +++ b/testing/embedder_test.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2015 PDFium Authors. All rights reserved. +// Copyright 2015 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. diff --git a/testing/embedder_test.h b/testing/embedder_test.h index f68cb9df74..df2e40a2e8 100644 --- a/testing/embedder_test.h +++ b/testing/embedder_test.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015 PDFium Authors. All rights reserved. +// Copyright 2015 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. -- cgit v1.2.3