Index: unittests/tst_utilities.cpp =================================================================== diff -u -rc0a4c9b399f02fb112de89f6cc74077b4023d8cc -re921e71e189137bb1ea13c0a3a971e89f2b29110 --- unittests/tst_utilities.cpp (.../tst_utilities.cpp) (revision c0a4c9b399f02fb112de89f6cc74077b4023d8cc) +++ unittests/tst_utilities.cpp (.../tst_utilities.cpp) (revision e921e71e189137bb1ea13c0a3a971e89f2b29110) @@ -237,25 +237,27 @@ 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 vFlowSetPoint; + Types::S32 vP1; QByteArray data; data += 0x01; data += 0x02; data += 0x03; data += 0x04; data += 0x05; - ok = GetValue( data, index, vFlowSetPoint ) && ok; + ok = GetValue( data, index, vP1 ) && ( vP1.value == 67305985 ) && ok; QVERIFY( ok ); } @@ -271,8 +273,8 @@ data += 0x03; data += 0x04; data += 0x05; - ok = GetValue( data, index, vP1 ) && ok; - ok = GetValue( data, index, vP2 ) && ok; + ok = GetValue( data, index, vP1 ) && ( vP1.value == 67305985 ) && ok; + ok = GetValue( data, index, vP2 ) && ( vP2.value == 5 ) && ok; QVERIFY( ok ); } @@ -288,8 +290,8 @@ data += 0x03; data += 0x04; data += 0x05; - ok = GetValue( data, index, vP1 ) && ok; - ok = GetValue( data, index, vP2 ) && ok; + ok = GetValue( data, index, vP1 ) && ( vP1.value == 67305985 ) && ok; + ok = ! GetValue( data, index, vP2 ) && ( vP2.value == 0 ) && ok; QVERIFY( ok ); }