summaryrefslogtreecommitdiff
path: root/fpdfsdk/src/javascript
diff options
context:
space:
mode:
Diffstat (limited to 'fpdfsdk/src/javascript')
-rw-r--r--fpdfsdk/src/javascript/JS_Value.cpp6
-rw-r--r--fpdfsdk/src/javascript/public_methods_embeddertest.cpp165
2 files changed, 168 insertions, 3 deletions
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<int>(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..eac5264c6a
--- /dev/null
+++ b/fpdfsdk/src/javascript/public_methods_embeddertest.cpp
@@ -0,0 +1,165 @@
+// 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 <cmath>
+
+#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());
+#ifdef PDF_ENABLE_XFA
+ v8::Locker locker(isolate());
+#endif // PDF_ENABLE_XFA
+ 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());
+#ifdef PDF_ENABLE_XFA
+ v8::Locker locker(isolate());
+#endif // PDF_ENABLE_XFA
+ 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);
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 21:02:39 +0000