summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorrouslan@chromium.org <rouslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-22 04:47:45 +0000
committerrouslan@chromium.org <rouslan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-22 04:47:45 +0000
commit7f2dc09e3c7c1a176ae1fd5c2d4e5b69330e2682 (patch)
treec796a9c894a7280f7ff68096a61200ce9875052b /third_party
parentcb41ac848d6b83c1d30a52983a8852c26b988ba1 (diff)
downloadchromium_src-7f2dc09e3c7c1a176ae1fd5c2d4e5b69330e2682.zip
chromium_src-7f2dc09e3c7c1a176ae1fd5c2d4e5b69330e2682.tar.gz
chromium_src-7f2dc09e3c7c1a176ae1fd5c2d4e5b69330e2682.tar.bz2
Do not use \u unicode characters directly in libaddressinput unit tests.
VisualStudio does not understand it \u escape sequences like \u00E8 in UTF8 strings. The fix is to use Wide strings and convert them into UTF8 using base::WideToUTF8() utility. BUG=395401 Review URL: https://codereview.chromium.org/403233002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284629 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/libaddressinput/chromium/chrome_address_validator_unittest.cc3
-rw-r--r--third_party/libaddressinput/chromium/string_compare_unittest.cc3
2 files changed, 4 insertions, 2 deletions
diff --git a/third_party/libaddressinput/chromium/chrome_address_validator_unittest.cc b/third_party/libaddressinput/chromium/chrome_address_validator_unittest.cc
index f72cbd9..63353fe 100644
--- a/third_party/libaddressinput/chromium/chrome_address_validator_unittest.cc
+++ b/third_party/libaddressinput/chromium/chrome_address_validator_unittest.cc
@@ -10,6 +10,7 @@
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
+#include "base/strings/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_data.h"
#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_problem.h"
@@ -247,7 +248,7 @@ TEST_F(AddressValidatorTest, BasicValidation) {
EXPECT_TRUE(problems.empty());
// Ignore diacriticals.
- address.administrative_area = "T\u00E9xas";
+ address.administrative_area = base::WideToUTF8(L"T\u00E9xas");
problems.clear();
EXPECT_EQ(AddressValidator::SUCCESS,
validator_->ValidateAddress(address, NULL, &problems));
diff --git a/third_party/libaddressinput/chromium/string_compare_unittest.cc b/third_party/libaddressinput/chromium/string_compare_unittest.cc
index 0f9d9c7..a10e55a 100644
--- a/third_party/libaddressinput/chromium/string_compare_unittest.cc
+++ b/third_party/libaddressinput/chromium/string_compare_unittest.cc
@@ -4,13 +4,14 @@
#include "third_party/libaddressinput/src/cpp/src/util/string_compare.h"
+#include "base/strings/utf_string_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
TEST(ChromeStringCompareTest, IgnoreDiacritics) {
i18n::addressinput::StringCompare sc;
- EXPECT_TRUE(sc.NaturalEquals("Texas", "T\u00E9xas"));
+ EXPECT_TRUE(sc.NaturalEquals("Texas", base::WideToUTF8(L"T\u00E9xas")));
}
TEST(ChromeStringCompareTest, IgnoreCapitalization) {