From 21d610fb26b275f489dacbd6c372ddf55323ea55 Mon Sep 17 00:00:00 2001 From: "deanm@google.com" Date: Wed, 13 Aug 2008 11:09:33 +0000 Subject: Implement IntToString-type methods without using a format string. I'm not sure if this will actually be more efficient. Also will make Int64ToString work on other platforms, since the old code used msvc-only %I64. Added a bunch of methods to have the whole Int/Int64 String/WString suite. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@784 0039d316-1c4b-4281-b951-d872f2087c98 --- base/string_util_unittest.cc | 53 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 11 deletions(-) (limited to 'base/string_util_unittest.cc') diff --git a/base/string_util_unittest.cc b/base/string_util_unittest.cc index d13107f..fb3681b5 100644 --- a/base/string_util_unittest.cc +++ b/base/string_util_unittest.cc @@ -30,6 +30,7 @@ #include #include +#include #include #include "base/basictypes.h" @@ -634,20 +635,50 @@ TEST(StringUtilTest, ReplaceSubstringsAfterOffset) { } } +namespace { + +template +struct IntToStringTest { + INT num; + const char* sexpected; + const char* uexpected; +}; + +} + TEST(StringUtilTest, IntToString) { - static const struct { - int input; - std::string output; - } cases[] = { - {0, "0"}, - {42, "42"}, - {-42, "-42"}, - {INT_MAX, "2147483647"}, - {INT_MIN, "-2147483648"}, + + static const IntToStringTest int_tests[] = { + { 0, "0", "0" }, + { -1, "-1", "4294967295" }, + { std::numeric_limits::max(), "2147483647", "2147483647" }, + { std::numeric_limits::min(), "-2147483648", "2147483648" }, + }; + static const IntToStringTest int64_tests[] = { + { 0, "0", "0" }, + { -1, "-1", "18446744073709551615" }, + { std::numeric_limits::max(), + "9223372036854775807", + "9223372036854775807", }, + { std::numeric_limits::min(), + "-9223372036854775808", + "9223372036854775808" }, }; - for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) - EXPECT_EQ(cases[i].output, IntToString(cases[i].input)); + for (int i = 0; i < arraysize(int_tests); ++i) { + const IntToStringTest* test = &int_tests[i]; + EXPECT_EQ(IntToString(test->num), test->sexpected); + EXPECT_EQ(IntToWString(test->num), UTF8ToWide(test->sexpected)); + EXPECT_EQ(UintToString(test->num), test->uexpected); + EXPECT_EQ(UintToWString(test->num), UTF8ToWide(test->uexpected)); + } + for (int i = 0; i < arraysize(int64_tests); ++i) { + const IntToStringTest* test = &int64_tests[i]; + EXPECT_EQ(Int64ToString(test->num), test->sexpected); + EXPECT_EQ(Int64ToWString(test->num), UTF8ToWide(test->sexpected)); + EXPECT_EQ(Uint64ToString(test->num), test->uexpected); + EXPECT_EQ(Uint64ToWString(test->num), UTF8ToWide(test->uexpected)); + } } TEST(StringUtilTest, Uint64ToString) { -- cgit v1.1