Index: unittests/unittests.cpp =================================================================== diff -u -rfee7fabf49befb065c89248c19e15efc9ca194e4 -rd3f98384e9400f8acb84c88dee75f1c480986998 --- unittests/unittests.cpp (.../unittests.cpp) (revision fee7fabf49befb065c89248c19e15efc9ca194e4) +++ unittests/unittests.cpp (.../unittests.cpp) (revision d3f98384e9400f8acb84c88dee75f1c480986998) @@ -17,7 +17,7 @@ // Project #include "guiglobals.h" #include "caninterface.h" -#include "messagehandler.h" +#include "frameinterface.h" #include "applicationcontroller.h" #include "guicontroller.h" #include "maintimer.h" @@ -55,66 +55,66 @@ Can::_CanInterface->onFrameReceive (); } -void unittests::tst_MessageHandler_Init() +void unittests::tst_FrameInterface_Init() { - Can::_MessageHandler->init(); - connect(Can::_MessageHandler, &Can::MessageHandler::didActionPerform, [=](const QCanBusFrame &vFrame) { + Can::_FrameInterface->init(); + connect(Can::_FrameInterface, &Can::FrameInterface::didActionPerform, [=](const QCanBusFrame &vFrame) { _emited = true; QString packet = vFrame.toString(); QCOMPARE(packet, _expected); }); - connect(Can::_MessageHandler, &Can::MessageHandler::didActionRequest, [=](const QCanBusFrame &vFrame) { + connect(Can::_FrameInterface, &Can::FrameInterface::didActionRequest, [=](const QCanBusFrame &vFrame) { _emited = true; QString packet = vFrame.toString(); QCOMPARE(packet, _expected); }); - connect(Can::_MessageHandler, &Can::MessageHandler::didActionCommand, [=](Gui::GuiActionType vAction) { + connect(Can::_FrameInterface, &Can::FrameInterface::didActionCommand, [=](Gui::GuiActionType vAction) { _emited = true; QCOMPARE(vAction, _action); }); } -void unittests::tst_MessageHandler_ActionPerform_PowerOff_Accepted() +void unittests::tst_FrameInterface_ActionPerform_PowerOff_Accepted() { _expected = " 100 [8] A5 01 00 01 01 00 00 00"; - Can::_MessageHandler->onActionPerform(Gui::GuiActionType::PowerOff,Gui::GuiActionData::Accepted); + Can::_FrameInterface->onActionPerform(Gui::GuiActionType::PowerOff,Gui::GuiActionData::Accepted); QVERIFY(_emited); } -void unittests::tst_MessageHandler_ActionPerform_PowerOff_Rejected() +void unittests::tst_FrameInterface_ActionPerform_PowerOff_Rejected() { _expected = " 100 [8] A5 01 00 01 00 00 00 00"; - Can::_MessageHandler->onActionPerform(Gui::GuiActionType::PowerOff,Gui::GuiActionData::Rejected); + Can::_FrameInterface->onActionPerform(Gui::GuiActionType::PowerOff,Gui::GuiActionData::Rejected); QVERIFY(_emited); } -void unittests::tst_MessageHandler_ActionPerform_Unknown() +void unittests::tst_FrameInterface_ActionPerform_Unknown() { _expected = " 000 [0]"; - Can::_MessageHandler->onActionPerform(Gui::GuiActionType::Unknown,Gui::GuiActionData::NoData); + Can::_FrameInterface->onActionPerform(Gui::GuiActionType::Unknown,Gui::GuiActionData::NoData); QVERIFY(_emited); } -void unittests::tst_MessageHandler_ActionRequest_PowerOff() +void unittests::tst_FrameInterface_ActionRequest_PowerOff() { _expected = " 100 [8] A5 01 00 00 00 00 00 00"; - Can::_MessageHandler->onActionRequest(Gui::GuiActionType::PowerOff); + Can::_FrameInterface->onActionRequest(Gui::GuiActionType::PowerOff); QVERIFY(_emited); } -void unittests::tst_MessageHandler_ActionRequest_Unknown() +void unittests::tst_FrameInterface_ActionRequest_Unknown() { _expected = " 000 [0]"; - Can::_MessageHandler->onActionRequest(Gui::GuiActionType::Unknown); + Can::_FrameInterface->onActionRequest(Gui::GuiActionType::Unknown); QVERIFY(_emited); } -void unittests::tst_MessageHandler_ActionCommand_PowerOff() +void unittests::tst_FrameInterface_ActionCommand_PowerOff() { _action = Gui::GuiActionType::PowerOff; QCanBusFrame mFrame; QString mPayload; - mFrame.setFrameId(Can::MessageHandler::eChlid_HD); + mFrame.setFrameId(Can::FrameInterface::eChlid_HD); mPayload = "A5 01 00 00 00 00 00 00"; mFrame.setPayload(QByteArray::fromHex(mPayload.remove(QLatin1Char(' ')).toLatin1())); emit Can::_CanInterface->didRead(mFrame); @@ -123,9 +123,9 @@ void unittests::cleanup() { - disconnect(Can::_MessageHandler); + disconnect(Can::_FrameInterface); Can::_CanInterface ->initConnections(); - Can::_MessageHandler->initConnections(); + Can::_FrameInterface->initConnections(); } void unittests::cleanupTestCase()