diff --git a/consoleEmulator.pro b/consoleEmulator.pro index 30c3b59..38b5d01 100644 --- a/consoleEmulator.pro +++ b/consoleEmulator.pro @@ -1,11 +1,16 @@ -TEMPLATE = subdirs - -SUBDIRS += \ - logic \ - network \ - test \ - ui - -logic.depends += network -ui.depends += logic -test.depends += logic +TEMPLATE = subdirs + +SUBDIRS += \ + logger \ + logic \ + network \ + test \ + ui + + +ui.depends += logic +test.depends += logic +network.depends += logic +logger.depends += logic +test.depends += logger + diff --git a/logger/Consolelogger.cpp b/logger/Consolelogger.cpp new file mode 100644 index 0000000..8e87ee5 --- /dev/null +++ b/logger/Consolelogger.cpp @@ -0,0 +1,12 @@ +#include "Consolelogger.h" +#include "QDebug" + +void ConsoleLogger::log(QString message) +{ + qDebug()<< "Check This message :: " << message; +} + +ConsoleLogger::~ConsoleLogger() +{ + +} diff --git a/logger/Consolelogger.h b/logger/Consolelogger.h new file mode 100644 index 0000000..72b5280 --- /dev/null +++ b/logger/Consolelogger.h @@ -0,0 +1,14 @@ +#ifndef CONSOLELOGGER_H +#define CONSOLELOGGER_H + +#include "model/Logger.h" + + +class ConsoleLogger : public Logger +{ +public: + void log(QString message) override; + ~ConsoleLogger() override; +}; + +#endif // CONSOLELOGGER_H diff --git a/logger/logger.pro b/logger/logger.pro new file mode 100644 index 0000000..91bd5c8 --- /dev/null +++ b/logger/logger.pro @@ -0,0 +1,33 @@ +TEMPLATE = lib + + +QT += mvvmcore +# Creating a static library is typically more efficient. You can still create a shared library if you want to +CONFIG += c++14 static + +# The following define makes your compiler emit warnings if you use +# any Qt feature that has been marked deprecated (the exact warnings +# depend on your compiler). Please consult the documentation of the +# deprecated API in order to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS + +# You can also make your code fail to compile if it uses deprecated APIs. +# In order to do so, uncomment the following line. +# You can also select to disable deprecated APIs only up to a certain version of Qt. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +SOURCES += \ + Consolelogger.cpp \ + main.cpp + +# Default rules for deployment. +qnx: target.path = /tmp/$${TARGET}/bin +else: unix:!android: target.path = /opt/$${TARGET}/bin +!isEmpty(target.path): INSTALLS += target + +HEADERS += \ + Consolelogger.h + +INCLUDEPATH += $$PWD/../logic/include +DEPENDPATH += $$PWD/../logic/include + diff --git a/logger/main.cpp b/logger/main.cpp new file mode 100644 index 0000000..df918b7 --- /dev/null +++ b/logger/main.cpp @@ -0,0 +1,12 @@ +#include + +#include "Consolelogger.h" + +int main(int argc, char *argv[]) +{ + QCoreApplication a(argc, argv); + + // ConsoleLogger testlog; + + return a.exec(); +} diff --git a/logic/include/model/Console.h b/logic/include/model/Console.h index 4dd1865..756fbf6 100644 --- a/logic/include/model/Console.h +++ b/logic/include/model/Console.h @@ -1,7 +1,7 @@ #ifndef CONSOLE_H #define CONSOLE_H -#define DataLength 8 +#define ProtocolLength 8 #define PacketAppDirection 0x01 #define EchoDataLength 0x02 #define EchoType 0x06 diff --git a/logic/include/model/PushButton.h b/logic/include/model/PushButton.h index d67a367..571d3bd 100644 --- a/logic/include/model/PushButton.h +++ b/logic/include/model/PushButton.h @@ -1,7 +1,7 @@ #ifndef PUSHBUTTON_H #define PUSHBUTTON_H -#define DataLength 8 +#define ProtocolLength 8 #define ConsoleDirection 0x00 #define PushButtonDataLength 0x01 #define PushButtonType 0x04 diff --git a/logic/include/model/RotaryButton.h b/logic/include/model/RotaryButton.h index 4e4fd58..7ac2f27 100644 --- a/logic/include/model/RotaryButton.h +++ b/logic/include/model/RotaryButton.h @@ -1,7 +1,7 @@ #ifndef RotaryButton_H #define RotaryButton_H -#define DataLength 8 +#define ProtocolLength 8 #define ConsoleDirection 0x00 #define RotaryDataLength 0X02 #define RotaryType 0x05 diff --git a/logic/logic.pro b/logic/logic.pro index 1f4e77b..88bd90a 100644 --- a/logic/logic.pro +++ b/logic/logic.pro @@ -10,11 +10,11 @@ DEFINES += QT_DEPRECATED_WARNINGS SOURCES += $$files(src/*.cpp, true) -HEADERS += $$files(include/*.h, true) \ - include/model/Logger.h +HEADERS += $$files(include/*.h, true) INCLUDEPATH += $$PWD/include/ INCLUDEPATH += $$PWD/../network/ +INCLUDEPATH += $$PWD/../logger/ _never_true_condition: SOURCES += $$files($$PWD/.ts-dummy/*) # Uncomment the following line to automatically generated and update settings translations when building diff --git a/logic/src/model/Console.cpp b/logic/src/model/Console.cpp index 0a6f48c..cbed54f 100644 --- a/logic/src/model/Console.cpp +++ b/logic/src/model/Console.cpp @@ -14,6 +14,12 @@ void Console::injectDataSender(DataSender* sender) _dataSender = sender; } +/*************************************************************************************************/ +void Console::injectLogger(Logger *logger) +{ + _logger = logger; +} + /*************************************************************************************************/ void Console::newData(QByteArray data) { @@ -40,7 +46,7 @@ void Console::newData(QByteArray data) /*************************************************************************************************/ void Console::hasValidDataFormat(const QByteArray& data) { - if(data.isNull() || data.size() != DataLength) + if(data.isNull() || data.size() != ProtocolLength) { throw std::runtime_error("Data is not Correct"); } @@ -56,7 +62,7 @@ bool Console::isEchoPacket(const QByteArray& data) { QByteArray echoPacket; - echoPacket.resize(DataLength); + echoPacket.resize(ProtocolLength); echoPacket[0] = PacketAppDirection; echoPacket[1] = EchoDataLength; echoPacket[2] = EchoType; diff --git a/logic/src/model/Led.cpp b/logic/src/model/Led.cpp index b882136..7cd2d4f 100644 --- a/logic/src/model/Led.cpp +++ b/logic/src/model/Led.cpp @@ -1,14 +1,15 @@ #include "model/Led.h" +#include "QDebug" Led::Led() { - _hasLed = false; + _hasLed = false; } /*************************************************************************************************/ Led::Led(char functionCode) { - _functionCode = functionCode; + _functionCode = functionCode; _hasLed = true; } @@ -21,10 +22,13 @@ void Led::newData(QByteArray data) } if(data[FunctionCode] == _functionCode) { - emit ledChanged(data[LedColor]); + emit ledChanged(data[LedColor]); } - } catch (const std::exception& e) + qDebug()<< "led Error inside try "; + } + catch (const std::exception& e) { + qDebug()<< "led Error inside catch "; _logger->log(e.what()); } diff --git a/logic/src/model/PushButton.cpp b/logic/src/model/PushButton.cpp index 1266f5e..7dd5813 100644 --- a/logic/src/model/PushButton.cpp +++ b/logic/src/model/PushButton.cpp @@ -5,7 +5,7 @@ QByteArray PushButton::generateCode(bool isPressed) { QByteArray arr; - arr.resize(DataLength); + arr.resize(ProtocolLength); arr[0] = ConsoleDirection; arr[1] = PushButtonDataLength; arr[2] = PushButtonType; diff --git a/logic/src/model/RotaryButton.cpp b/logic/src/model/RotaryButton.cpp index 859ebea..276e5bf 100644 --- a/logic/src/model/RotaryButton.cpp +++ b/logic/src/model/RotaryButton.cpp @@ -23,12 +23,12 @@ QByteArray RotaryButton::rotate(int value) { QByteArray arr; - arr.resize(DataLength); + arr.resize(ProtocolLength); arr[0] = ConsoleDirection; arr[1] = RotaryDataLength; arr[2] = RotaryType; arr[3] = _functionCode; - arr[4] = static_cast(value >> DataLength); + arr[4] = static_cast(value >> ProtocolLength); arr[5] = static_cast(value); arr[6] = TimeTag; arr[7] = TimeTag; diff --git a/test/test.pro b/test/test.pro index 85a9eaf..36ab578 100644 --- a/test/test.pro +++ b/test/test.pro @@ -11,6 +11,13 @@ SOURCES += tst_console.cpp INCLUDEPATH += $$PWD/../logic/include DEPENDPATH += $$PWD/../logic/include + +INCLUDEPATH += $$PWD/../logger +DEPENDPATH += $$PWD/../logger + +LIBS += -L$$OUT_PWD/../logger -llogger +PRE_TARGETDEPS += $$OUT_PWD/../logger/liblogger.a + # Link with core project win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../logic/release/ -llogic else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../logic/debug/ -llogic diff --git a/test/tst_console.cpp b/test/tst_console.cpp index 9c602e1..6c58bd8 100644 --- a/test/tst_console.cpp +++ b/test/tst_console.cpp @@ -2,6 +2,7 @@ #include "TestDataSender.h" #include "model/Console.h" +#include "Consolelogger.h" #include @@ -18,7 +19,7 @@ private slots: //uncrustify on void pressDual_test_case(); void releaseDual_test_case(); - void sendDatatoDual_test_case(); + void receiveDatatoDual_test_case(); void pressQuad_test_case(); void releaseQuad_test_case(); @@ -27,6 +28,9 @@ private slots: void rotatFocusWithLed_test_case(); void echoSignalTest(); + void wrongProtocol(); + void wrongPacketRecivedDirection(); + void ledColorWrong(); }; @@ -84,7 +88,7 @@ void ConsoleTest::releaseDual_test_case() } /*************************************************************************************************/ -void ConsoleTest::sendDatatoDual_test_case() +void ConsoleTest::receiveDatatoDual_test_case() { Console c; auto t = new TestDataSender; @@ -224,6 +228,88 @@ void ConsoleTest::echoSignalTest() QCOMPARE(t->consoleData, arr); } +/*************************************************************************************************/ +void ConsoleTest::wrongProtocol() +{ + Console c; + auto t = new TestDataSender; + + c.injectDataSender(t); + + auto log = new ConsoleLogger; + c.injectLogger(log); + + QByteArray arr; + + char ledValue = 0x01; + + arr.resize(5); + arr[0] = 0x01; + arr[1] = 0x01; + arr[2] = 0x03; + arr[3] = static_cast(0x82); + arr[4] = ledValue; + + c.newData(arr); + +} + +void ConsoleTest::wrongPacketRecivedDirection() +{ + Console c; + auto t = new TestDataSender; + c.injectDataSender(t); + + QByteArray arr; + + char ledValue = 0x01; + + arr.resize(8); + arr[0] = 0x00; + arr[1] = 0x01; + arr[2] = 0x03; + arr[3] = static_cast(0x82); + arr[4] = ledValue; + arr[5] = 0x00; + arr[6] = 0x00; + arr[7] = 0x00; + + c.newData(arr); + +} +/*************************************************************************************************/ + +void ConsoleTest::ledColorWrong() +{ + + Console c; + auto t = new TestDataSender; + c.injectDataSender(t); + + QSignalSpy spy(&c, SIGNAL(dualLedChanged(char))); + + QByteArray arr; + + char ledValue = 0x05; + + arr.resize(8); + arr[0] = 0x01; + arr[1] = 0x01; + arr[2] = 0x03; + arr[3] = static_cast(0x82); + arr[4] = ledValue; + arr[5] = 0x00; + arr[6] = 0x00; + arr[7] = 0x00; + + c.newData(arr); + + auto result = spy.takeFirst()[0].value(); + QEXPECT_FAIL("led color is wrong", "Oh my, this is soooo broken", Abort); + QCOMPARE(result[0], ledValue); + +} + /*************************************************************************************************/ QTEST_APPLESS_MAIN(ConsoleTest)