~ci-train-bot/qtmir/qtmir-ubuntu-zesty-2457

Viewing changes to tests/framework/mock_task_controller.h

Committer: Bileto Bot
Author(s): Daniel d'Andrada
Date: 2017-02-23 11:18:40 UTC
mfrom: (606.1.2 byeSessionManager)
Revision ID: ci-train-bot@canonical.com-20170223111840-3pvx8w1eqy5i2v2n

Make TaskController absorb SessionManager

So that we can later on provide fake, internal, mir clients for tests
just by replacing the TaskController with a fake implementation.

Approved by: Gerry Boland, Unity8 CI Bot

files added:
src/modules/Unity/Application/taskcontroller.cpp

files removed:
src/modules/Unity/Application/sessionmanager.cpp

src/modules/Unity/Application/sessionmanager.h

files renamed:
tests/modules/SessionManager/ => tests/modules/Session/

tests/modules/SessionManager/session_manager_test.cpp => tests/modules/Session/taskcontroller_test.cpp

files modified:
src/modules/Unity/Application/CMakeLists.txt

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/application_manager.h

src/modules/Unity/Application/session_interface.h

src/modules/Unity/Application/surfacemanager.cpp

src/modules/Unity/Application/surfacemanager.h

src/modules/Unity/Application/taskcontroller.h

tests/framework/mock_task_controller.cpp

tests/framework/mock_task_controller.h

tests/framework/qtmir_test.cpp

tests/framework/qtmir_test.h

tests/modules/Application/application_test.cpp

tests/modules/ApplicationManager/application_manager_test.cpp

tests/modules/CMakeLists.txt

tests/modules/Session/CMakeLists.txt

tests/modules/Session/session_test.cpp

Show diffs side-by-side

added added

removed removed

tests/framework/mock_task_controller.h

{

struct MockTaskController : public qtmir::TaskController

{

MockTaskController();

MockTaskController(std::shared_ptr<qtmir::PromptSessionManager> promptSessionManager, QObject *parent = nullptr);

virtual ~MockTaskController();

MOCK_METHOD2(appIdHasProcessId, bool(const QString&, pid_t));

Older »