Index: unittests/tst_canbus.cpp =================================================================== diff -u -r561055268da68e24fe91a1148b76bf1785dae14d -r188d7611230946fc5fde4e3e837a09202dd93eea --- unittests/tst_canbus.cpp (.../tst_canbus.cpp) (revision 561055268da68e24fe91a1148b76bf1785dae14d) +++ unittests/tst_canbus.cpp (.../tst_canbus.cpp) (revision 188d7611230946fc5fde4e3e837a09202dd93eea) @@ -71,8 +71,16 @@ }); connect(Can::_MessageDispatcher, &Can::MessageDispatcher::didActionReceive, [=](GuiActionType vAction , const QVariantList &vData ) { _emited = true; - QCOMPARE(vAction, _action); - QCOMPARE(vData , _data ); + QVERIFY(vAction == _action); + 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]); + } + } }); } @@ -225,14 +233,15 @@ void tst_canbus::tst_FrameInterface_FrameReceived_LongFrame_BloodFlow() { _action = Gui::GuiActionType::BloodFlow; - _data = {500, 501.00, 100.00, 1000.00, -1001.25, 750.00}; + _data = { -400, -397.50f, -26.20f, -2000.00f, -2002.50f, 648.75f, 62.50f }; QCanBusFrame mFrame; mFrame.setFrameId(Can::Can_Id::eChlid_HD_Sync); QStringList mPayloadList { - "a5.05.00.18.f4.01.00.00", - "00.80.fa.43.00.00.c8.42", - "00.00.7a.44.00.50.7a.c4", - "00.80.3b.44.88.00.00.00", + "a5.05.00.1c.70.fe.ff.ff" , + "00.c0.c6.c3.9a.99.d1.c1" , + "00.00.fa.c4.00.50.fa.c4" , + "00.30.22.44.00.00.7a.42" , + "c4.00.00.00.00.00.00.00" , }; for ( QString payload : mPayloadList ) { mFrame.setPayload(QByteArray::fromHex(payload.remove(QLatin1Char('.')).toLatin1())); @@ -244,14 +253,14 @@ void tst_canbus::tst_FrameInterface_FrameReceived_LongFrame_BloodFlow_LessData() { _action = Gui::GuiActionType::BloodFlow; - _data = {500, 501.00, 100.00, 1000.00, -1001.25, 750.00}; + _data = { -400, -397.50f, -26.20f, -2000.00f, -2002.50f, 648.75f, 62.50f }; QCanBusFrame mFrame; mFrame.setFrameId(Can::Can_Id::eChlid_HD_Sync); QStringList mPayloadList { - "a5.05.00.15.f4.01.00.00", - "00.80.fa.43.00.00.c8.42", - "00.00.7a.44.00.50.7a.c4", - "00.19.00.00.00.00.00.00", + "a5.05.00.1c.70.fe.ff.ff" , + "00.c0.c6.c3.9a.99.d1.c1" , + "00.00.fa.c4.00.50.fa.c4" , + "00.30.22.44.00.00.7a.42" , }; for ( QString payload : mPayloadList ) { mFrame.setPayload(QByteArray::fromHex(payload.remove(QLatin1Char('.')).toLatin1()));