Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 11:13:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add COMPARE_DATA to QTestExtensions

Browse source
This commit is contained in:
Ryan Huffman 2015-07-15 15:01:56 -07:00
parent ad61c3db41
commit 07e3cf1348
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/networking/src/udt/Packet.h
View file

@ -116,7 +116,6 @@ protected:
HifiSockAddr _senderSockAddr; // sender address for packet (only used on receiving end) HifiSockAddr _senderSockAddr; // sender address for packet (only used on receiving end)
}; };
template<typename T> qint64 Packet::peekPrimitive(T* data) { template<typename T> qint64 Packet::peekPrimitive(T* data) {
return QIODevice::peek(reinterpret_cast<char*>(data), sizeof(T)); return QIODevice::peek(reinterpret_cast<char*>(data), sizeof(T));
} }

25
tests/QTestExtensions.h
View file

@ -251,6 +251,31 @@ do { \
#endif #endif
#define QCOMPARE_WITH_EXPR(actual, expected, testExpr) \
do { \
if (!(testExpr)) { \
QTest_failWithMessage("Compared values are not the same", (actual), (expected), #actual, #expected, __LINE__, __FILE__); \
} \
} while(0)
struct ByteData {
ByteData (const char* data, size_t length)
: data(data), length(length) {}
const char* data;
size_t length;
};
QTextStream & operator << (QTextStream& stream, const ByteData & wrapper) {
// Print bytes as hex
stream << QByteArray::fromRawData(wrapper.data, wrapper.length).toHex();
return stream;
}
bool compareData (const char* data, const char* expectedData, size_t length) {
return memcmp(data, expectedData, length) == 0;
}
#define COMPARE_DATA(actual, expected, length) \
QCOMPARE_WITH_EXPR((ByteData ( actual, length )), (ByteData ( expected, length )), compareData(actual, expected, length))