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

10
modules/video_coding/codecs/multiplex/test/multiplex_adapter_unittest.cc
View File

@ -44,8 +44,8 @@
#include "test/gtest.h"
#include "test/video_codec_settings.h"
using testing::_;
using testing::Return;
using ::testing::_;
using ::testing::Return;
namespace webrtc {
@ -53,9 +53,9 @@ constexpr const char* kMultiplexAssociatedCodecName = cricket::kVp9CodecName;
const VideoCodecType kMultiplexAssociatedCodecType =
PayloadStringToCodecType(kMultiplexAssociatedCodecName);
class TestMultiplexAdapter
: public VideoCodecUnitTest,
public testing::WithParamInterface<bool /* supports_augmenting_data */> {
class TestMultiplexAdapter : public VideoCodecUnitTest,
public ::testing::WithParamInterface<
bool /* supports_augmenting_data */> {
public:
TestMultiplexAdapter()
: decoder_factory_(new webrtc::MockVideoDecoderFactory),

2
modules/video_coding/codecs/test/videoprocessor_unittest.cc
View File

@ -39,7 +39,7 @@ const int kFrameSize = kWidth * kHeight * 3 / 2; // I420.
} // namespace
class VideoProcessorTest : public testing::Test {
class VideoProcessorTest : public ::testing::Test {
protected:
VideoProcessorTest() : q_("VP queue") {
config_.SetCodecSettings(cricket::kVp8CodecName, 1, 1, 1, false, false,

10
modules/video_coding/codecs/vp8/test/vp8_impl_unittest.cc
View File

@ -27,11 +27,11 @@
namespace webrtc {
using testing::_;
using testing::ElementsAreArray;
using testing::Invoke;
using testing::NiceMock;
using testing::Return;
using ::testing::_;
using ::testing::ElementsAreArray;
using ::testing::Invoke;
using ::testing::NiceMock;
using ::testing::Return;
using EncoderInfo = webrtc::VideoEncoder::EncoderInfo;
using FramerateFractions =
absl::InlinedVector<uint8_t, webrtc::kMaxTemporalStreams>;

4
modules/video_coding/codecs/vp9/svc_rate_allocator_unittest.cc
View File

@ -197,8 +197,8 @@ TEST(SvcRateAllocatorTest, NoPaddingIfAllLayersAreDeactivated) {
}
class SvcRateAllocatorTestParametrizedContentType
: public testing::Test,
public testing::WithParamInterface<bool> {
: public ::testing::Test,
public ::testing::WithParamInterface<bool> {
public:
SvcRateAllocatorTestParametrizedContentType()
: is_screen_sharing_(GetParam()) {}

2
modules/video_coding/codecs/vp9/test/vp9_impl_unittest.cc
View File

@ -24,7 +24,7 @@
namespace webrtc {
using testing::ElementsAreArray;
using ::testing::ElementsAreArray;
using EncoderInfo = webrtc::VideoEncoder::EncoderInfo;
using FramerateFractions =
absl::InlinedVector<uint8_t, webrtc::kMaxTemporalStreams>;

4
modules/video_coding/frame_buffer2_unittest.cc
View File

@ -25,8 +25,8 @@
#include "test/gmock.h"
#include "test/gtest.h"
using testing::_;
using testing::Return;
using ::testing::_;
using ::testing::Return;
namespace webrtc {
namespace video_coding {

2
modules/video_coding/h264_sprop_parameter_sets_unittest.cc
View File

@ -16,7 +16,7 @@
namespace webrtc {
class H264SpropParameterSetsTest : public testing::Test {
class H264SpropParameterSetsTest : public ::testing::Test {
public:
H264SpropParameterSets h264_sprop;
};

24
modules/video_coding/utility/simulcast_test_fixture_impl.cc
View File

@ -854,9 +854,9 @@ void SimulcastTestFixtureImpl::TestDecodeWidthHeightSet() {
EXPECT_CALL(encoder_callback, OnEncodedImage(_, _, _))
.Times(3)
.WillRepeatedly(
testing::Invoke([&](const EncodedImage& encoded_image,
const CodecSpecificInfo* codec_specific_info,
const RTPFragmentationHeader* fragmentation) {
::testing::Invoke([&](const EncodedImage& encoded_image,
const CodecSpecificInfo* codec_specific_info,
const RTPFragmentationHeader* fragmentation) {
EXPECT_EQ(encoded_image._frameType, VideoFrameType::kVideoFrameKey);
size_t index = encoded_image.SpatialIndex().value_or(0);
@ -873,27 +873,27 @@ void SimulcastTestFixtureImpl::TestDecodeWidthHeightSet() {
EXPECT_EQ(0, encoder_->Encode(*input_frame_, NULL));
EXPECT_CALL(decoder_callback, Decoded(_, _, _))
.WillOnce(testing::Invoke([](VideoFrame& decodedImage,
absl::optional<int32_t> decode_time_ms,
absl::optional<uint8_t> qp) {
.WillOnce(::testing::Invoke([](VideoFrame& decodedImage,
absl::optional<int32_t> decode_time_ms,
absl::optional<uint8_t> qp) {
EXPECT_EQ(decodedImage.width(), kDefaultWidth / 4);
EXPECT_EQ(decodedImage.height(), kDefaultHeight / 4);
}));
EXPECT_EQ(0, decoder_->Decode(encoded_frame[0], false, NULL, 0));
EXPECT_CALL(decoder_callback, Decoded(_, _, _))
.WillOnce(testing::Invoke([](VideoFrame& decodedImage,
absl::optional<int32_t> decode_time_ms,
absl::optional<uint8_t> qp) {
.WillOnce(::testing::Invoke([](VideoFrame& decodedImage,
absl::optional<int32_t> decode_time_ms,
absl::optional<uint8_t> qp) {
EXPECT_EQ(decodedImage.width(), kDefaultWidth / 2);
EXPECT_EQ(decodedImage.height(), kDefaultHeight / 2);
}));
EXPECT_EQ(0, decoder_->Decode(encoded_frame[1], false, NULL, 0));
EXPECT_CALL(decoder_callback, Decoded(_, _, _))
.WillOnce(testing::Invoke([](VideoFrame& decodedImage,
absl::optional<int32_t> decode_time_ms,
absl::optional<uint8_t> qp) {
.WillOnce(::testing::Invoke([](VideoFrame& decodedImage,
absl::optional<int32_t> decode_time_ms,
absl::optional<uint8_t> qp) {
EXPECT_EQ(decodedImage.width(), kDefaultWidth);
EXPECT_EQ(decodedImage.height(), kDefaultHeight);
}));