diff options
| author | dsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 19:17:45 +0000 |
|---|---|---|
| committer | dsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-25 19:17:45 +0000 |
| commit | e2219171711f7acf49a52ba89eb6e05c27f11103 (patch) | |
| tree | 464c5ec96e0a288bf0460d9d7109d12f9bd29207 /base/string_escape_unittest.cc | |
| parent | 5e5bf59cbc75839aafef3ae29bcb53408adb715d (diff) | |
| download | chromium_src-e2219171711f7acf49a52ba89eb6e05c27f11103.zip chromium_src-e2219171711f7acf49a52ba89eb6e05c27f11103.tar.gz chromium_src-e2219171711f7acf49a52ba89eb6e05c27f11103.tar.bz2 | |
Change the string_escape functions to use string16 rather than wstring.
Review URL: http://codereview.chromium.org/27116
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10358 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/string_escape_unittest.cc')
| -rw-r--r-- | base/string_escape_unittest.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/base/string_escape_unittest.cc b/base/string_escape_unittest.cc index 28be9bd..e6a1806 100644 --- a/base/string_escape_unittest.cc +++ b/base/string_escape_unittest.cc @@ -4,6 +4,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "base/string_escape.h" +#include "base/string_util.h" TEST(StringEscapeTest, JavascriptDoubleQuote) { static const char* kToEscape = "\b\001aZ\"\\wee"; @@ -17,21 +18,21 @@ TEST(StringEscapeTest, JavascriptDoubleQuote) { // Test wide unicode escaping out = "testy: "; - string_escape::JavascriptDoubleQuote(std::wstring(kUToEscape), false, &out); + string_escape::JavascriptDoubleQuote(WideToUTF16(kUToEscape), false, &out); ASSERT_EQ(std::string("testy: ") + kUEscaped, out); out = "testy: "; - string_escape::JavascriptDoubleQuote(std::wstring(kUToEscape), true, &out); + string_escape::JavascriptDoubleQuote(WideToUTF16(kUToEscape), true, &out); ASSERT_EQ(std::string("testy: ") + kUEscapedQuoted, out); // Test null and high bit / negative unicode values - std::wstring wstr(L"TeSt"); - wstr.push_back(0); - wstr.push_back(0xffb1); - wstr.push_back(0x00ff); + string16 str16 = UTF8ToUTF16("TeSt"); + str16.push_back(0); + str16.push_back(0xffb1); + str16.push_back(0x00ff); out = "testy: "; - string_escape::JavascriptDoubleQuote(wstr, false, &out); + string_escape::JavascriptDoubleQuote(str16, false, &out); ASSERT_EQ("testy: TeSt\\x00\\uFFB1\\xFF", out); // Test escaping of 7bit ascii @@ -61,4 +62,3 @@ TEST(StringEscapeTest, JavascriptDoubleQuote) { string_escape::JavascriptDoubleQuote("a\b\f\n\r\t\v\1\\.\"z", false, &out); ASSERT_EQ("testy: a\\b\\f\\n\\r\\t\\v\\x01\\\\.\\\"z", out); } - |