Index: unittests/tst_canbus.cpp =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -r0d3114203575d6725576f8bdc8299ad772d55fd5 --- unittests/tst_canbus.cpp (.../tst_canbus.cpp) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ unittests/tst_canbus.cpp (.../tst_canbus.cpp) (revision 0d3114203575d6725576f8bdc8299ad772d55fd5) @@ -276,30 +276,6 @@ QVERIFY( ! _emited ); // Should not emit due to - ERROR : "Incorrect data for Message ID (HD) '0x0500'" } -void tst_canbus::tst_FrameInterface_FrameReceived_LongFrame_AlarmStatus() -{ - _action = Gui::GuiActionType::ID_AlarmStatus; - _data = { 2, 10, 60, 30, - false,true ,false,false, // 0100 - true ,false,false,false, // 1000 - true ,true ,false,false, // 1100 - false,false,false,false, // 0000 - }; - QCanBusFrame mFrame; - mFrame.setFrameId(Can_Id::eChlid_HD_Alarm); - QStringList mPayloadList { - "a5.0b.00.02.00.12.02.00" , - "00.00.0a.00.00.00.3c.00" , - "00.00.1e.00.00.00.12.03" , - "20.00.00.00.00.00.00.00" , - }; - for ( QString payload : mPayloadList ) { - mFrame.setPayload(QByteArray::fromHex(payload.remove(QLatin1Char('.')).toLatin1())); - emit _CanInterface.didFrameReceive(mFrame); - } - QVERIFY(_emited); -} - void tst_canbus::tst_FrameInterface_FrameReceived_LongFrame_AlarmStatus_LessData() { _action = Gui::GuiActionType::ID_AlarmStatus; @@ -317,6 +293,7 @@ }; for ( QString payload : mPayloadList ) { mFrame.setPayload(QByteArray::fromHex(payload.remove(QLatin1Char('.')).toLatin1())); + qDebug() << " ~ @ ~ : " << mFrame.payload(); emit _CanInterface.didFrameReceive(mFrame); } QVERIFY( ! _emited ); // Should not emit due to - ERROR : "Incorrect data for Message ID (HD) '0x0200'" @@ -354,13 +331,14 @@ { _emited = true; QVERIFY(vAction == _action); + qDebug() << " ~ @ ~ : " << vData; for (int i = 0; i < vData.length(); i++) { if (! strcmp(vData[i].typeName(), "float")) { float f1 = vData[i].toFloat(); float f2 = _data[i].toFloat(); QVERIFY(Types::floatCompare(f1, f2)); } else { - QVERIFY(vData[i] == _data[i]); + QCOMPARE(vData, _data); } } }