Chromium Code Reviews| Index: chromecast/browser/cast_media_blocker_unittest.cc |
| diff --git a/chromecast/browser/test/cast_media_blocker_test.cc b/chromecast/browser/cast_media_blocker_unittest.cc |
| similarity index 91% |
| rename from chromecast/browser/test/cast_media_blocker_test.cc |
| rename to chromecast/browser/cast_media_blocker_unittest.cc |
| index dec08acdc81bf6cbc13294b996c8f5fdd10a3579..8bd152e70c03e00684446cba67f3cea0c98cb17d 100644 |
| --- a/chromecast/browser/test/cast_media_blocker_test.cc |
| +++ b/chromecast/browser/cast_media_blocker_unittest.cc |
| @@ -30,12 +30,15 @@ class MockMediaSession : public content::MediaSession { |
| ON_CALL(*this, Suspend(_)) |
| .WillByDefault(Invoke(session, &MediaSession::Suspend)); |
| ON_CALL(*this, Stop(_)).WillByDefault(Invoke(session, &MediaSession::Stop)); |
| + ON_CALL(*this, DidReceiveAction(_)) |
| + .WillByDefault(Invoke(session, &MediaSession::DidReceiveAction)); |
| } |
| ~MockMediaSession() {} |
| MOCK_METHOD1(Resume, void(content::MediaSession::SuspendType)); |
| MOCK_METHOD1(Suspend, void(content::MediaSession::SuspendType)); |
| MOCK_METHOD1(Stop, void(content::MediaSession::SuspendType)); |
| + MOCK_METHOD1(DidReceiveAction, void(blink::mojom::MediaSessionAction)); |
| private: |
| DISALLOW_COPY_AND_ASSIGN(MockMediaSession); |
| @@ -73,7 +76,10 @@ class CastMediaBlockerTest : public content::RenderViewHostTestHarness { |
| DISALLOW_COPY_AND_ASSIGN(CastMediaBlockerTest); |
| }; |
| -TEST_F(CastMediaBlockerTest, Block_Unblock_Suspended) { |
| +// TODO(derekjchow): Make the tests pass on cast testbots. |
| +// crbug.com/665118 |
| + |
| +TEST_F(CastMediaBlockerTest, DISABLED_Block_Unblock_Suspended) { |
|
alokp
2016/11/14 21:15:37
Disabled because these tests never built or execut
|
| // Testing block/unblock operations do nothing if media never plays. |
| EXPECT_CALL(*media_session_, Suspend(_)).Times(0); |
| EXPECT_CALL(*media_session_, Resume(_)).Times(0); |
| @@ -89,7 +95,7 @@ TEST_F(CastMediaBlockerTest, Block_Unblock_Suspended) { |
| media_blocker_->BlockMediaLoading(false); |
| } |
| -TEST_F(CastMediaBlockerTest, No_Block) { |
| +TEST_F(CastMediaBlockerTest, DISABLED_No_Block) { |
| // Tests CastMediaBlocker does nothing if block/unblock is not called. |
| EXPECT_CALL(*media_session_, Suspend(_)).Times(0); |
| EXPECT_CALL(*media_session_, Resume(_)).Times(0); |
| @@ -114,7 +120,7 @@ TEST_F(CastMediaBlockerTest, No_Block) { |
| MediaSessionChanged(true, true); |
| } |
| -TEST_F(CastMediaBlockerTest, Block_Before_Controllable) { |
| +TEST_F(CastMediaBlockerTest, DISABLED_Block_Before_Controllable) { |
| // Tests CastMediaBlocker only suspends when controllable. |
| EXPECT_CALL(*media_session_, Suspend(_)).Times(0); |
| EXPECT_CALL(*media_session_, Resume(_)).Times(0); |
| @@ -127,7 +133,7 @@ TEST_F(CastMediaBlockerTest, Block_Before_Controllable) { |
| MediaSessionChanged(true, false); |
| } |
| -TEST_F(CastMediaBlockerTest, Block_After_Controllable) { |
| +TEST_F(CastMediaBlockerTest, DISABLED_Block_After_Controllable) { |
| // Tests CastMediaBlocker suspends immediately on block if controllable. |
| EXPECT_CALL(*media_session_, Suspend(_)).Times(0); |
| EXPECT_CALL(*media_session_, Resume(_)).Times(0); |
| @@ -147,7 +153,7 @@ TEST_F(CastMediaBlockerTest, Block_After_Controllable) { |
| media_blocker_->BlockMediaLoading(false); |
| } |
| -TEST_F(CastMediaBlockerTest, Block_Multiple) { |
| +TEST_F(CastMediaBlockerTest, DISABLED_Block_Multiple) { |
| // Tests CastMediaBlocker repeatively suspends when blocked. |
| EXPECT_CALL(*media_session_, Suspend(_)).Times(0); |
| EXPECT_CALL(*media_session_, Resume(_)).Times(0); |
| @@ -175,7 +181,7 @@ TEST_F(CastMediaBlockerTest, Block_Multiple) { |
| testing::Mock::VerifyAndClearExpectations(media_session_.get()); |
| } |
| -TEST_F(CastMediaBlockerTest, Block_Unblock_Uncontrollable) { |
| +TEST_F(CastMediaBlockerTest, DISABLED_Block_Unblock_Uncontrollable) { |
| // Tests CastMediaBlocker does not suspend or resume when uncontrollable. |
| EXPECT_CALL(*media_session_, Suspend(_)).Times(0); |
| EXPECT_CALL(*media_session_, Resume(_)).Times(0); |
| @@ -189,7 +195,7 @@ TEST_F(CastMediaBlockerTest, Block_Unblock_Uncontrollable) { |
| testing::Mock::VerifyAndClearExpectations(media_session_.get()); |
| } |
| -TEST_F(CastMediaBlockerTest, Block_Unblock_Uncontrollable2) { |
| +TEST_F(CastMediaBlockerTest, DISABLED_Block_Unblock_Uncontrollable2) { |
| EXPECT_CALL(*media_session_, Suspend(_)).Times(1); |
| EXPECT_CALL(*media_session_, Resume(_)).Times(0); |
| MediaSessionChanged(true, true); |
| @@ -212,7 +218,7 @@ TEST_F(CastMediaBlockerTest, Block_Unblock_Uncontrollable2) { |
| media_blocker_->BlockMediaLoading(false); |
| } |
| -TEST_F(CastMediaBlockerTest, Resume_When_Controllable) { |
| +TEST_F(CastMediaBlockerTest, DISABLED_Resume_When_Controllable) { |
| // Tests CastMediaBlocker will only resume after unblock when controllable. |
| EXPECT_CALL(*media_session_, Suspend(_)).Times(1); |
| EXPECT_CALL(*media_session_, Resume(_)).Times(0); |
| @@ -228,7 +234,7 @@ TEST_F(CastMediaBlockerTest, Resume_When_Controllable) { |
| MediaSessionChanged(true, true); |
| } |
| -TEST_F(CastMediaBlockerTest, No_Resume) { |
| +TEST_F(CastMediaBlockerTest, DISABLED_No_Resume) { |
| // Tests CastMediaBlocker will not resume if media starts playing by itself |
| // after unblock. |
| EXPECT_CALL(*media_session_, Suspend(_)).Times(1); |
| @@ -245,7 +251,7 @@ TEST_F(CastMediaBlockerTest, No_Resume) { |
| MediaSessionChanged(false, false); |
| } |
| -TEST_F(CastMediaBlockerTest, Block_Before_Resume) { |
| +TEST_F(CastMediaBlockerTest, DISABLED_Block_Before_Resume) { |
| // Tests CastMediaBlocker does not resume if blocked again after an unblock. |
| EXPECT_CALL(*media_session_, Suspend(_)).Times(1); |
| EXPECT_CALL(*media_session_, Resume(_)).Times(0); |
| @@ -262,7 +268,7 @@ TEST_F(CastMediaBlockerTest, Block_Before_Resume) { |
| MediaSessionChanged(true, true); |
| } |
| -TEST_F(CastMediaBlockerTest, Unblocked_Already_Playing) { |
| +TEST_F(CastMediaBlockerTest, DISABLED_Unblocked_Already_Playing) { |
| // Tests CastMediaBlocker does not resume if unblocked and media is playing. |
| EXPECT_CALL(*media_session_, Suspend(_)).Times(1); |
| EXPECT_CALL(*media_session_, Resume(_)).Times(0); |