diff --git a/libraries/networking/src/udt/Packet.h b/libraries/networking/src/udt/Packet.h index 7518923a4f..47861751d2 100644 --- a/libraries/networking/src/udt/Packet.h +++ b/libraries/networking/src/udt/Packet.h @@ -116,7 +116,6 @@ protected: HifiSockAddr _senderSockAddr; // sender address for packet (only used on receiving end) }; - template qint64 Packet::peekPrimitive(T* data) { return QIODevice::peek(reinterpret_cast(data), sizeof(T)); } diff --git a/tests/QTestExtensions.h b/tests/QTestExtensions.h index 213fe6d7b5..c374a9a507 100644 --- a/tests/QTestExtensions.h +++ b/tests/QTestExtensions.h @@ -251,6 +251,31 @@ do { \ #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))