6776518bea
This refactoring takes a careful approach to avoid rushing the change: * stub headers are left in all the old locations of webrtc/base * existing GN targets are kept and now just forward to the moved ones using public_deps. The only exception to the above is the base_java target and its .java files, which were moved to webrtc/rtc_base right away since it's not possible to use public_deps for android_library. To avoid breaking builds, a temporary Dummy.java file was added to the new intermediate target in webrtc/rtc_base:base_java as well to avoid hitting a GN assert in the android_library template. The above approach should make the transition smooth without breaking downstream. A helper script was created (https://codereview.webrtc.org/2879203002/) and was run like this: stub-headers.py -s webrtc/base -d webrtc/rtc_base -i 7634 stub-headers.py -s webrtc/base/numerics -d webrtc/rtc_base/numerics -i 7634 Fixed invalid header guards in the following files: webrtc/base/base64.h webrtc/base/cryptstring.h webrtc/base/event.h webrtc/base/flags.h webrtc/base/httpbase.h webrtc/base/httpcommon-inl.h webrtc/base/httpcommon.h webrtc/base/httpserver.h webrtc/base/logsinks.h webrtc/base/macutils.h webrtc/base/nattypes.h webrtc/base/openssladapter.h webrtc/base/opensslstreamadapter.h webrtc/base/pathutils.h webrtc/base/physicalsocketserver.h webrtc/base/proxyinfo.h webrtc/base/sigslot.h webrtc/base/sigslotrepeater.h webrtc/base/socket.h webrtc/base/socketaddresspair.h webrtc/base/socketfactory.h webrtc/base/stringutils.h webrtc/base/testbase64.h webrtc/base/testutils.h webrtc/base/transformadapter.h webrtc/base/win32filesystem.h Added new header guards to: sslroots.h testbase64.h BUG=webrtc:7634 NOTRY=True NOPRESUBMIT=True R=kwiberg@webrtc.org Review-Url: https://codereview.webrtc.org/2877023002 . Cr-Commit-Position: refs/heads/master@{#18816}
116 lines
4.8 KiB
C++
116 lines
4.8 KiB
C++
/*
|
|
* Copyright 2017 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/base/string_to_number.h"
|
|
|
|
#include <string>
|
|
#include <type_traits>
|
|
#include <limits>
|
|
|
|
#include "webrtc/base/gunit.h"
|
|
|
|
namespace rtc {
|
|
|
|
namespace {
|
|
// clang-format off
|
|
using IntegerTypes =
|
|
::testing::Types<char,
|
|
signed char, unsigned char, // NOLINT(runtime/int)
|
|
short, unsigned short, // NOLINT(runtime/int)
|
|
int, unsigned int, // NOLINT(runtime/int)
|
|
long, unsigned long, // NOLINT(runtime/int)
|
|
long long, unsigned long long, // NOLINT(runtime/int)
|
|
int8_t, uint8_t,
|
|
int16_t, uint16_t,
|
|
int32_t, uint32_t,
|
|
int64_t, uint64_t>;
|
|
// clang-format on
|
|
|
|
template <typename T>
|
|
class BasicNumberTest : public ::testing::Test {};
|
|
|
|
TYPED_TEST_CASE_P(BasicNumberTest);
|
|
|
|
TYPED_TEST_P(BasicNumberTest, TestValidNumbers) {
|
|
using T = TypeParam;
|
|
constexpr T min_value = std::numeric_limits<T>::lowest();
|
|
constexpr T max_value = std::numeric_limits<T>::max();
|
|
const std::string min_string = std::to_string(min_value);
|
|
const std::string max_string = std::to_string(max_value);
|
|
EXPECT_EQ(min_value, StringToNumber<T>(min_string));
|
|
EXPECT_EQ(min_value, StringToNumber<T>(min_string.c_str()));
|
|
EXPECT_EQ(max_value, StringToNumber<T>(max_string));
|
|
EXPECT_EQ(max_value, StringToNumber<T>(max_string.c_str()));
|
|
EXPECT_EQ(0, StringToNumber<T>("0"));
|
|
EXPECT_EQ(0, StringToNumber<T>("-0"));
|
|
EXPECT_EQ(0, StringToNumber<T>(std::string("-0000000000000")));
|
|
}
|
|
|
|
TYPED_TEST_P(BasicNumberTest, TestInvalidNumbers) {
|
|
using T = TypeParam;
|
|
// Value ranges aren't strictly enforced in this test, since that would either
|
|
// require doctoring specific strings for each data type, which is a hassle
|
|
// across platforms, or to be able to do addition of values larger than the
|
|
// largest type, which is another hassle.
|
|
constexpr T min_value = std::numeric_limits<T>::lowest();
|
|
constexpr T max_value = std::numeric_limits<T>::max();
|
|
// If the type supports negative values, make the large negative value
|
|
// approximately ten times larger. If the type is unsigned, just use -2.
|
|
const std::string too_low_string =
|
|
(min_value == 0) ? "-2" : (std::to_string(min_value) + "1");
|
|
// Make the large value approximately ten times larger than the maximum.
|
|
const std::string too_large_string = std::to_string(max_value) + "1";
|
|
EXPECT_EQ(rtc::Optional<T>(), StringToNumber<T>(too_low_string));
|
|
EXPECT_EQ(rtc::Optional<T>(), StringToNumber<T>(too_low_string.c_str()));
|
|
EXPECT_EQ(rtc::Optional<T>(), StringToNumber<T>(too_large_string));
|
|
EXPECT_EQ(rtc::Optional<T>(), StringToNumber<T>(too_large_string.c_str()));
|
|
}
|
|
|
|
TYPED_TEST_P(BasicNumberTest, TestInvalidInputs) {
|
|
using T = TypeParam;
|
|
const char kInvalidCharArray[] = "Invalid string containing 47";
|
|
const char kPlusMinusCharArray[] = "+-100";
|
|
const char kNumberFollowedByCruft[] = "640x480";
|
|
EXPECT_EQ(rtc::Optional<T>(), StringToNumber<T>(kInvalidCharArray));
|
|
EXPECT_EQ(rtc::Optional<T>(),
|
|
StringToNumber<T>(std::string(kInvalidCharArray)));
|
|
EXPECT_EQ(rtc::Optional<T>(), StringToNumber<T>(kPlusMinusCharArray));
|
|
EXPECT_EQ(rtc::Optional<T>(),
|
|
StringToNumber<T>(std::string(kPlusMinusCharArray)));
|
|
EXPECT_EQ(rtc::Optional<T>(), StringToNumber<T>(kNumberFollowedByCruft));
|
|
EXPECT_EQ(rtc::Optional<T>(),
|
|
StringToNumber<T>(std::string(kNumberFollowedByCruft)));
|
|
EXPECT_EQ(rtc::Optional<T>(), StringToNumber<T>(" 5"));
|
|
EXPECT_EQ(rtc::Optional<T>(), StringToNumber<T>(" - 5"));
|
|
EXPECT_EQ(rtc::Optional<T>(), StringToNumber<T>("- 5"));
|
|
EXPECT_EQ(rtc::Optional<T>(), StringToNumber<T>(" -5"));
|
|
EXPECT_EQ(rtc::Optional<T>(), StringToNumber<T>("5 "));
|
|
}
|
|
|
|
REGISTER_TYPED_TEST_CASE_P(BasicNumberTest,
|
|
TestValidNumbers,
|
|
TestInvalidNumbers,
|
|
TestInvalidInputs);
|
|
|
|
} // namespace
|
|
|
|
INSTANTIATE_TYPED_TEST_CASE_P(StringToNumberTest_Integers,
|
|
BasicNumberTest,
|
|
IntegerTypes);
|
|
|
|
TEST(StringToNumberTest, TestSpecificValues) {
|
|
EXPECT_EQ(rtc::Optional<uint8_t>(), StringToNumber<uint8_t>("256"));
|
|
EXPECT_EQ(rtc::Optional<uint8_t>(), StringToNumber<uint8_t>("-256"));
|
|
EXPECT_EQ(rtc::Optional<int8_t>(), StringToNumber<int8_t>("256"));
|
|
EXPECT_EQ(rtc::Optional<int8_t>(), StringToNumber<int8_t>("-256"));
|
|
}
|
|
|
|
} // namespace rtc
|