diff options
| -rw-r--r-- | tests/state-fixture.h | 30 | ||||
| -rw-r--r-- | tests/state-mock.h | 49 |
2 files changed, 56 insertions, 23 deletions
diff --git a/tests/state-fixture.h b/tests/state-fixture.h index 3c6ecd5..7d8358e 100644 --- a/tests/state-fixture.h +++ b/tests/state-fixture.h @@ -18,16 +18,9 @@ */ #include "glib-fixture.h" -#include "actions-mock.h" -#include <datetime/clock-mock.h> -#include <datetime/formatter.h> -#include <datetime/locations.h> -#include <datetime/menu.h> -#include <datetime/planner-mock.h> -#include <datetime/service.h> -#include <datetime/state.h> -#include <datetime/timezones.h> +#include "actions-mock.h" +#include "state-mock.h" using namespace unity::indicator::datetime; @@ -37,7 +30,7 @@ private: typedef GlibFixture super; protected: - std::shared_ptr<MockClock> m_clock; + std::shared_ptr<MockState> m_mock_state; std::shared_ptr<State> m_state; std::shared_ptr<MockActions> m_mock_actions; std::shared_ptr<Actions> m_actions; @@ -46,19 +39,9 @@ protected: { super::SetUp(); - // first, build a mock backend state - const DateTime now = DateTime::NowLocal(); - m_clock.reset(new MockClock(now)); - m_state.reset(new State); - m_state->settings.reset(new Settings); - m_state->timezones.reset(new Timezones); - m_state->clock = std::dynamic_pointer_cast<Clock>(m_clock); - m_state->planner.reset(new MockPlanner); - m_state->planner->time = now; - m_state->locations.reset(new Locations); - m_state->calendar_day = now; + m_mock_state.reset(new MockState); + m_state = std::dynamic_pointer_cast<State>(m_mock_state); - // build the actions on top of the state m_mock_actions.reset(new MockActions(m_state)); m_actions = std::dynamic_pointer_cast<Actions>(m_mock_actions); } @@ -67,8 +50,9 @@ protected: { m_actions.reset(); m_mock_actions.reset(); + m_state.reset(); - m_clock.reset(); + m_mock_state.reset(); super::TearDown(); } diff --git a/tests/state-mock.h b/tests/state-mock.h new file mode 100644 index 0000000..ae1217b --- /dev/null +++ b/tests/state-mock.h @@ -0,0 +1,49 @@ +/* + * Copyright 2013 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 warranties of + * MERCHANTABILITY, SATISFACTORY QUALITY, 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/>. + * + * Authors: + * Charles Kerr <charles.kerr@canonical.com> + */ + +#include <datetime/clock-mock.h> +#include <datetime/formatter.h> +#include <datetime/locations.h> +#include <datetime/menu.h> +#include <datetime/planner-mock.h> +#include <datetime/service.h> +#include <datetime/state.h> +#include <datetime/timezones.h> + +using namespace unity::indicator::datetime; + +class MockState: public State +{ +public: + std::shared_ptr<MockClock> mock_clock; + + MockState() + { + const DateTime now = DateTime::NowLocal(); + mock_clock.reset(new MockClock(now)); + settings.reset(new Settings); + timezones.reset(new Timezones); + clock = std::dynamic_pointer_cast<Clock>(mock_clock); + planner.reset(new MockPlanner); + planner->time = now; + locations.reset(new Locations); + calendar_day = now; + } +}; + |