diff options
| author | Kurt Pattyn <pattyn.kurt@gmail.com> | 2013-11-02 12:49:57 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-02 12:51:38 +0100 |
| commit | 800ec535e684befd60c7fa11baff5dafbc9f020c (patch) | |
| tree | b13591079718e361fbd74f378f44a5d9c90759f1 /tests | |
| parent | 97c8e5a36dde11ddf238678e5711e5979c2c106b (diff) | |
| download | qtwebsockets-800ec535e684befd60c7fa11baff5dafbc9f020c.tar.gz | |
Move non-public methods from websocketprotocol to private header
Add bigendian conversion of masks to unit tests
Change-Id: I3f23fb62aac1c6d06e5fafb1bd4bc47cc03765ce
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/dataprocessor/tst_dataprocessor.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/websocketframe/tst_websocketframe.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/websocketprotocol/tst_websocketprotocol.cpp | 11 |
3 files changed, 9 insertions, 4 deletions
diff --git a/tests/auto/dataprocessor/tst_dataprocessor.cpp b/tests/auto/dataprocessor/tst_dataprocessor.cpp index 8a2930f..3edf57d 100644 --- a/tests/auto/dataprocessor/tst_dataprocessor.cpp +++ b/tests/auto/dataprocessor/tst_dataprocessor.cpp @@ -46,6 +46,7 @@ #include <QDebug> #include "private/qwebsocketdataprocessor_p.h" +#include "private/qwebsocketprotocol_p.h" const quint8 FIN = 0x80; const quint8 RSV1 = 0x40; diff --git a/tests/auto/websocketframe/tst_websocketframe.cpp b/tests/auto/websocketframe/tst_websocketframe.cpp index 9cd94fe..1cdd201 100644 --- a/tests/auto/websocketframe/tst_websocketframe.cpp +++ b/tests/auto/websocketframe/tst_websocketframe.cpp @@ -45,6 +45,7 @@ #include <QtEndian> #include "private/qwebsocketframe_p.h" +#include "private/qwebsocketprotocol_p.h" #include "qwebsocketprotocol.h" QT_USE_NAMESPACE diff --git a/tests/auto/websocketprotocol/tst_websocketprotocol.cpp b/tests/auto/websocketprotocol/tst_websocketprotocol.cpp index e9e05e3..8bbacd4 100644 --- a/tests/auto/websocketprotocol/tst_websocketprotocol.cpp +++ b/tests/auto/websocketprotocol/tst_websocketprotocol.cpp @@ -40,9 +40,12 @@ ****************************************************************************/ #include <QtTest/QtTest> #include <QtTest/qtestcase.h> +#include <QtEndian> + #include <QDebug> #include "qwebsocketprotocol.h" +#include "private/qwebsocketprotocol_p.h" QT_USE_NAMESPACE @@ -98,10 +101,10 @@ void tst_WebSocketProtocol::tst_validMasks_data() QTest::addColumn<QString>("inputdata"); QTest::addColumn<QByteArray>("result"); - QTest::newRow("Empty payload") << 0x12345678u << QString("") << QByteArray(""); - QTest::newRow("ASCII payload of 8 characters") << 0x12345678u << QString("abcdefgh") << QByteArray("\x19\x34\x57\x76\x1D\x30\x53\x7A"); - QTest::newRow("ASCII payload of 9 characters") << 0x12345678u << QString("abcdefghi") << QByteArray("\x19\x34\x57\x76\x1D\x30\x53\x7A\x11"); - QTest::newRow("UTF-8 payload") << 0x12345678u << QString("∫∂ƒ©øØ") << QByteArray("\x47\x69\x0B\xBB\x80\x8E"); + QTest::newRow("Empty payload") << qToBigEndian<quint32>(0x12345678u) << QString("") << QByteArray(""); + QTest::newRow("ASCII payload of 8 characters") << qToBigEndian<quint32>(0x12345678u) << QString("abcdefgh") << QByteArray("\x19\x34\x57\x76\x1D\x30\x53\x7A"); + QTest::newRow("ASCII payload of 9 characters") << qToBigEndian<quint32>(0x12345678u) << QString("abcdefghi") << QByteArray("\x19\x34\x57\x76\x1D\x30\x53\x7A\x11"); + QTest::newRow("UTF-8 payload") << qToBigEndian<quint32>(0x12345678u) << QString("∫∂ƒ©øØ") << QByteArray("\x47\x69\x0B\xBB\x80\x8E"); } void tst_WebSocketProtocol::tst_validMasks() |