diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-18 01:32:30 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-18 14:45:46 +0100 |
| commit | 3359932202f79b0fa80ae8d3a6ec73f35b34c738 (patch) | |
| tree | b452b15c63e073db4b3e19b6ee19db159af89d6d /tests/auto | |
| parent | abf5f99d1808bbf18b8ebbe2b9468d409fe77158 (diff) | |
| download | qtwebsockets-3359932202f79b0fa80ae8d3a6ec73f35b34c738.tar.gz | |
Use QString() instead of QStringLiteral("")
And do the same for QByteArray.
Instantiating the default constructor uses QArrayData::sharedNull() for
the d-pointer which is the cheapest constructor in memory and
instructions.
Change-Id: I1ceaafbc0c0cb1ccc5690edba89ea1100f30b3cd
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Diffstat (limited to 'tests/auto')
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/websocketcorsauthenticator/tst_websocketcorsauthenticator.cpp b/tests/auto/websocketcorsauthenticator/tst_websocketcorsauthenticator.cpp index 6d44241..7bb44b1 100644 --- a/tests/auto/websocketcorsauthenticator/tst_websocketcorsauthenticator.cpp +++ b/tests/auto/websocketcorsauthenticator/tst_websocketcorsauthenticator.cpp @@ -92,7 +92,7 @@ void tst_WebSocketCorsAuthenticator::cleanup() void tst_WebSocketCorsAuthenticator::tst_initialization() { { - QWebSocketCorsAuthenticator authenticator(QStringLiteral("")); + QWebSocketCorsAuthenticator authenticator((QString())); QCOMPARE(authenticator.allowed(), true); QCOMPARE(authenticator.origin(), QString()); diff --git a/tests/auto/websocketframe/tst_websocketframe.cpp b/tests/auto/websocketframe/tst_websocketframe.cpp index e3f3e12..46a360a 100644 --- a/tests/auto/websocketframe/tst_websocketframe.cpp +++ b/tests/auto/websocketframe/tst_websocketframe.cpp @@ -274,12 +274,12 @@ void tst_WebSocketFrame::tst_goodFrames_data() QTest::newRow("Non masked final text frame with no payload") << 0 << 0 << 0 << 0U << QWebSocketProtocol::OC_TEXT - << true << QByteArrayLiteral("") + << true << QByteArray() << false << true << false; QTest::newRow("Non masked final binary frame with no payload") << 0 << 0 << 0 << 0U << QWebSocketProtocol::OC_BINARY - << true << QByteArrayLiteral("") + << true << QByteArray() << false << true << false; QTest::newRow("Non masked final close frame with small payload") @@ -290,7 +290,7 @@ void tst_WebSocketFrame::tst_goodFrames_data() QTest::newRow("Non masked final close frame with no payload") << 0 << 0 << 0 << 0U << QWebSocketProtocol::OC_CLOSE - << true << QByteArrayLiteral("") + << true << QByteArray() << true << false << false; QTest::newRow("Non masked final ping frame with small payload") << 0 << 0 << 0 @@ -300,7 +300,7 @@ void tst_WebSocketFrame::tst_goodFrames_data() QTest::newRow("Non masked final pong frame with no payload") << 0 << 0 << 0 << 0U << QWebSocketProtocol::OC_PONG - << true << QByteArrayLiteral("") + << true << QByteArray() << true << false << false; QTest::newRow("Non masked final continuation frame with small payload") diff --git a/tests/auto/websocketprotocol/tst_websocketprotocol.cpp b/tests/auto/websocketprotocol/tst_websocketprotocol.cpp index 433d53a..fa3177c 100644 --- a/tests/auto/websocketprotocol/tst_websocketprotocol.cpp +++ b/tests/auto/websocketprotocol/tst_websocketprotocol.cpp @@ -101,7 +101,7 @@ void tst_WebSocketProtocol::tst_validMasks_data() QTest::addColumn<QString>("inputdata"); QTest::addColumn<QByteArray>("result"); - QTest::newRow("Empty payload") << 0x12345678u << QStringLiteral("") << QByteArrayLiteral(""); + QTest::newRow("Empty payload") << 0x12345678u << QString() << QByteArray(); QTest::newRow("ASCII payload of 8 characters") << 0x12345678u << QStringLiteral("abcdefgh") << QByteArrayLiteral("\x73\x56\x35\x1C\x77\x52\x31\x10"); QTest::newRow("ASCII payload of 9 characters") << 0x12345678u << QStringLiteral("abcdefghi") << QByteArrayLiteral("\x73\x56\x35\x1C\x77\x52\x31\x10\x7B"); //MSVC doesn't like UTF-8 in source code; the following text is represented in the string below: ∫∂ƒ©øØ |