diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-01-19 23:40:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-01-19 23:40:06 +0000 |
| commit | 1f9f11007db09bbbc156965e77b10de82a32a544 (patch) | |
| tree | e715a9edb691da38726c2c5487625bd35b05ec94 /tools/aapt2/StringPool_test.cpp | |
| parent | 12375e9e0d14868cf63c0d6584c7a7d9440c30c4 (diff) | |
| parent | d5083f6f6b9bc76bbe64052bcec639eee752a321 (diff) | |
Merge "Move StringPiece to libandroidfw"
Diffstat (limited to 'tools/aapt2/StringPool_test.cpp')
| -rw-r--r-- | tools/aapt2/StringPool_test.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/aapt2/StringPool_test.cpp b/tools/aapt2/StringPool_test.cpp index e1394fc0221f..f64a8cf20928 100644 --- a/tools/aapt2/StringPool_test.cpp +++ b/tools/aapt2/StringPool_test.cpp @@ -18,9 +18,14 @@ #include <string> +#include "androidfw/StringPiece.h" + #include "test/Test.h" #include "util/Util.h" +using android::StringPiece; +using android::StringPiece16; + namespace aapt { TEST(StringPoolTest, InsertOneString) { @@ -236,8 +241,7 @@ TEST(StringPoolTest, Flatten) { EXPECT_EQ(StringPiece16(u"goodbye"), util::GetString16(test, 1)); EXPECT_EQ(StringPiece(sLongString), util::GetString(test, 2)); - EXPECT_EQ(util::Utf8ToUtf16(sLongString), - util::GetString16(test, 2).ToString()); + EXPECT_EQ(util::Utf8ToUtf16(sLongString), util::GetString16(test, 2).to_string()); size_t len; EXPECT_TRUE(test.stringAt(3, &len) != nullptr || |