lp://staging/~thomas-voss/media-hub/enable-integration-testing

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://staging/media-hub

Ubuntu Phablet Team: Pending requested 2014-11-17

Diff: 5174 lines (+3484/-862)

44 files modified

include/core/media/player.h (+1/-1)
src/core/media/CMakeLists.txt (+10/-4)
src/core/media/base_engine.cpp (+181/-0)
src/core/media/base_engine.h (+100/-0)
src/core/media/base_player.cpp (+250/-0)
src/core/media/base_player.h (+127/-0)
src/core/media/engine.cpp (+20/-0)
src/core/media/engine.h (+4/-0)
src/core/media/engine_factory.h (+39/-0)
src/core/media/gstreamer/engine_factory.cpp (+31/-0)
src/core/media/gstreamer/engine_factory.h (+40/-0)
src/core/media/gstreamer/playbin.cpp (+1/-1)
src/core/media/hashed_keyed_player_store.cpp (+80/-0)
src/core/media/hashed_keyed_player_store.h (+76/-0)
src/core/media/keyed_player_store.h (+83/-0)
src/core/media/mpris/exported.h (+305/-0)
src/core/media/mutable_player.h (+60/-0)
src/core/media/player.cpp (+1/-7)
src/core/media/player_configuration.h (+3/-9)
src/core/media/player_implementation.cpp (+8/-19)
src/core/media/player_implementation.h (+10/-8)
src/core/media/player_skeleton.cpp (+214/-233)
src/core/media/player_skeleton.h (+26/-36)
src/core/media/player_stub.h (+1/-1)
src/core/media/power/state_controller.cpp (+30/-0)
src/core/media/power/state_controller.h (+5/-0)
src/core/media/server/server.cpp (+33/-7)
src/core/media/service_implementation.cpp (+53/-50)
src/core/media/service_implementation.h (+18/-9)
src/core/media/service_skeleton.cpp (+62/-384)
src/core/media/service_skeleton.h (+25/-32)
tests/CMakeLists.txt (+27/-12)
tests/acceptance-tests/service.cpp (+2/-0)
tests/integration-tests/CMakeLists.txt (+4/-0)
tests/integration-tests/player_implementation_test.cpp (+274/-0)
tests/integration-tests/player_skeleton_test.cpp (+363/-0)
tests/integration-tests/service_implementation_test.cpp (+421/-0)
tests/mock/client_death_observer.h (+48/-0)
tests/mock/engine.h (+83/-0)
tests/mock/keyed_player_store.h (+64/-0)
tests/mock/player.h (+75/-0)
tests/mock/power_state_controller.h (+127/-0)
tests/unit-tests/CMakeLists.txt (+2/-49)
tests/unit-tests/hashed_keyed_player_store_test.cpp (+97/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

109. By Thomas Voß on 2014-11-19

Move mocks and tests around to make them reusable and correctly classified.

108. By Thomas Voß on 2014-11-19

Add further tests around ServiceImplementation.

107. By Thomas Voß on 2014-11-18

Add tests for HashedKeyedPlayerStore.
Add tests for ServiceImplementation.

106. By Thomas Voß on 2014-11-18

Add further testing for PlayerSkeleton.

105. By Thomas Voß on 2014-11-18

Add the first test cases for PlayerSkeleton.

104. By Thomas Voß on 2014-11-18

Add a first set of test cases around media::PlayerImplementation.

103. By Thomas Voß on 2014-11-17

Refactor implementation to allow for testing PlayerImplementation in isolation.

102. By Thomas Voß on 2014-11-17

Make ClientDeathObserver instance a dependency passed down through ctors.

101. By Thomas Voß on 2014-11-17

Adjust setup of service instance in acceptance tests.

100. By Thomas Voß on 2014-11-17

Re-merge prerequisite branch.