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

Merge branch 'master' of https://github.com/swinginbird/flippr-code

Browse Source
This commit is contained in:
Jonas Zeunert
2019-04-15 13:53:34 +02:00
parent 4c7b490300 a7304c2d16
commit 8bc0155c8d
4 changed files with 47 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FlippR-Driver/include/output/items/Display.h
View File

@@ -8,6 +8,8 @@
#ifndef FLIPPR_DRIVER_OUTPUT_ITEMS_DISPLAY_H_ #ifndef FLIPPR_DRIVER_OUTPUT_ITEMS_DISPLAY_H_
#define FLIPPR_DRIVER_OUTPUT_ITEMS_DISPLAY_H_ #define FLIPPR_DRIVER_OUTPUT_ITEMS_DISPLAY_H_
#include <iosfwd>
namespace flippR_driver namespace flippR_driver
{ {
namespace output namespace output

4
FlippR-Driver/src/output/detail/DisplayController.cpp
View File

@@ -46,14 +46,14 @@ void DisplayController::cycle_displays() const
void DisplayController::activate_displays() const void DisplayController::activate_displays() const
{ {
CLOG(INFO, OUTPUT_LOGGER) << "Activated all displays!";
pin_controller->activate_displays(); pin_controller->activate_displays();
CLOG(INFO, OUTPUT_LOGGER) << "Activated all displays!";
} }
void DisplayController::deactivate_displays() const void DisplayController::deactivate_displays() const
{ {
CLOG(INFO, OUTPUT_LOGGER) << "Deactivated all displays!";
pin_controller->deactivate_displays(); pin_controller->deactivate_displays();
CLOG(INFO, OUTPUT_LOGGER) << "Deactivated all displays!";
} }
} }

4
FlippR-Driver/src/utility/InputSocketHandler.cpp
View File

@@ -4,7 +4,9 @@
#include "InputSocketHandler.h" #include "InputSocketHandler.h"
#include "boost/date_time/posix_time/posix_time.hpp" #include <boost/date_time/posix_time/posix_time.hpp>
#include "json.hpp"
namespace flippR_driver namespace flippR_driver
{ {

43
FlippR-Driver/tests/output/TestDisplayController.cpp
View File

@@ -5,21 +5,58 @@
* Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert * Author: Andreas Schneider, Johannes Wendel, Jonas Zeunert
*/ */
#include <vector>
#include <memory>
#include "catch.hpp" #include "catch.hpp"
#include "fakeit.hpp" #include "fakeit.hpp"
#include "utility/LoggerFactory.h" #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 // testing purposes
#define private public #define private public
#include "output/DisplayController.h"
using namespace flippR_driver::output; using namespace flippR_driver::output;
using namespace fakeit; 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<std::shared_ptr<items::OutputDisplay>> output_diplays;
for(int i = 0; i < 3; i++)
{
Mock<items::OutputDisplay> display_mock;
Fake(Dtor(display_mock));
output_diplays.push_back(std::make_shared<items::OutputDisplay>(display_mock));
}
Mock<DisplayBoardPinController> 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<DisplayBoardPinController>(display_board_pin_controller_mock));
THEN("All Displays should be activated")
{
// REQUIRE(display_board_pin_controller_mock.)
// ToDo: to be continued!
}
}
}
} }