Index: base/string_number_conversions_unittest.cc |
diff --git a/base/string_number_conversions_unittest.cc b/base/string_number_conversions_unittest.cc |
index 1e5ff14cecef5619b2e50f22a7450dae7028d136..438db077a953225adac1d4bf9c8881aca750cb5b 100644 |
--- a/base/string_number_conversions_unittest.cc |
+++ b/base/string_number_conversions_unittest.cc |
@@ -105,34 +105,14 @@ TEST(StringNumberConversionsTest, StringToInt) { |
}; |
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { |
- const char* ascii_chars = cases[i].input.c_str(); |
int output = 0; |
EXPECT_EQ(cases[i].success, StringToInt(cases[i].input, &output)); |
EXPECT_EQ(cases[i].output, output); |
- output = 0; |
- EXPECT_EQ(cases[i].success, StringToInt(cases[i].input.begin(), |
- cases[i].input.end(), |
- &output)); |
- EXPECT_EQ(cases[i].output, output); |
- output = 0; |
- EXPECT_EQ(cases[i].success, StringToInt( |
- ascii_chars, ascii_chars + cases[i].input.length(), &output)); |
- EXPECT_EQ(cases[i].output, output); |
string16 utf16_input = UTF8ToUTF16(cases[i].input); |
- const char16* utf16_chars = utf16_input.c_str(); |
output = 0; |
EXPECT_EQ(cases[i].success, StringToInt(utf16_input, &output)); |
EXPECT_EQ(cases[i].output, output); |
- output = 0; |
- EXPECT_EQ(cases[i].success, StringToInt(utf16_input.begin(), |
- utf16_input.end(), |
- &output)); |
- EXPECT_EQ(cases[i].output, output); |
- output = 0; |
- EXPECT_EQ(cases[i].success, StringToInt( |
- utf16_chars, utf16_chars + utf16_input.length(), &output)); |
- EXPECT_EQ(cases[i].output, output); |
} |
// One additional test to verify that conversion of numbers in strings with |
@@ -143,26 +123,11 @@ TEST(StringNumberConversionsTest, StringToInt) { |
int output; |
EXPECT_FALSE(StringToInt(input_string, &output)); |
EXPECT_EQ(6, output); |
- output = 0; |
- EXPECT_FALSE(StringToInt(input_string.begin(), input_string.end(), &output)); |
- EXPECT_EQ(6, output); |
- output = 0; |
- EXPECT_FALSE(StringToInt(input, input + arraysize(input), &output)); |
- EXPECT_EQ(6, output); |
string16 utf16_input = UTF8ToUTF16(input_string); |
- const char16* utf16_chars = utf16_input.c_str(); |
output = 0; |
EXPECT_FALSE(StringToInt(utf16_input, &output)); |
EXPECT_EQ(6, output); |
- output = 0; |
- EXPECT_FALSE(StringToInt(utf16_input.begin(), utf16_input.end(), &output)); |
- EXPECT_EQ(6, output); |
- output = 0; |
- EXPECT_FALSE(StringToInt(utf16_chars, |
- utf16_chars + utf16_input.length(), |
- &output)); |
- EXPECT_EQ(6, output); |
output = 0; |
const char16 negative_wide_input[] = { 0xFF4D, '4', '2', 0}; |
@@ -210,34 +175,14 @@ TEST(StringNumberConversionsTest, StringToInt64) { |
}; |
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { |
- const char* ascii_chars = cases[i].input.c_str(); |
int64 output = 0; |
EXPECT_EQ(cases[i].success, StringToInt64(cases[i].input, &output)); |
EXPECT_EQ(cases[i].output, output); |
- output = 0; |
- EXPECT_EQ(cases[i].success, StringToInt64(cases[i].input.begin(), |
- cases[i].input.end(), |
- &output)); |
- EXPECT_EQ(cases[i].output, output); |
- output = 0; |
- EXPECT_EQ(cases[i].success, StringToInt64( |
- ascii_chars, ascii_chars + cases[i].input.length(), &output)); |
- EXPECT_EQ(cases[i].output, output); |
string16 utf16_input = UTF8ToUTF16(cases[i].input); |
- const char16* utf16_chars = utf16_input.c_str(); |
output = 0; |
EXPECT_EQ(cases[i].success, StringToInt64(utf16_input, &output)); |
EXPECT_EQ(cases[i].output, output); |
- output = 0; |
- EXPECT_EQ(cases[i].success, StringToInt64(utf16_input.begin(), |
- utf16_input.end(), |
- &output)); |
- EXPECT_EQ(cases[i].output, output); |
- output = 0; |
- EXPECT_EQ(cases[i].success, StringToInt64( |
- utf16_chars, utf16_chars + utf16_input.length(), &output)); |
- EXPECT_EQ(cases[i].output, output); |
} |
// One additional test to verify that conversion of numbers in strings with |
@@ -248,28 +193,11 @@ TEST(StringNumberConversionsTest, StringToInt64) { |
int64 output; |
EXPECT_FALSE(StringToInt64(input_string, &output)); |
EXPECT_EQ(6, output); |
- output = 0; |
- EXPECT_FALSE(StringToInt64(input_string.begin(), |
- input_string.end(), |
- &output)); |
- EXPECT_EQ(6, output); |
- output = 0; |
- EXPECT_FALSE(StringToInt64(input, input + arraysize(input), &output)); |
- EXPECT_EQ(6, output); |
string16 utf16_input = UTF8ToUTF16(input_string); |
- const char16* utf16_chars = utf16_input.c_str(); |
output = 0; |
EXPECT_FALSE(StringToInt64(utf16_input, &output)); |
EXPECT_EQ(6, output); |
- output = 0; |
- EXPECT_FALSE(StringToInt64(utf16_input.begin(), utf16_input.end(), &output)); |
- EXPECT_EQ(6, output); |
- output = 0; |
- EXPECT_FALSE(StringToInt64(utf16_chars, |
- utf16_chars + utf16_input.length(), |
- &output)); |
- EXPECT_EQ(6, output); |
} |
TEST(StringNumberConversionsTest, HexStringToInt) { |
@@ -310,19 +238,9 @@ TEST(StringNumberConversionsTest, HexStringToInt) { |
}; |
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) { |
- const char* ascii_chars = cases[i].input.c_str(); |
int output = 0; |
EXPECT_EQ(cases[i].success, HexStringToInt(cases[i].input, &output)); |
EXPECT_EQ(cases[i].output, output); |
- output = 0; |
- EXPECT_EQ(cases[i].success, HexStringToInt(cases[i].input.begin(), |
- cases[i].input.end(), |
- &output)); |
- EXPECT_EQ(cases[i].output, output); |
- output = 0; |
- EXPECT_EQ(cases[i].success, HexStringToInt( |
- ascii_chars, ascii_chars + cases[i].input.length(), &output)); |
- EXPECT_EQ(cases[i].output, output); |
} |
// One additional test to verify that conversion of numbers in strings with |
// embedded NUL characters. The NUL and extra data after it should be |
@@ -332,14 +250,6 @@ TEST(StringNumberConversionsTest, HexStringToInt) { |
int output; |
EXPECT_FALSE(HexStringToInt(input_string, &output)); |
EXPECT_EQ(0xc0ffee, output); |
- output = 0; |
- EXPECT_FALSE(HexStringToInt(input_string.begin(), |
- input_string.end(), |
- &output)); |
- EXPECT_EQ(0xc0ffee, output); |
- output = 0; |
- EXPECT_FALSE(HexStringToInt(input, input + arraysize(input), &output)); |
- EXPECT_EQ(0xc0ffee, output); |
} |
TEST(StringNumberConversionsTest, HexStringToBytes) { |