rhetenor/flippr-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

testing pre commit hook

Browse Source
This commit is contained in:
Jonas Zeunert
2019-05-02 11:30:50 +02:00
parent 5e0517cf8a
commit 9360cc30ce
3 changed files with 96 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
FlippR-Driver/src/output/detail/OutputDriver.cpp
View File

@@ -41,22 +41,22 @@ void OutputDriver::deactivate_displays() const
void OutputDriver::deactivate_all_lamps() const
{
std::for_each(lamps.begin(), lamps.end(), [](items::Lamp& lamp){lamp.deactivate();});
std::for_each(lamps.begin(), lamps.end(), [](std::pair<std::string, std::shared_ptr<items::Lamp>> lamp){lamp.second->deactivate();});
}
void OutputDriver::activate_all_lamps() const
{
std::for_each(lamps.begin(), lamps.end(), [](items::Lamp& lamp){lamp.activate();});
std::for_each(lamps.begin(), lamps.end(), [](std::pair<std::string, std::shared_ptr<items::Lamp>> lamp){lamp.second->activate();});
}
void OutputDriver::rotate_all_lamps() const
{
for(auto lamp = lamps.begin(); lamp != lamps.end(); lamp++)
for(const auto & lamp : lamps)
{
lamp->second->activate();
lamp.second->activate();
// ToDo sleep time + is this thread safe??
std::this_thread::sleep_for(std::chrono::milliseconds(10));
lamp->second->deactivate();
lamp.second->deactivate();
}
}

28
FlippR-Driver/tests/output/TestOutputDriver.cpp
View File

@@ -26,15 +26,33 @@ SCENARIO("The OutputDriver should activate the displays")
{
Mock<output::DisplayController> display_controller;
When(Method(display_controller, activate_displays)).AlwaysReturn();
output::detail::OutputDriver outputDriver(std::make_unique<output::DisplayController>(display_controller), nullptr, nullptr, nullptr, nullptr);
output::detail::OutputDriver output_driver(std::make_unique<output::DisplayController>(display_controller), NULL, nullptr, nullptr, nullptr);
output::detail::OutputDriver output_driver(std::make_unique<output::DisplayController>(display_controller), {}, {}, {}, {});
WHEN("The displays get activated")
{
output_driver.activate_displays();
THEN("The display controller should be called")
{
REQUIRE((bool)Verify(Method(display_controller, activate_displays)));
}
}
}
}
SCENARIO("The OutputDriver should deactivate the displays")
{
GIVEN("An OutputDriver")
{
Mock<output::DisplayController> display_controller;
When(Method(display_controller, deactivate_displays)).AlwaysReturn();
output::detail::OutputDriver output_driver(std::make_unique<output::DisplayController>(display_controller), {}, {}, {}, {});
WHEN("The displays get deactivated")
{
output_driver.activate_displays();
THEN("The display controller should be called")
{
REQUIRE((bool)Verify(Method(display_controller, deactivate_displays)));
}
}
}
}