Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(451)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/audio/alsa/alsa_output_unittest.cc

Issue 1302233003: Replace gmock's deprecated SetArgumentPointee with SetArgPointee. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 2017 Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gpu/command_buffer/service/test_helper.cc ('k') | media/audio/cras/cras_unified_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/alsa/alsa_output_unittest.cc
diff --git a/media/audio/alsa/alsa_output_unittest.cc b/media/audio/alsa/alsa_output_unittest.cc
index bb6073827d5a6a42936f0876b8ff2886213b478c..f2c55411701173a2ab533565e05d9f961c7fc7cb 100644
--- a/media/audio/alsa/alsa_output_unittest.cc
+++ b/media/audio/alsa/alsa_output_unittest.cc
@@ -34,7 +34,7 @@ using testing::InvokeWithoutArgs;
using testing::Mock;
using testing::MockFunction;
using testing::Return;
-using testing::SetArgumentPointee;
+using testing::SetArgPointee;
using testing::StrictMock;
using testing::StrEq;
using testing::Unused;
@@ -259,16 +259,14 @@ TEST_F(AlsaPcmOutputStreamTest, LatencyFloor) {
// AlsaPcmOutputStream::kMinLatencyMicros will get clipped to
// AlsaPcmOutputStream::kMinLatencyMicros,
EXPECT_CALL(mock_alsa_wrapper_, PcmOpen(_, _, _, _))
- .WillOnce(DoAll(SetArgumentPointee<0>(kFakeHandle),
- Return(0)));
+ .WillOnce(DoAll(SetArgPointee<0>(kFakeHandle), Return(0)));
EXPECT_CALL(mock_alsa_wrapper_,
PcmSetParams(_, _, _, _, _, _,
AlsaPcmOutputStream::kMinLatencyMicros))
.WillOnce(Return(0));
EXPECT_CALL(mock_alsa_wrapper_, PcmGetParams(_, _, _))
- .WillOnce(DoAll(SetArgumentPointee<1>(kTestFramesPerPacket),
- SetArgumentPointee<2>(kTestFramesPerPacket / 2),
- Return(0)));
+ .WillOnce(DoAll(SetArgPointee<1>(kTestFramesPerPacket),
+ SetArgPointee<2>(kTestFramesPerPacket / 2), Return(0)));
AlsaPcmOutputStream* test_stream = CreateStream(kTestChannelLayout,
kPacketFramesInMinLatency);
@@ -290,14 +288,13 @@ TEST_F(AlsaPcmOutputStreamTest, LatencyFloor) {
.InMicroseconds();
EXPECT_CALL(mock_alsa_wrapper_, PcmOpen(_, _, _, _))
- .WillOnce(DoAll(SetArgumentPointee<0>(kFakeHandle), Return(0)));
+ .WillOnce(DoAll(SetArgPointee<0>(kFakeHandle), Return(0)));
EXPECT_CALL(mock_alsa_wrapper_,
PcmSetParams(_, _, _, _, _, _, expected_micros))
.WillOnce(Return(0));
EXPECT_CALL(mock_alsa_wrapper_, PcmGetParams(_, _, _))
- .WillOnce(DoAll(SetArgumentPointee<1>(kTestFramesPerPacket),
- SetArgumentPointee<2>(kTestFramesPerPacket / 2),
- Return(0)));
+ .WillOnce(DoAll(SetArgPointee<1>(kTestFramesPerPacket),
+ SetArgPointee<2>(kTestFramesPerPacket / 2), Return(0)));
test_stream = CreateStream(kTestChannelLayout,
kOverMinLatencyPacketSize);
@@ -323,10 +320,9 @@ TEST_F(AlsaPcmOutputStreamTest, OpenClose) {
// with the resulting configuration data, and transitions the object state to
// kIsOpened.
EXPECT_CALL(mock_alsa_wrapper_,
- PcmOpen(_, StrEq(kTestDeviceName),
- SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK))
- .WillOnce(DoAll(SetArgumentPointee<0>(kFakeHandle),
- Return(0)));
+ PcmOpen(_, StrEq(kTestDeviceName), SND_PCM_STREAM_PLAYBACK,
+ SND_PCM_NONBLOCK))
+ .WillOnce(DoAll(SetArgPointee<0>(kFakeHandle), Return(0)));
EXPECT_CALL(mock_alsa_wrapper_,
PcmSetParams(kFakeHandle,
SND_PCM_FORMAT_U8,
@@ -337,9 +333,8 @@ TEST_F(AlsaPcmOutputStreamTest, OpenClose) {
expected_micros))
.WillOnce(Return(0));
EXPECT_CALL(mock_alsa_wrapper_, PcmGetParams(kFakeHandle, _, _))
- .WillOnce(DoAll(SetArgumentPointee<1>(kTestFramesPerPacket),
- SetArgumentPointee<2>(kTestFramesPerPacket / 2),
- Return(0)));
+ .WillOnce(DoAll(SetArgPointee<1>(kTestFramesPerPacket),
+ SetArgPointee<2>(kTestFramesPerPacket / 2), Return(0)));
// Open the stream.
AlsaPcmOutputStream* test_stream = CreateStream(kTestChannelLayout);
@@ -380,8 +375,7 @@ TEST_F(AlsaPcmOutputStreamTest, PcmOpenFailed) {
TEST_F(AlsaPcmOutputStreamTest, PcmSetParamsFailed) {
EXPECT_CALL(mock_alsa_wrapper_, PcmOpen(_, _, _, _))
- .WillOnce(DoAll(SetArgumentPointee<0>(kFakeHandle),
- Return(0)));
+ .WillOnce(DoAll(SetArgPointee<0>(kFakeHandle), Return(0)));
EXPECT_CALL(mock_alsa_wrapper_, PcmSetParams(_, _, _, _, _, _, _))
.WillOnce(Return(kTestFailedErrno));
EXPECT_CALL(mock_alsa_wrapper_, PcmClose(kFakeHandle))
@@ -411,14 +405,12 @@ TEST_F(AlsaPcmOutputStreamTest, StartStop) {
// with the resulting configuration data, and transitions the object state to
// kIsOpened.
EXPECT_CALL(mock_alsa_wrapper_, PcmOpen(_, _, _, _))
- .WillOnce(DoAll(SetArgumentPointee<0>(kFakeHandle),
- Return(0)));
+ .WillOnce(DoAll(SetArgPointee<0>(kFakeHandle), Return(0)));
EXPECT_CALL(mock_alsa_wrapper_, PcmSetParams(_, _, _, _, _, _, _))
.WillOnce(Return(0));
EXPECT_CALL(mock_alsa_wrapper_, PcmGetParams(_, _, _))
- .WillOnce(DoAll(SetArgumentPointee<1>(kTestFramesPerPacket),
- SetArgumentPointee<2>(kTestFramesPerPacket / 2),
- Return(0)));
+ .WillOnce(DoAll(SetArgPointee<1>(kTestFramesPerPacket),
+ SetArgPointee<2>(kTestFramesPerPacket / 2), Return(0)));
// Open the stream.
AlsaPcmOutputStream* test_stream = CreateStream(kTestChannelLayout);
@@ -438,7 +430,7 @@ TEST_F(AlsaPcmOutputStreamTest, StartStop) {
EXPECT_CALL(mock_alsa_wrapper_, PcmState(kFakeHandle))
.WillRepeatedly(Return(SND_PCM_STATE_RUNNING));
EXPECT_CALL(mock_alsa_wrapper_, PcmDelay(kFakeHandle, _))
- .WillRepeatedly(DoAll(SetArgumentPointee<1>(0), Return(0)));
+ .WillRepeatedly(DoAll(SetArgPointee<1>(0), Return(0)));
EXPECT_CALL(mock_callback,
OnMoreData(base::TimeDelta(), tick_clock->NowTicks(), 0, _))
.WillRepeatedly(DoAll(ClearBuffer(), Return(kTestFramesPerPacket)));
@@ -482,14 +474,12 @@ TEST_F(AlsaPcmOutputStreamTest, WritePacket_FinishedPacket) {
TEST_F(AlsaPcmOutputStreamTest, WritePacket_NormalPacket) {
// We need to open the stream before writing data to ALSA.
EXPECT_CALL(mock_alsa_wrapper_, PcmOpen(_, _, _, _))
- .WillOnce(DoAll(SetArgumentPointee<0>(kFakeHandle),
- Return(0)));
+ .WillOnce(DoAll(SetArgPointee<0>(kFakeHandle), Return(0)));
EXPECT_CALL(mock_alsa_wrapper_, PcmSetParams(_, _, _, _, _, _, _))
.WillOnce(Return(0));
EXPECT_CALL(mock_alsa_wrapper_, PcmGetParams(_, _, _))
- .WillOnce(DoAll(SetArgumentPointee<1>(kTestFramesPerPacket),
- SetArgumentPointee<2>(kTestFramesPerPacket / 2),
- Return(0)));
+ .WillOnce(DoAll(SetArgPointee<1>(kTestFramesPerPacket),
+ SetArgPointee<2>(kTestFramesPerPacket / 2), Return(0)));
AlsaPcmOutputStream* test_stream = CreateStream(kTestChannelLayout);
ASSERT_TRUE(test_stream->Open());
InitBuffer(test_stream);
@@ -529,14 +519,12 @@ TEST_F(AlsaPcmOutputStreamTest, WritePacket_NormalPacket) {
TEST_F(AlsaPcmOutputStreamTest, WritePacket_WriteFails) {
// We need to open the stream before writing data to ALSA.
EXPECT_CALL(mock_alsa_wrapper_, PcmOpen(_, _, _, _))
- .WillOnce(DoAll(SetArgumentPointee<0>(kFakeHandle),
- Return(0)));
+ .WillOnce(DoAll(SetArgPointee<0>(kFakeHandle), Return(0)));
EXPECT_CALL(mock_alsa_wrapper_, PcmSetParams(_, _, _, _, _, _, _))
.WillOnce(Return(0));
EXPECT_CALL(mock_alsa_wrapper_, PcmGetParams(_, _, _))
- .WillOnce(DoAll(SetArgumentPointee<1>(kTestFramesPerPacket),
- SetArgumentPointee<2>(kTestFramesPerPacket / 2),
- Return(0)));
+ .WillOnce(DoAll(SetArgPointee<1>(kTestFramesPerPacket),
+ SetArgPointee<2>(kTestFramesPerPacket / 2), Return(0)));
AlsaPcmOutputStream* test_stream = CreateStream(kTestChannelLayout);
ASSERT_TRUE(test_stream->Open());
InitBuffer(test_stream);
@@ -601,7 +589,7 @@ TEST_F(AlsaPcmOutputStreamTest, BufferPacket) {
EXPECT_CALL(mock_alsa_wrapper_, PcmState(_))
.WillOnce(Return(SND_PCM_STATE_RUNNING));
EXPECT_CALL(mock_alsa_wrapper_, PcmDelay(_, _))
- .WillOnce(DoAll(SetArgumentPointee<1>(1), Return(0)));
+ .WillOnce(DoAll(SetArgPointee<1>(1), Return(0)));
EXPECT_CALL(mock_alsa_wrapper_, PcmAvailUpdate(_))
.WillRepeatedly(Return(0)); // Buffer is full.
@@ -633,7 +621,7 @@ TEST_F(AlsaPcmOutputStreamTest, BufferPacket_Negative) {
EXPECT_CALL(mock_alsa_wrapper_, PcmState(_))
.WillOnce(Return(SND_PCM_STATE_RUNNING));
EXPECT_CALL(mock_alsa_wrapper_, PcmDelay(_, _))
- .WillOnce(DoAll(SetArgumentPointee<1>(-1), Return(0)));
+ .WillOnce(DoAll(SetArgPointee<1>(-1), Return(0)));
EXPECT_CALL(mock_alsa_wrapper_, PcmAvailUpdate(_))
.WillRepeatedly(Return(0)); // Buffer is full.
EXPECT_CALL(mock_callback,
@@ -730,14 +718,14 @@ TEST_F(AlsaPcmOutputStreamTest, AutoSelectDevice_DeviceSelect) {
// The DeviceNameHint and DeviceNameFreeHint need to be paired to avoid a
// memory leak.
EXPECT_CALL(mock_alsa_wrapper_, DeviceNameHint(_, _, _))
- .WillOnce(DoAll(SetArgumentPointee<2>(&kFakeHints[0]), Return(0)));
+ .WillOnce(DoAll(SetArgPointee<2>(&kFakeHints[0]), Return(0)));
EXPECT_CALL(mock_alsa_wrapper_, DeviceNameFreeHint(&kFakeHints[0]))
.Times(1);
}
EXPECT_CALL(mock_alsa_wrapper_,
PcmOpen(_, StrEq(kExpectedDeviceName[i]), _, _))
- .WillOnce(DoAll(SetArgumentPointee<0>(kFakeHandle), Return(0)));
+ .WillOnce(DoAll(SetArgPointee<0>(kFakeHandle), Return(0)));
EXPECT_CALL(mock_alsa_wrapper_,
PcmSetParams(kFakeHandle, _, _, i, _, _, _))
.WillOnce(Return(0));
@@ -784,7 +772,7 @@ TEST_F(AlsaPcmOutputStreamTest, AutoSelectDevice_FallbackDevices) {
AlsaPcmOutputStream::kDefaultDevice;
EXPECT_CALL(mock_alsa_wrapper_, DeviceNameHint(_, _, _))
- .WillOnce(DoAll(SetArgumentPointee<2>(&kFakeHints[0]), Return(0)));
+ .WillOnce(DoAll(SetArgPointee<2>(&kFakeHints[0]), Return(0)));
EXPECT_CALL(mock_alsa_wrapper_, DeviceNameFreeHint(&kFakeHints[0]))
.Times(1);
EXPECT_CALL(mock_alsa_wrapper_, DeviceNameGetHint(_, StrEq("IOID")))
@@ -818,7 +806,7 @@ TEST_F(AlsaPcmOutputStreamTest, AutoSelectDevice_HintFail) {
.WillRepeatedly(Return(kTestFailedErrno));
EXPECT_CALL(mock_alsa_wrapper_,
PcmOpen(_, StrEq(AlsaPcmOutputStream::kDefaultDevice), _, _))
- .WillOnce(DoAll(SetArgumentPointee<0>(kFakeHandle), Return(0)));
+ .WillOnce(DoAll(SetArgPointee<0>(kFakeHandle), Return(0)));
EXPECT_CALL(mock_alsa_wrapper_,
PcmSetParams(kFakeHandle, _, _, 2, _, _, _))
.WillOnce(Return(0));
« no previous file with comments | « gpu/command_buffer/service/test_helper.cc ('k') | media/audio/cras/cras_unified_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698