Merge lp:~jhodapp/media-hub/add-integrations-tests into lp:~thomas-voss/media-hub/add-integration-tests

[Jim Hodapp]

ServiceImplementation unit test that tests pausing a multimedia player session when another player instance is played.

ServiceImplementation unit test that tests pausing a multimedia player session when another player instance is played.

[Thomas Voß (thomas-voss)]

Thanks for the test. Some minor niggles noted down inline.

review: Needs Fixing

[lp:~jhodapp/media-hub/add-integrations-tests]

125. By Jim Hodapp on 2015-03-04

Make test name make_keyed_multimedia_player into make_keyed_playing_multimedia_player to be more verbose.

[lp:~jhodapp/media-hub/add-integrations-tests]

126. By Jim Hodapp on 2015-03-05

Get rid of unneeded cout debug statements since they're redundant with Google Mock's built in tracing.

Unmerged revisions

126. By Jim Hodapp on 2015-03-05

Get rid of unneeded cout debug statements since they're redundant with Google Mock's built in tracing.

125. By Jim Hodapp on 2015-03-04

Make test name make_keyed_multimedia_player into make_keyed_playing_multimedia_player to be more verbose.

124. By Jim Hodapp on 2014-12-15

ServiceImplementation unit test that tests pausing a multimedia player session when another player instance is played.

=== modified file 'tests/integration-tests/service_implementation_test.cpp'
--- tests/integration-tests/service_implementation_test.cpp	2014-11-22 21:29:28 +0000
+++ tests/integration-tests/service_implementation_test.cpp	2015-03-05 16:20:25 +0000
@@ -219,6 +219,19 @@
     };
 }
 
+// Provide a version of the MockPlayer that has a useful key instead of
+// only having one static value for all instances.
+struct KeyedMockPlayer : public MockPlayer
+{
+    KeyedMockPlayer()
+    {
+        using namespace ::testing;
+
+        static unsigned int the_key = 0;
+        ON_CALL(*this, key()).WillByDefault(Return(++the_key));
+    }
+};
+
 std::shared_ptr<::testing::NiceMock<MockPlayer>> make_alarm_player()
 {
     auto player = std::make_shared<::testing::NiceMock<MockPlayer>>();
@@ -235,6 +248,14 @@
     return player;
 }
 
+std::shared_ptr<::testing::NiceMock<KeyedMockPlayer>> make_keyed_playing_multimedia_player()
+{
+    auto player = std::make_shared<::testing::NiceMock<KeyedMockPlayer>>();
+    player->playback_status() = media::Player::PlaybackStatus::playing;
+    player->audio_stream_role() = media::Player::AudioStreamRole::multimedia;
+    return player;
+}
+
 // Our default player key we use in testing.
 constexpr const media::Player::PlayerKey the_player_key{42};
 }
@@ -363,6 +384,38 @@
     audio_output_observer->properties.external_output_state = media::audio::OutputState::disconnected;
 }
 
+TEST(ServiceImplementation, pauses_first_multimedia_session_when_second_multimedia_session_plays)
+{
+    using namespace ::testing;
+
+    // Create 2 mocked player instances
+    auto multimedia_player1 = make_keyed_playing_multimedia_player();
+    auto multimedia_player2 = make_keyed_playing_multimedia_player();
+
+    // Layout the test expectations. Player 1 will first play test.mp3,
+    // and player 2 will play test.mp3. Player 1 should automatically
+    // be paused when we call pause_other_session with key 2.
+    EXPECT_CALL(*multimedia_player1, pause()).Times(1);
+    EXPECT_CALL(*multimedia_player2, pause()).Times(0);
+
+    auto mc = make_mocked_configuration();
+
+    auto keyed_player_store = std::get<idx::keyed_player_store>(mc);
+
+    keyed_player_store->properties.map[multimedia_player1->key()] = multimedia_player1;
+    keyed_player_store->properties.map[multimedia_player2->key()] = multimedia_player2;
+
+    auto impl = media::ServiceImplementation::create(tie_to_mocked_configuration(mc));
+
+    multimedia_player1->open_uri("../test.mp3");
+    multimedia_player1->play();
+
+    // multimedia_player1 should pause before multimedia_player2 starts playing
+    multimedia_player2->open_uri("../test.mp3");
+    impl->pause_other_sessions(multimedia_player2->key());
+    multimedia_player2->play();
+}
+
 TEST(ServiceImplementation, pauses_all_multimedia_sessions_when_accepting_a_call)
 {
     auto multimedia_player = make_multimedia_player();

=== modified file 'tests/mock/keyed_player_store.h'
--- tests/mock/keyed_player_store.h	2014-11-24 13:24:08 +0000
+++ tests/mock/keyed_player_store.h	2015-03-05 16:20:25 +0000
@@ -38,6 +38,8 @@
                 .WillByDefault(Invoke(this, &MockKeyedPlayerStore::do_enumerate));
         ON_CALL(*this, player_for_key(_))
                 .WillByDefault(Invoke(this, &MockKeyedPlayerStore::do_player_for_key));
+        ON_CALL(*this, has_player_for_key(_))
+                .WillByDefault(Invoke(this, &MockKeyedPlayerStore::do_has_player_for_key));
     }
 
     MOCK_CONST_METHOD0(current_player, const core::Property<std::shared_ptr<core::ubuntu::media::Player>>&());
@@ -59,6 +61,11 @@
         return properties.map.at(key);
     }
 
+    bool do_has_player_for_key(const core::ubuntu::media::Player::PlayerKey& key)
+    {
+        return do_player_for_key(key) != nullptr;
+    }
+
     struct
     {
         std::map<core::ubuntu::media::Player::PlayerKey, std::shared_ptr<core::ubuntu::media::Player>> map;