Adopt absl::string_view in rtc_base/string_to_number.*
Bug: webrtc:13579
Change-Id: I7e1a8ad6c493c9c0ac20c493d2467f0a2eda26d9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/256720
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Ali Tofigh <alito@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#36340}
diff --git a/rtc_base/string_to_number_unittest.cc b/rtc_base/string_to_number_unittest.cc
index f460b15..2d4c8d0 100644
--- a/rtc_base/string_to_number_unittest.cc
+++ b/rtc_base/string_to_number_unittest.cc
@@ -15,6 +15,8 @@
#include <limits>
#include <string>
+#include "absl/strings/string_view.h"
+#include "absl/types/optional.h"
#include "test/gtest.h"
namespace rtc {
@@ -80,6 +82,10 @@
const char kInvalidCharArray[] = "Invalid string containing 47";
const char kPlusMinusCharArray[] = "+-100";
const char kNumberFollowedByCruft[] = "640x480";
+ const char kEmbeddedNul[] = {'1', '2', '\0', '3', '4'};
+ const char kBeginningEmbeddedNul[] = {'\0', '1', '2', '3', '4'};
+ const char kTrailingEmbeddedNul[] = {'1', '2', '3', '4', '\0'};
+
EXPECT_EQ(absl::nullopt, StringToNumber<T>(kInvalidCharArray));
EXPECT_EQ(absl::nullopt, StringToNumber<T>(std::string(kInvalidCharArray)));
EXPECT_EQ(absl::nullopt, StringToNumber<T>(kPlusMinusCharArray));
@@ -92,6 +98,23 @@
EXPECT_EQ(absl::nullopt, StringToNumber<T>("- 5"));
EXPECT_EQ(absl::nullopt, StringToNumber<T>(" -5"));
EXPECT_EQ(absl::nullopt, StringToNumber<T>("5 "));
+ // Test various types of empty inputs
+ EXPECT_EQ(absl::nullopt, StringToNumber<T>(nullptr));
+ EXPECT_EQ(absl::nullopt, StringToNumber<T>(""));
+ EXPECT_EQ(absl::nullopt, StringToNumber<T>(std::string()));
+ EXPECT_EQ(absl::nullopt, StringToNumber<T>(std::string("")));
+ EXPECT_EQ(absl::nullopt, StringToNumber<T>(absl::string_view()));
+ EXPECT_EQ(absl::nullopt, StringToNumber<T>(absl::string_view(nullptr)));
+ EXPECT_EQ(absl::nullopt, StringToNumber<T>(absl::string_view("")));
+ // Test strings with embedded nuls.
+ EXPECT_EQ(absl::nullopt, StringToNumber<T>(absl::string_view(
+ kEmbeddedNul, sizeof(kEmbeddedNul))));
+ EXPECT_EQ(absl::nullopt,
+ StringToNumber<T>(absl::string_view(
+ kBeginningEmbeddedNul, sizeof(kBeginningEmbeddedNul))));
+ EXPECT_EQ(absl::nullopt,
+ StringToNumber<T>(absl::string_view(kTrailingEmbeddedNul,
+ sizeof(kTrailingEmbeddedNul))));
}
REGISTER_TYPED_TEST_SUITE_P(BasicNumberTest,