From 7c5c4c1b61be8ba532cec9a81c36dae747ffaaf4 Mon Sep 17 00:00:00 2001 From: David Capello Date: Mon, 24 Oct 2016 15:12:48 -0300 Subject: [PATCH] Fix Utf8Wrapper tests for string-literals --- src/base/string_tests.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/base/string_tests.cpp b/src/base/string_tests.cpp index 70506763b..3ed8d1b28 100644 --- a/src/base/string_tests.cpp +++ b/src/base/string_tests.cpp @@ -36,13 +36,14 @@ TEST(String, Utf8Wrapper) a.push_back(ch); EXPECT_EQ("abc", a); - std::string c; - for (int ch : utf8_const("def")) + std::string c, d = "def"; + for (int ch : utf8_const(d)) // TODO we should be able to specify a string-literal here c.push_back(ch); EXPECT_EQ("def", c); int i = 0; - for (int ch : utf8_const("\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E")) { // 日本語 + d = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E"; + for (int ch : utf8_const(d)) { // 日本語 switch (i++) { case 0: EXPECT_EQ(ch, 0x65E5); break; case 1: EXPECT_EQ(ch, 0x672C); break;