From a7304c2d1650ab7281ef0c092ee459d06fa5a653 Mon Sep 17 00:00:00 2001 From: Johannes Wendel Date: Sun, 10 Mar 2019 14:26:44 +0100 Subject: [PATCH] started writing tests --- FlippR-Driver/include/output/items/Display.h | 2 + .../src/output/detail/DisplayController.cpp | 4 +- .../src/utility/InputSocketHandler.cpp | 4 +- .../tests/output/TestDisplayController.cpp | 43 +++++++++++++++++-- 4 files changed, 47 insertions(+), 6 deletions(-) diff --git a/FlippR-Driver/include/output/items/Display.h b/FlippR-Driver/include/output/items/Display.h index dc0ffe8..f76684c 100644 --- a/FlippR-Driver/include/output/items/Display.h +++ b/FlippR-Driver/include/output/items/Display.h @@ -8,6 +8,8 @@ #ifndef FLIPPR_DRIVER_OUTPUT_ITEMS_DISPLAY_H_ #define FLIPPR_DRIVER_OUTPUT_ITEMS_DISPLAY_H_ +#include + namespace flippR_driver { namespace output diff --git a/FlippR-Driver/src/output/detail/DisplayController.cpp b/FlippR-Driver/src/output/detail/DisplayController.cpp index ecc30cd..f3d8370 100644 --- a/FlippR-Driver/src/output/detail/DisplayController.cpp +++ b/FlippR-Driver/src/output/detail/DisplayController.cpp @@ -46,14 +46,14 @@ void DisplayController::cycle_displays() const void DisplayController::activate_displays() const { - CLOG(INFO, OUTPUT_LOGGER) << "Activated all displays!"; pin_controller->activate_displays(); + CLOG(INFO, OUTPUT_LOGGER) << "Activated all displays!"; } void DisplayController::deactivate_displays() const { - CLOG(INFO, OUTPUT_LOGGER) << "Deactivated all displays!"; pin_controller->deactivate_displays(); + CLOG(INFO, OUTPUT_LOGGER) << "Deactivated all displays!"; } } diff --git a/FlippR-Driver/src/utility/InputSocketHandler.cpp b/FlippR-Driver/src/utility/InputSocketHandler.cpp index bb47b1b..c2538ee 100644 --- a/FlippR-Driver/src/utility/InputSocketHandler.cpp +++ b/FlippR-Driver/src/utility/InputSocketHandler.cpp @@ -4,7 +4,9 @@ #include "InputSocketHandler.h" -#include "boost/date_time/posix_time/posix_time.hpp" +#include + +#include "json.hpp" namespace flippR_driver { diff --git a/FlippR-Driver/tests/output/TestDisplayController.cpp b/FlippR-Driver/tests/output/TestDisplayController.cpp index 57a7e73..8c825e4 100644 --- a/FlippR-Driver/tests/output/TestDisplayController.cpp +++ b/FlippR-Driver/tests/output/TestDisplayController.cpp @@ -5,21 +5,58 @@ * Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert */ +#include +#include + #include "catch.hpp" #include "fakeit.hpp" #include "utility/LoggerFactory.h" +#include "output/DisplayController.h" +#include "output/items/OutputDisplay.h" +#include "output/detail/DisplayBoardPinController.h" +#include "output/detail/DisplayController.h" + // testing purposes #define private public -#include "output/DisplayController.h" - using namespace flippR_driver::output; using namespace fakeit; +using namespace flippR_driver::utility; +using namespace fakeit; -SCENARIO("") +SCENARIO("A display controller gets created", "") { + GIVEN("A set of displays and a pin controller") + { + LoggerFactory::CreateInputTestLogger(); + std::vector> output_diplays; + for(int i = 0; i < 3; i++) + { + Mock display_mock; + Fake(Dtor(display_mock)); + output_diplays.push_back(std::make_shared(display_mock)); + } + + Mock display_board_pin_controller_mock; + Fake(Dtor(display_board_pin_controller_mock)); + + When(Method(display_board_pin_controller_mock, write_display)).AlwaysReturn(); + When(Method(display_board_pin_controller_mock, activate_displays)).AlwaysReturn(); + When(Method(display_board_pin_controller_mock, deactivate_displays)).AlwaysReturn(); + + WHEN("The DisplayController is created") + { + detail::DisplayController controller(output_diplays, std::make_unique(display_board_pin_controller_mock)); + + THEN("All Displays should be activated") + { +// REQUIRE(display_board_pin_controller_mock.) +// ToDo: to be continued! + } + } + } }