struct Fixture {
ScopedGlibLoop mLoop;
-
+ ipc::epoll::ThreadDispatcher dispatcher;
ScopedDir mZonesPathGuard;
ScopedDir mRunGuard;
BOOST_AUTO_TEST_CASE(ConstructorDestructor)
{
std::unique_ptr<ZonesManager> cm;
- cm.reset(new ZonesManager(TEST_CONFIG_PATH));
+ cm.reset(new ZonesManager(dispatcher.getPoll(), TEST_CONFIG_PATH));
cm.reset();
}
BOOST_AUTO_TEST_CASE(MissingConfig)
{
- BOOST_REQUIRE_EXCEPTION(ZonesManager{MISSING_CONFIG_PATH},
+ BOOST_REQUIRE_EXCEPTION((ZonesManager(dispatcher.getPoll(), MISSING_CONFIG_PATH)),
ConfigException,
WhatEquals("Could not load " + MISSING_CONFIG_PATH));
}
BOOST_AUTO_TEST_CASE(Create)
{
- ZonesManager cm(TEST_CONFIG_PATH);
+ ZonesManager cm(dispatcher.getPoll(), TEST_CONFIG_PATH);
cm.createZone("zone1", SIMPLE_TEMPLATE);
cm.createZone("zone2", SIMPLE_TEMPLATE);
}
BOOST_AUTO_TEST_CASE(StartStop)
{
- ZonesManager cm(TEST_CONFIG_PATH);
+ ZonesManager cm(dispatcher.getPoll(), TEST_CONFIG_PATH);
cm.createZone("zone1", SIMPLE_TEMPLATE);
cm.createZone("zone2", SIMPLE_TEMPLATE);
BOOST_AUTO_TEST_CASE(DetachOnExit)
{
{
- ZonesManager cm(TEST_CONFIG_PATH);
+ ZonesManager cm(dispatcher.getPoll(), TEST_CONFIG_PATH);
cm.createZone("zone1", SIMPLE_TEMPLATE);
cm.createZone("zone2", SIMPLE_TEMPLATE);
cm.restoreAll();
cm.setZonesDetachOnExit();
}
{
- ZonesManager cm(TEST_CONFIG_PATH);
+ ZonesManager cm(dispatcher.getPoll(), TEST_CONFIG_PATH);
cm.restoreAll();
BOOST_CHECK_EQUAL(cm.getRunningForegroundZoneId(), "zone1");
}
BOOST_AUTO_TEST_CASE(Focus)
{
- ZonesManager cm(TEST_CONFIG_PATH);
+ ZonesManager cm(dispatcher.getPoll(), TEST_CONFIG_PATH);
cm.createZone("zone1", SIMPLE_TEMPLATE);
cm.createZone("zone2", SIMPLE_TEMPLATE);
cm.createZone("zone3", SIMPLE_TEMPLATE);
#ifdef ZONE_CONNECTION
BOOST_AUTO_TEST_CASE(NotifyActiveZone)
{
- ZonesManager cm(TEST_CONFIG_PATH);
+ ZonesManager cm(dispatcher.getPoll(), TEST_CONFIG_PATH);
cm.createZone("zone1", SIMPLE_TEMPLATE);
cm.createZone("zone2", SIMPLE_TEMPLATE);
cm.createZone("zone3", SIMPLE_TEMPLATE);
BOOST_AUTO_TEST_CASE(MoveFile)
{
- ZonesManager cm(TEST_CONFIG_PATH);
+ ZonesManager cm(dispatcher.getPoll(), TEST_CONFIG_PATH);
cm.createZone("zone1", SIMPLE_TEMPLATE);
cm.createZone("zone2", SIMPLE_TEMPLATE);
cm.createZone("zone3", SIMPLE_TEMPLATE);
MULTI_FIXTURE_TEST_CASE(SwitchToDefault, F, ACCESSORS)
{
- ZonesManager cm(TEST_CONFIG_PATH);
+ ZonesManager cm(F::dispatcher.getPoll(), TEST_CONFIG_PATH);
cm.createZone("zone1", SIMPLE_TEMPLATE);
cm.createZone("zone2", SIMPLE_TEMPLATE);
cm.createZone("zone3", SIMPLE_TEMPLATE);
MULTI_FIXTURE_TEST_CASE(AllowSwitchToDefault, F, ACCESSORS)
{
- ZonesManager cm(TEST_CONFIG_PATH);
+ ZonesManager cm(F::dispatcher.getPoll(), TEST_CONFIG_PATH);
cm.createZone("zone1", SIMPLE_TEMPLATE);
cm.createZone("zone2", SIMPLE_TEMPLATE);
cm.createZone("zone3", SIMPLE_TEMPLATE);
#ifdef DBUS_CONNECTION
MULTI_FIXTURE_TEST_CASE(ProxyCall, F, DbusFixture)
{
- ZonesManager cm(TEST_CONFIG_PATH);
+ ZonesManager cm(F::dispatcher.getPoll(), TEST_CONFIG_PATH);
cm.createZone("zone1", SIMPLE_TEMPLATE);
cm.createZone("zone2", SIMPLE_TEMPLATE);
cm.createZone("zone3", SIMPLE_TEMPLATE);
MULTI_FIXTURE_TEST_CASE(GetZoneIds, F, ACCESSORS)
{
- ZonesManager cm(TEST_CONFIG_PATH);
+ ZonesManager cm(F::dispatcher.getPoll(), TEST_CONFIG_PATH);
cm.createZone("zone1", SIMPLE_TEMPLATE);
cm.createZone("zone2", SIMPLE_TEMPLATE);
cm.createZone("zone3", SIMPLE_TEMPLATE);
MULTI_FIXTURE_TEST_CASE(GetActiveZoneId, F, ACCESSORS)
{
- ZonesManager cm(TEST_CONFIG_PATH);
+ ZonesManager cm(F::dispatcher.getPoll(), TEST_CONFIG_PATH);
cm.createZone("zone1", SIMPLE_TEMPLATE);
cm.createZone("zone2", SIMPLE_TEMPLATE);
cm.createZone("zone3", SIMPLE_TEMPLATE);
MULTI_FIXTURE_TEST_CASE(SetActiveZone, F, ACCESSORS)
{
- ZonesManager cm(TEST_CONFIG_PATH);
+ ZonesManager cm(F::dispatcher.getPoll(), TEST_CONFIG_PATH);
cm.createZone("zone1", SIMPLE_TEMPLATE);
cm.createZone("zone2", SIMPLE_TEMPLATE);
cm.createZone("zone3", SIMPLE_TEMPLATE);
const std::string zone2 = "test2";
const std::string zone3 = "test3";
- ZonesManager cm(TEST_CONFIG_PATH);
+ ZonesManager cm(F::dispatcher.getPoll(), TEST_CONFIG_PATH);
cm.restoreAll();
BOOST_CHECK_EQUAL(cm.getRunningForegroundZoneId(), "");
callDone.set();
};
- auto getZoneIds = []() -> std::vector<std::string> {
- ZonesManager cm(TEST_CONFIG_PATH);
+ auto getZoneIds = [this]() -> std::vector<std::string> {
+ ZonesManager cm(F::dispatcher.getPoll(), TEST_CONFIG_PATH);
cm.restoreAll();
typename F::HostAccessory host;
// create zone
{
- ZonesManager cm(TEST_CONFIG_PATH);
+ ZonesManager cm(F::dispatcher.getPoll(), TEST_CONFIG_PATH);
typename F::HostAccessory host;
host.callAsyncMethodCreateZone(zone, SIMPLE_TEMPLATE, resultCallback);
BOOST_REQUIRE(callDone.wait(EVENT_TIMEOUT));
// destroy zone
{
- ZonesManager cm(TEST_CONFIG_PATH);
+ ZonesManager cm(F::dispatcher.getPoll(), TEST_CONFIG_PATH);
typename F::HostAccessory host;
host.callAsyncMethodDestroyZone(zone, resultCallback);
BOOST_REQUIRE(callDone.wait(EVENT_TIMEOUT));
// firts run
{
- ZonesManager cm(TEST_CONFIG_PATH);
+ ZonesManager cm(F::dispatcher.getPoll(), TEST_CONFIG_PATH);
typename F::HostAccessory host;
// zone1 - created
// second run
{
- ZonesManager cm(TEST_CONFIG_PATH);
+ ZonesManager cm(F::dispatcher.getPoll(), TEST_CONFIG_PATH);
cm.restoreAll();
BOOST_CHECK(cm.isRunning(zone1)); // because the default json value
const std::string zone1 = "zone1";
const std::string zone2 = "zone2";
- ZonesManager cm(TEST_CONFIG_PATH);
+ ZonesManager cm(F::dispatcher.getPoll(), TEST_CONFIG_PATH);
cm.createZone(zone1, SIMPLE_TEMPLATE);
cm.createZone(zone2, SIMPLE_TEMPLATE);
MULTI_FIXTURE_TEST_CASE(LockUnlockZone, F, ACCESSORS)
{
- ZonesManager cm(TEST_CONFIG_PATH);
+ ZonesManager cm(F::dispatcher.getPoll(), TEST_CONFIG_PATH);
cm.createZone("zone1", SIMPLE_TEMPLATE);
cm.createZone("zone2", SIMPLE_TEMPLATE);
cm.createZone("zone3", SIMPLE_TEMPLATE);
MULTI_FIXTURE_TEST_CASE(CreateFile, F, ACCESSORS)
{
- ZonesManager cm(TEST_CONFIG_PATH);
+ ZonesManager cm(F::dispatcher.getPoll(), TEST_CONFIG_PATH);
cm.createZone("zone1", SIMPLE_TEMPLATE);
cm.restoreAll();
MULTI_FIXTURE_TEST_CASE(CreateWriteReadFile, F, ACCESSORS)
{
- ZonesManager cm(TEST_CONFIG_PATH);
+ ZonesManager cm(F::dispatcher.getPoll(), TEST_CONFIG_PATH);
cm.createZone("zone1", SIMPLE_TEMPLATE);
cm.restoreAll();