diff options
author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-17 18:24:28 +0000 |
---|---|---|
committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-17 18:24:28 +0000 |
commit | 9402afc1bc40cae93acd6b77831cdfa3f207b008 (patch) | |
tree | 8c1052b5e384c56f76d49f5ff26b06db739f28e2 /media | |
parent | 6a34951a5e4790e8031788372632eabbeef9bbc2 (diff) | |
download | chromium_src-9402afc1bc40cae93acd6b77831cdfa3f207b008.zip chromium_src-9402afc1bc40cae93acd6b77831cdfa3f207b008.tar.gz chromium_src-9402afc1bc40cae93acd6b77831cdfa3f207b008.tar.bz2 |
Remove the bulk of log spam from media_unittests runs.
BUG=none
TEST=run media_unittests, observe significant reduction in logspam.
Review URL: http://codereview.chromium.org/9220002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117921 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r-- | media/base/mock_filters.cc | 11 | ||||
-rw-r--r-- | media/base/yuv_convert_unittest.cc | 2 | ||||
-rw-r--r-- | media/filters/video_renderer_base_unittest.cc | 3 |
3 files changed, 13 insertions, 3 deletions
diff --git a/media/base/mock_filters.cc b/media/base/mock_filters.cc index 298892a..ad3bc38 100644 --- a/media/base/mock_filters.cc +++ b/media/base/mock_filters.cc @@ -11,6 +11,7 @@ using ::testing::_; using ::testing::Invoke; using ::testing::NotNull; +using ::testing::Return; namespace media { @@ -67,7 +68,11 @@ void MockDemuxerFactory::RunBuildCallback(const std::string& url, } MockDemuxer::MockDemuxer() - : total_bytes_(-1), buffered_bytes_(-1), duration_() {} + : total_bytes_(-1), buffered_bytes_(-1), duration_() { + EXPECT_CALL(*this, GetBitrate()).WillRepeatedly(Return(0)); + EXPECT_CALL(*this, IsLocalSource()).WillRepeatedly(Return(false)); + EXPECT_CALL(*this, IsSeekable()).WillRepeatedly(Return(false)); +} MockDemuxer::~MockDemuxer() {} @@ -95,7 +100,9 @@ MockDemuxerStream::MockDemuxerStream() {} MockDemuxerStream::~MockDemuxerStream() {} -MockVideoDecoder::MockVideoDecoder() {} +MockVideoDecoder::MockVideoDecoder() { + EXPECT_CALL(*this, HasAlpha()).WillRepeatedly(Return(false)); +} MockVideoDecoder::~MockVideoDecoder() {} diff --git a/media/base/yuv_convert_unittest.cc b/media/base/yuv_convert_unittest.cc index 3a74bb2..7d059c7 100644 --- a/media/base/yuv_convert_unittest.cc +++ b/media/base/yuv_convert_unittest.cc @@ -358,7 +358,7 @@ TEST(YUVConvertTest, RGB32ToYUV) { } // Make sure error is within bound. - LOG(INFO) << "Average error per channel: " << error / kRGBSize; + DVLOG(1) << "Average error per channel: " << error / kRGBSize; EXPECT_GT(5, error / kRGBSize); } diff --git a/media/filters/video_renderer_base_unittest.cc b/media/filters/video_renderer_base_unittest.cc index 5f395c7..88a1b1a 100644 --- a/media/filters/video_renderer_base_unittest.cc +++ b/media/filters/video_renderer_base_unittest.cc @@ -61,6 +61,9 @@ class VideoRendererBaseTest : public ::testing::Test { EXPECT_CALL(stats_callback_object_, OnStatistics(_)) .Times(AnyNumber()); + + EXPECT_CALL(*this, SetOpaqueCBWasCalled(_)) + .WillRepeatedly(::testing::Return()); } virtual ~VideoRendererBaseTest() { |