Index: unittests/tst_utilities.cpp =================================================================== diff -u -ra9b3b248a786b93bf6dfd8c29946d708d18dde9a -rc32e2e5e71c9baf96b0045732025c83e3c86f1fb --- unittests/tst_utilities.cpp (.../tst_utilities.cpp) (revision a9b3b248a786b93bf6dfd8c29946d708d18dde9a) +++ unittests/tst_utilities.cpp (.../tst_utilities.cpp) (revision c32e2e5e71c9baf96b0045732025c83e3c86f1fb) @@ -235,15 +235,66 @@ QCOMPARE(mActual, mExpected); } -void tst_utilities::tst_getValue_len() +void tst_utilities::tst_getValue_len_log() { - Types::S32 vFlowSetPoint; + bool ok = true; int index = 0; + Types::S32 vFlowSetPoint; QByteArray data; data += 0xFF; - QVERIFY( ! Types::getValue<>( data, index, vFlowSetPoint ) ); + ok = ! GetValue( data, index, vFlowSetPoint ) && ok; + QVERIFY( ok ); } +void tst_utilities::tst_getValue_len_lt() +{ + bool ok = true; + int index = 0; + Types::S32 vP1; + QByteArray data; + data += 0x01; + data += 0x02; + data += 0x03; + data += 0x04; + data += 0x05; + ok = GetValue( data, index, vP1 ) && ( vP1.value == 67305985 ) && ok; + QVERIFY( ok ); +} + +void tst_utilities::tst_getValue_len_eq() +{ + bool ok = true; + int index = 0; + Types::S32 vP1; + Types::U08 vP2; + QByteArray data; + data += 0x01; + data += 0x02; + data += 0x03; + data += 0x04; + data += 0x05; + ok = GetValue( data, index, vP1 ) && ( vP1.value == 67305985 ) && ok; + ok = GetValue( data, index, vP2 ) && ( vP2.value == 5 ) && ok; + QVERIFY( ok ); +} + +void tst_utilities::tst_getValue_len_gt() +{ + bool ok = true; + int index = 0; + Types::S32 vP1; + Types::U16 vP2; + QByteArray data; + data += 0x01; + data += 0x02; + data += 0x03; + data += 0x04; + data += 0x05; + ok = GetValue( data, index, vP1 ) && ( vP1.value == 67305985 ) && ok; + ok = ! GetValue( data, index, vP2 ) && ( vP2.value == 0 ) && ok; + QVERIFY( ok ); +} + void tst_utilities::tst_safeIncrement_StepZero() { uchar c = 0;