Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3215)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: core/fxcrt/fx_basic_gcc_unittest.cpp

Issue 1828873002: Fix FXSYS_StrToInt() (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« core/fxcrt/fx_basic_gcc.cpp ('K') | « core/fxcrt/fx_basic_gcc.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: core/fxcrt/fx_basic_gcc_unittest.cpp
diff --git a/core/fxcrt/fx_basic_gcc_unittest.cpp b/core/fxcrt/fx_basic_gcc_unittest.cpp
index eb1e0669ae08a5f34664205d80cc5bf4a5c6ab5f..8acbada88afc2c9b8c55222f01f5658d164973d6 100644
--- a/core/fxcrt/fx_basic_gcc_unittest.cpp
+++ b/core/fxcrt/fx_basic_gcc_unittest.cpp
@@ -10,16 +10,21 @@ TEST(fxcrt, FXSYS_atoi) {
EXPECT_EQ(0, FXSYS_atoi("0"));
EXPECT_EQ(-1, FXSYS_atoi("-1"));
EXPECT_EQ(2345, FXSYS_atoi("2345"));
- EXPECT_EQ(2147483647, FXSYS_atoi("2147483647"));
EXPECT_EQ(-2147483647, FXSYS_atoi("-2147483647"));
+ // Handle the sign.
+ EXPECT_EQ(-2345, FXSYS_atoi("-2345"));
+ EXPECT_EQ(2345, FXSYS_atoi("+2345"));
+ // The max value.
+ EXPECT_EQ(2147483647, FXSYS_atoi("2147483647"));
+ // The min value.
+ EXPECT_EQ(-2147483648, FXSYS_atoi("-2147483648"));
+ // With invalid char.
EXPECT_EQ(9, FXSYS_atoi("9x9"));
- // TODO(dsinclair): These are all wacky .....
- EXPECT_EQ(2147483623, FXSYS_atoi("2147483623423412348"));
- EXPECT_EQ(214748364, FXSYS_atoi("2147483648"));
- // The digit is parsed as a positive value, so we end up not being able to
- // handle the largest possible negative value.
- EXPECT_EQ(-214748364, FXSYS_atoi("-2147483648"));
+ // Out of range values.
+ EXPECT_EQ(2147483647, FXSYS_atoi("2147483623423412348"));
+ EXPECT_EQ(2147483647, FXSYS_atoi("2147483648"));
+ EXPECT_EQ(-2147483648, FXSYS_atoi("-2147483650"));
}
TEST(fxcrt, FXSYS_atoi64) {
@@ -27,16 +32,21 @@ TEST(fxcrt, FXSYS_atoi64) {
EXPECT_EQ(0, FXSYS_atoi64("0"));
EXPECT_EQ(-1, FXSYS_atoi64("-1"));
EXPECT_EQ(2345, FXSYS_atoi64("2345"));
- EXPECT_EQ(9223372036854775807LL, FXSYS_atoi64("9223372036854775807"));
EXPECT_EQ(-9223372036854775807LL, FXSYS_atoi64("-9223372036854775807"));
+ // Handle the sign.
+ EXPECT_EQ(-2345, FXSYS_atoi64("-2345"));
+ EXPECT_EQ(2345, FXSYS_atoi64("+2345"));
+ // The max value.
+ EXPECT_EQ(9223372036854775807LL, FXSYS_atoi64("9223372036854775807"));
+ // The min value.
+ EXPECT_EQ(-9223372036854775808LL, FXSYS_atoi64("-9223372036854775808"));
+ // With invalid char.
EXPECT_EQ(9, FXSYS_atoi64("9x9"));
- // TODO(dsinclair): These are all wacky .....
- EXPECT_EQ(9223372036854712341LL, FXSYS_atoi64("922337203685471234123475807"));
- EXPECT_EQ(922337203685477580LL, FXSYS_atoi64("9223372036854775808"));
- // The digit is parsed as a positive value, so we end up not being able to
- // handle the largest possible negative value.
- EXPECT_EQ(-922337203685477580LL, FXSYS_atoi64("-9223372036854775808"));
+ // Out of range values.
+ EXPECT_EQ(9223372036854775807LL, FXSYS_atoi64("922337203685471234123475807"));
+ EXPECT_EQ(9223372036854775807LL, FXSYS_atoi64("9223372036854775808"));
+ EXPECT_EQ(-9223372036854775808LL, FXSYS_atoi64("-9223372036854775810"));
}
TEST(fxcrt, FXSYS_wtoi) {
@@ -44,16 +54,17 @@ TEST(fxcrt, FXSYS_wtoi) {
EXPECT_EQ(0, FXSYS_wtoi(L"0"));
EXPECT_EQ(-1, FXSYS_wtoi(L"-1"));
EXPECT_EQ(2345, FXSYS_wtoi(L"2345"));
- EXPECT_EQ(2147483647, FXSYS_wtoi(L"2147483647"));
EXPECT_EQ(-2147483647, FXSYS_wtoi(L"-2147483647"));
+ // The max value.
+ EXPECT_EQ(2147483647, FXSYS_wtoi(L"2147483647"));
+ // The min value.
+ EXPECT_EQ(-2147483648, FXSYS_wtoi(L"-2147483648"));
EXPECT_EQ(9, FXSYS_wtoi64(L"9x9"));
- // TODO(dsinclair): These are all wacky .....
- EXPECT_EQ(2147483623, FXSYS_wtoi(L"2147483623423412348"));
- EXPECT_EQ(214748364, FXSYS_wtoi(L"2147483648"));
- // The digit is parsed as a positive value, so we end up not being able to
- // handle the largest possible negative value.
- EXPECT_EQ(-214748364, FXSYS_wtoi(L"-2147483648"));
+ // Out of range values.
+ EXPECT_EQ(2147483647, FXSYS_wtoi(L"2147483623423412348"));
+ EXPECT_EQ(2147483647, FXSYS_wtoi(L"2147483648"));
+ EXPECT_EQ(-2147483648, FXSYS_wtoi(L"-2147483652"));
}
TEST(fxcrt, FXSYS_wtoi64) {
@@ -61,28 +72,38 @@ TEST(fxcrt, FXSYS_wtoi64) {
EXPECT_EQ(0, FXSYS_wtoi64(L"0"));
EXPECT_EQ(-1, FXSYS_wtoi64(L"-1"));
EXPECT_EQ(2345, FXSYS_wtoi64(L"2345"));
- EXPECT_EQ(9223372036854775807LL, FXSYS_wtoi64(L"9223372036854775807"));
EXPECT_EQ(-9223372036854775807LL, FXSYS_wtoi64(L"-9223372036854775807"));
+ // Handle the sign.
+ EXPECT_EQ(-2345, FXSYS_wtoi64(L"-2345"));
+ EXPECT_EQ(2345, FXSYS_wtoi64(L"+2345"));
+ // The max value.
+ EXPECT_EQ(9223372036854775807LL, FXSYS_wtoi64(L"9223372036854775807"));
+ // The min value.
+ EXPECT_EQ(-9223372036854775808LL, FXSYS_wtoi64(L"-9223372036854775808"));
+ // With invalid char.
EXPECT_EQ(9, FXSYS_wtoi64(L"9x9"));
- // TODO(dsinclair): These are all wacky .....
- EXPECT_EQ(9223372036854712341LL,
+ // Out of range values.
+ EXPECT_EQ(9223372036854775807LL,
FXSYS_wtoi64(L"922337203685471234123475807"));
- EXPECT_EQ(922337203685477580LL, FXSYS_wtoi64(L"9223372036854775808"));
- // The digit is parsed as a positive value, so we end up not being able to
- // handle the largest possible negative value.
- EXPECT_EQ(-922337203685477580LL, FXSYS_wtoi64(L"-9223372036854775808"));
+ EXPECT_EQ(9223372036854775807LL, FXSYS_wtoi64(L"9223372036854775808"));
+ EXPECT_EQ(-9223372036854775808LL, FXSYS_wtoi64(L"-9223372036854775810"));
}
TEST(fxcrt, FXSYS_atoui) {
EXPECT_EQ(0, FXSYS_atoui(""));
EXPECT_EQ(0, FXSYS_atoui("0"));
- EXPECT_EQ(0, FXSYS_atoui("-1"));
+ EXPECT_EQ(4294967295, FXSYS_atoui("-1"));
dsinclair 2016/03/24 02:41:06 I think this is wrong, it should return 0 because
EXPECT_EQ(2345, FXSYS_atoui("2345"));
+ // Handle the sign.
+ EXPECT_EQ(4294964951, FXSYS_atoui("-2345"));
dsinclair 2016/03/24 02:41:06 This should also be 0 I think.
+ EXPECT_EQ(2345, FXSYS_atoui("+2345"));
+ // The max value.
EXPECT_EQ(4294967295, FXSYS_atoui("4294967295"));
EXPECT_EQ(9, FXSYS_atoui("9x9"));
- // TODO(dsinclair): These are all wacky .....
- EXPECT_EQ(2147483623, FXSYS_atoi("2147483623423412348"));
- EXPECT_EQ(429496729, FXSYS_atoi("4294967296"));
+ // Out of range values.
+ EXPECT_EQ(4294967295, FXSYS_atoui("2147483623423412348"));
+ EXPECT_EQ(4294967295, FXSYS_atoui("4294967296"));
+ EXPECT_EQ(4294967295, FXSYS_atoui("-4294967345"));
dsinclair 2016/03/24 02:41:06 Also 0.
}
« core/fxcrt/fx_basic_gcc.cpp ('K') | « core/fxcrt/fx_basic_gcc.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698