diff options
| author | Elliott Hughes <enh@google.com> | 2015-04-24 23:02:00 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-04-28 10:55:24 -0700 |
| commit | d81f75ae41b2eed4ae7b0911f250778f3e6ec9c2 (patch) | |
| tree | e7a5cf561d9ed9e2cfba4bcac39d14297fecb3a0 /base/strings_test.cpp | |
| parent | 03a90d663363c904d5b874f2de204a055c763b3c (diff) | |
| download | system_core-d81f75ae41b2eed4ae7b0911f250778f3e6ec9c2.zip system_core-d81f75ae41b2eed4ae7b0911f250778f3e6ec9c2.tar.gz system_core-d81f75ae41b2eed4ae7b0911f250778f3e6ec9c2.tar.bz2 | |
Remove strtok from adb.
Also fix android::base::Split to behave like Java, Python, and google3.
(cherry picked from commit 8d5fa6da44d56511b3e173bc463cbc65ff221b4a)
Change-Id: I9388ae37ee8dd4a4a6c2a9a19f068b70d9a78353
Diffstat (limited to 'base/strings_test.cpp')
| -rw-r--r-- | base/strings_test.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/base/strings_test.cpp b/base/strings_test.cpp index 1bf07a1..46a1ab5 100644 --- a/base/strings_test.cpp +++ b/base/strings_test.cpp @@ -23,7 +23,8 @@ TEST(strings, split_empty) { std::vector<std::string> parts = android::base::Split("", ","); - ASSERT_EQ(0U, parts.size()); + ASSERT_EQ(1U, parts.size()); + ASSERT_EQ("", parts[0]); } TEST(strings, split_single) { @@ -42,9 +43,10 @@ TEST(strings, split_simple) { TEST(strings, split_with_empty_part) { std::vector<std::string> parts = android::base::Split("foo,,bar", ","); - ASSERT_EQ(2U, parts.size()); + ASSERT_EQ(3U, parts.size()); ASSERT_EQ("foo", parts[0]); - ASSERT_EQ("bar", parts[1]); + ASSERT_EQ("", parts[1]); + ASSERT_EQ("bar", parts[2]); } TEST(strings, split_null_char) { @@ -65,9 +67,10 @@ TEST(strings, split_any) { TEST(strings, split_any_with_empty_part) { std::vector<std::string> parts = android::base::Split("foo:,bar", ",:"); - ASSERT_EQ(2U, parts.size()); + ASSERT_EQ(3U, parts.size()); ASSERT_EQ("foo", parts[0]); - ASSERT_EQ("bar", parts[1]); + ASSERT_EQ("", parts[1]); + ASSERT_EQ("bar", parts[2]); } TEST(strings, trim_empty) { |