Delete redundant function rtc::tokenize_with_empty_tokens
It was identical to rtc::split.
Bug: webrtc:6424
Change-Id: I1118ad34050c0eb324ade347c97174f3ad4b39a7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/231234
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#34946}
diff --git a/rtc_base/string_encode_unittest.cc b/rtc_base/string_encode_unittest.cc
index 96b6445..3dd79c9 100644
--- a/rtc_base/string_encode_unittest.cc
+++ b/rtc_base/string_encode_unittest.cc
@@ -169,22 +169,6 @@
ASSERT_EQ(0ul, fields.size());
}
-TEST(TokenizeTest, TokenizeWithEmptyTokens) {
- std::vector<std::string> fields;
- EXPECT_EQ(3ul, tokenize_with_empty_tokens("a.b.c", '.', &fields));
- EXPECT_EQ("a", fields[0]);
- EXPECT_EQ("b", fields[1]);
- EXPECT_EQ("c", fields[2]);
-
- EXPECT_EQ(3ul, tokenize_with_empty_tokens("..c", '.', &fields));
- EXPECT_TRUE(fields[0].empty());
- EXPECT_TRUE(fields[1].empty());
- EXPECT_EQ("c", fields[2]);
-
- EXPECT_EQ(1ul, tokenize_with_empty_tokens("", '.', &fields));
- EXPECT_TRUE(fields[0].empty());
-}
-
TEST(TokenizeFirstTest, NoLeadingSpaces) {
std::string token;
std::string rest;
@@ -267,6 +251,22 @@
ASSERT_STREQ("", fields.at(0).c_str());
}
+TEST(SplitTest, EmptyTokens) {
+ std::vector<std::string> fields;
+ EXPECT_EQ(3ul, split("a.b.c", '.', &fields));
+ EXPECT_EQ("a", fields[0]);
+ EXPECT_EQ("b", fields[1]);
+ EXPECT_EQ("c", fields[2]);
+
+ EXPECT_EQ(3ul, split("..c", '.', &fields));
+ EXPECT_TRUE(fields[0].empty());
+ EXPECT_TRUE(fields[1].empty());
+ EXPECT_EQ("c", fields[2]);
+
+ EXPECT_EQ(1ul, split("", '.', &fields));
+ EXPECT_TRUE(fields[0].empty());
+}
+
TEST(ToString, SanityCheck) {
EXPECT_EQ(ToString(true), "true");
EXPECT_EQ(ToString(false), "false");