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

134
.idea/workspace.xml generated
View File

@@ -12,13 +12,7 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e02dc5d7-dead-448e-976e-72d458e813a0" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/include/output/OutputDriver.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/include/output/OutputDriver.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.h" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.h" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventHandler.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventHandler.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/tests/output/TestLamp.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/tests/output/TestLamp.cpp" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputDriver.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputDriver.cpp" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/cmake-build-debug/" />
@@ -37,8 +31,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/output/TestLamp.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="977">
<caret line="58" column="3" lean-forward="true" selection-start-line="58" selection-start-column="3" selection-end-line="58" selection-end-column="3" />
<state relative-caret-position="569">
<caret line="58" column="3" selection-start-line="58" selection-start-column="3" selection-end-line="58" selection-end-column="3" />
<folding>
<element signature="e#121#141#0" expanded="true" />
</folding>
@@ -46,6 +40,15 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/CMakeLists.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="484">
<caret line="22" selection-start-line="22" selection-end-line="22" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventHandler.cpp">
<provider selected="true" editor-type-id="text-editor">
@@ -61,8 +64,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputDriver.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="572">
<caret line="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="26" selection-end-column="55" />
<state relative-caret-position="1034">
<caret line="52" column="57" selection-start-line="52" selection-start-column="57" selection-end-line="52" selection-end-column="57" />
<folding>
<element signature="e#129#166#0" expanded="true" />
</folding>
@@ -73,17 +76,17 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="572">
<caret line="57" column="59" selection-start-line="57" selection-start-column="59" selection-end-line="57" selection-end-column="59" />
<state relative-caret-position="660">
<caret line="48" column="119" selection-start-line="48" selection-start-column="119" selection-end-line="48" selection-end-column="119" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="10">
<caret line="215" column="34" selection-start-line="215" selection-start-column="34" selection-end-line="215" selection-end-column="34" />
<state>
<caret line="202" column="5" selection-start-line="202" selection-start-column="5" selection-end-line="202" selection-end-column="5" />
<folding>
<element signature="e#42#82#0" expanded="true" />
</folding>
@@ -184,11 +187,11 @@
<option value="$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputItem.cpp" />
<option value="$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventHandler.cpp" />
<option value="$PROJECT_DIR$/FlippR-Driver/tests/output/TestLamp.cpp" />
<option value="$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputDriver.cpp" />
<option value="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp" />
<option value="$PROJECT_DIR$/FlippR-Driver/include/output/OutputDriver.h" />
<option value="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.h" />
<option value="$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp" />
<option value="$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputDriver.cpp" />
<option value="$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp" />
</list>
</option>
</component>
@@ -436,12 +439,12 @@
<workItem from="1556619506370" duration="3285000" />
<workItem from="1556634285722" duration="44000" />
<workItem from="1556635051518" duration="29000" />
<workItem from="1556736637754" duration="6846000" />
<workItem from="1556736637754" duration="7752000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="68984000" />
<option name="totallyTimeSpent" value="69890000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
@@ -454,7 +457,6 @@
</component>
<component name="ToolWindowManager">
<frame x="80" y="0" width="2480" height="1440" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.28423238" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -504,13 +506,6 @@
<option name="version" value="1" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/input/detail/InputDriver.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="6" column="16" selection-start-line="6" selection-start-column="16" selection-end-line="6" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/main.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
@@ -1213,16 +1208,6 @@
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Lamp.h">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/output/TestLamp.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="977">
<caret line="58" column="3" lean-forward="true" selection-start-line="58" selection-start-column="3" selection-end-line="58" selection-end-column="3" />
<folding>
<element signature="e#121#141#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/include/DriverFactory.h">
<provider selected="true" editor-type-id="text-editor" />
</entry>
@@ -1239,29 +1224,9 @@
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/Lamp.cpp">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventHandler.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="814">
<caret line="39" column="7" selection-start-line="39" selection-start-column="7" selection-end-line="39" selection-end-column="7" />
<folding>
<element signature="e#130#150#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/items/detail/EightDigitDisplay.h">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputDriver.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="572">
<caret line="26" column="55" selection-start-line="26" selection-start-column="55" selection-end-line="26" selection-end-column="55" />
<folding>
<element signature="e#129#166#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
@@ -1272,13 +1237,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="572">
<caret line="57" column="59" selection-start-line="57" selection-start-column="59" selection-end-line="57" selection-end-column="59" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/include/output/OutputDriver.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="616">
@@ -1295,13 +1253,57 @@
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/utility/networking/output/OutputRequestHandler.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="10">
<caret line="215" column="34" selection-start-line="215" selection-start-column="34" selection-end-line="215" selection-end-column="34" />
<state>
<caret line="202" column="5" selection-start-line="202" selection-start-column="5" selection-end-line="202" selection-end-column="5" />
<folding>
<element signature="e#42#82#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/output/TestOutputDriver.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1034">
<caret line="52" column="57" selection-start-line="52" selection-start-column="57" selection-end-line="52" selection-end-column="57" />
<folding>
<element signature="e#129#166#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/src/output/detail/OutputDriver.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
<caret line="48" column="119" selection-start-line="48" selection-start-column="119" selection-end-line="48" selection-end-column="119" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/input/TestEventHandler.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="814">
<caret line="39" column="7" selection-start-line="39" selection-start-column="7" selection-end-line="39" selection-end-column="7" />
<folding>
<element signature="e#130#150#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/FlippR-Driver/tests/output/TestLamp.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="569">
<caret line="58" column="3" selection-start-line="58" selection-start-column="3" selection-end-line="58" selection-end-column="3" />
<folding>
<element signature="e#121#141#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/CMakeLists.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="484">
<caret line="22" selection-start-line="22" selection-end-line="22" />
</state>
</provider>
</entry>
</component>
</project>

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)));
}
}
}
}