zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fully qualify googletest symbols.

Browse Source 
Semi-automatically created with:

git grep -l " testing::" | xargs sed -i "s/ testing::/ ::testing::/g"
git grep -l "(testing::" | xargs sed -i "s/(testing::/(::testing::/g"
git cl format

After this, two .cc files failed to compile and I have fixed them
manually.

Bug: webrtc:10523
Change-Id: I4741d3bcedc831b6c5fdc04485678617eb4ce031
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132018
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27526}
This commit is contained in:
Mirko Bonadei
2019-04-09 15:11:12 +02:00
committed by Commit Bot
parent a857698d54
commit 6a489f22c7
210 changed files with 818 additions and 808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
modules/congestion_controller/pcc/bitrate_controller_unittest.cc
View File

@ -109,10 +109,10 @@ TEST(PccBitrateControllerTest, IncreaseRateWhenNoChangesForTestBitrates) {
TEST(PccBitrateControllerTest, NoChangesWhenUtilityFunctionDoesntChange) {
std::unique_ptr<MockUtilityFunction> mock_utility_function =
absl::make_unique<MockUtilityFunction>();
EXPECT_CALL(*mock_utility_function, Compute(testing::_))
EXPECT_CALL(*mock_utility_function, Compute(::testing::_))
.Times(2)
.WillOnce(testing::Return(100))
.WillOnce(testing::Return(100));
.WillOnce(::testing::Return(100))
.WillOnce(::testing::Return(100));
PccBitrateController bitrate_controller(
kInitialConversionFactor, kInitialDynamicBoundary,
@ -144,10 +144,10 @@ TEST(PccBitrateControllerTest, NoBoundaryWhenSmallGradient) {
const double kSecondMonitorIntervalUtility =
2 * kTargetSendingRate.bps() * kEpsilon;
EXPECT_CALL(*mock_utility_function, Compute(testing::_))
EXPECT_CALL(*mock_utility_function, Compute(::testing::_))
.Times(2)
.WillOnce(testing::Return(kFirstMonitorIntervalUtility))
.WillOnce(testing::Return(kSecondMonitorIntervalUtility));
.WillOnce(::testing::Return(kFirstMonitorIntervalUtility))
.WillOnce(::testing::Return(kSecondMonitorIntervalUtility));
PccBitrateController bitrate_controller(
kInitialConversionFactor, kInitialDynamicBoundary,
@ -182,12 +182,12 @@ TEST(PccBitrateControllerTest, FaceBoundaryWhenLargeGradient) {
10 * kInitialDynamicBoundary * kTargetSendingRate.bps() * 2 *
kTargetSendingRate.bps() * kEpsilon;
EXPECT_CALL(*mock_utility_function, Compute(testing::_))
EXPECT_CALL(*mock_utility_function, Compute(::testing::_))
.Times(4)
.WillOnce(testing::Return(kFirstMonitorIntervalUtility))
.WillOnce(testing::Return(kSecondMonitorIntervalUtility))
.WillOnce(testing::Return(kFirstMonitorIntervalUtility))
.WillOnce(testing::Return(kSecondMonitorIntervalUtility));
.WillOnce(::testing::Return(kFirstMonitorIntervalUtility))
.WillOnce(::testing::Return(kSecondMonitorIntervalUtility))
.WillOnce(::testing::Return(kFirstMonitorIntervalUtility))
.WillOnce(::testing::Return(kSecondMonitorIntervalUtility));
PccBitrateController bitrate_controller(
kInitialConversionFactor, kInitialDynamicBoundary,
@ -220,16 +220,16 @@ TEST(PccBitrateControllerTest, SlowStartMode) {
std::unique_ptr<MockUtilityFunction> mock_utility_function =
absl::make_unique<MockUtilityFunction>();
constexpr double kFirstUtilityFunction = 1000;
EXPECT_CALL(*mock_utility_function, Compute(testing::_))
EXPECT_CALL(*mock_utility_function, Compute(::testing::_))
.Times(4)
// For first 3 calls we expect to stay in the SLOW_START mode and double
// the sending rate since the utility function increases its value. For
// the last call utility function decreases its value, this means that
// we should not double the sending rate and exit SLOW_START mode.
.WillOnce(testing::Return(kFirstUtilityFunction))
.WillOnce(testing::Return(kFirstUtilityFunction + 1))
.WillOnce(testing::Return(kFirstUtilityFunction + 2))
.WillOnce(testing::Return(kFirstUtilityFunction + 1));
.WillOnce(::testing::Return(kFirstUtilityFunction))
.WillOnce(::testing::Return(kFirstUtilityFunction + 1))
.WillOnce(::testing::Return(kFirstUtilityFunction + 2))
.WillOnce(::testing::Return(kFirstUtilityFunction + 1));
PccBitrateController bitrate_controller(
kInitialConversionFactor, kInitialDynamicBoundary,
@ -260,12 +260,12 @@ TEST(PccBitrateControllerTest, StepSizeIncrease) {
const double kSecondMiUtilityFunction =
2 * kTargetSendingRate.bps() * kEpsilon;
EXPECT_CALL(*mock_utility_function, Compute(testing::_))
EXPECT_CALL(*mock_utility_function, Compute(::testing::_))
.Times(4)
.WillOnce(testing::Return(kFirstMiUtilityFunction))
.WillOnce(testing::Return(kSecondMiUtilityFunction))
.WillOnce(testing::Return(kFirstMiUtilityFunction))
.WillOnce(testing::Return(kSecondMiUtilityFunction));
.WillOnce(::testing::Return(kFirstMiUtilityFunction))
.WillOnce(::testing::Return(kSecondMiUtilityFunction))
.WillOnce(::testing::Return(kFirstMiUtilityFunction))
.WillOnce(::testing::Return(kSecondMiUtilityFunction));
std::vector<PccMonitorInterval> monitor_block{
PccMonitorInterval(kTargetSendingRate * (1 + kEpsilon), kStartTime,
kIntervalDuration),

12
modules/congestion_controller/pcc/pcc_network_controller_unittest.cc
View File

@ -17,12 +17,12 @@
#include "test/gmock.h"
#include "test/gtest.h"
using testing::Field;
using testing::Matcher;
using testing::AllOf;
using testing::Ge;
using testing::Le;
using testing::Property;
using ::testing::AllOf;
using ::testing::Field;
using ::testing::Ge;
using ::testing::Le;
using ::testing::Matcher;
using ::testing::Property;
namespace webrtc {
namespace test {