diff options
author | Ted Gould <ted@gould.cx> | 2014-09-19 10:02:12 -0500 |
---|---|---|
committer | Ted Gould <ted@gould.cx> | 2014-09-19 10:02:12 -0500 |
commit | ed608b34cea261eb3bd583690f97542ef589b351 (patch) | |
tree | 9a4e9b032dae9d5d2c2195a02d95cc7d6e139d81 /tests/modules/common/qtmir_test.h | |
parent | fb935616ac155e33af9b287b2596d74f297a2c95 (diff) |
Making the test suite compile
Diffstat (limited to 'tests/modules/common/qtmir_test.h')
-rw-r--r-- | tests/modules/common/qtmir_test.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/tests/modules/common/qtmir_test.h b/tests/modules/common/qtmir_test.h index 0646bf6..d3b480e 100644 --- a/tests/modules/common/qtmir_test.h +++ b/tests/modules/common/qtmir_test.h @@ -32,8 +32,6 @@ #include "mock_application_controller.h" #include "mock_desktop_file_reader.h" -#include "mock_oom_controller.h" -#include "mock_process_controller.h" #include "mock_proc_info.h" #include "mock_mir_session.h" #include "mock_focus_controller.h" @@ -80,12 +78,7 @@ class QtMirTest : public ::testing::Test { public: QtMirTest() - : processController{ - QSharedPointer<ProcessController::OomController> ( - &oomController, - [](ProcessController::OomController*){}) - } - , mirConfig{ + : mirConfig{ QSharedPointer<FakeMirServerConfiguration> (new FakeMirServerConfiguration) } , taskController{ @@ -94,10 +87,7 @@ public: nullptr, QSharedPointer<ApplicationController>( &appController, - [](ApplicationController*){}), - QSharedPointer<ProcessController>( - &processController, - [](ProcessController*){}) + [](ApplicationController*){}) ) ) } @@ -150,8 +140,6 @@ public: return nullptr; } - testing::NiceMock<testing::MockOomController> oomController; - testing::NiceMock<testing::MockProcessController> processController; testing::NiceMock<testing::MockApplicationController> appController; testing::NiceMock<testing::MockProcInfo> procInfo; testing::NiceMock<testing::MockDesktopFileReaderFactory> desktopFileReaderFactory; |