diff options
| author | Daniel d'Andrada <daniel.dandrada@canonical.com> | 2012-08-14 10:06:03 -0300 |
|---|---|---|
| committer | Daniel d'Andrada <daniel.dandrada@canonical.com> | 2012-08-14 10:06:03 -0300 |
| commit | f0a925d1675bef520573ad4a0935367eea5e61b5 (patch) | |
| tree | 8f46ed2124e94c8bec8a0d5c9a3e8239f5b1e203 /tests/test-gestures | |
| parent | 8b47775679112bb49d6e64d65ec13a5ead9b3ab7 (diff) | |
Removing unused LauncherControllerMock
(bzr r2534.1.9)
Diffstat (limited to 'tests/test-gestures')
| -rw-r--r-- | tests/test-gestures/LauncherControllerMock.h | 34 | ||||
| -rw-r--r-- | tests/test-gestures/unityshell_mock.h | 9 |
2 files changed, 1 insertions, 42 deletions
diff --git a/tests/test-gestures/LauncherControllerMock.h b/tests/test-gestures/LauncherControllerMock.h deleted file mode 100644 index 95e42d13a..000000000 --- a/tests/test-gestures/LauncherControllerMock.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2012 Canonical Ltd - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - * Authored by: Daniel d'Andrada <daniel.dandrada@canonical.com> - */ - -#ifndef LAUNCHER_CONTROLLER_MOCK_H -#define LAUNCHER_CONTROLLER_MOCK_H - -namespace unity { -namespace launcher { - -class ControllerMock -{ -public: - typedef std::shared_ptr<ControllerMock> Ptr; -}; - -} // namespace launcher -} // namespace unity - -#endif diff --git a/tests/test-gestures/unityshell_mock.h b/tests/test-gestures/unityshell_mock.h index 73c43c916..36a34c667 100644 --- a/tests/test-gestures/unityshell_mock.h +++ b/tests/test-gestures/unityshell_mock.h @@ -6,7 +6,7 @@ #include <NuxMock.h> #include "SwitcherControllerMock.h" -#include "LauncherControllerMock.h" + namespace unity { @@ -28,7 +28,6 @@ class UnityScreenMock : public CompScreenMock public: UnityScreenMock() { - launcher_controller_ = std::make_shared<launcher::ControllerMock>(); switcher_controller_ = std::make_shared<switcher::ControllerMock>(); Reset(); } @@ -60,13 +59,7 @@ class UnityScreenMock : public CompScreenMock return switcher_controller_; } - launcher::ControllerMock::Ptr launcher_controller() - { - return launcher_controller_; - } - switcher::ControllerMock::Ptr switcher_controller_; - launcher::ControllerMock::Ptr launcher_controller_; int SetUpAndShowSwitcher_count_; }; |
