aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/debugger/qpacketprotocol/tst_qpacketprotocol.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/qml/debugger/qpacketprotocol/tst_qpacketprotocol.cpp')
-rw-r--r--tests/auto/qml/debugger/qpacketprotocol/tst_qpacketprotocol.cpp160
1 files changed, 34 insertions, 126 deletions
diff --git a/tests/auto/qml/debugger/qpacketprotocol/tst_qpacketprotocol.cpp b/tests/auto/qml/debugger/qpacketprotocol/tst_qpacketprotocol.cpp
index db9e621d54..cadc2a7cc4 100644
--- a/tests/auto/qml/debugger/qpacketprotocol/tst_qpacketprotocol.cpp
+++ b/tests/auto/qml/debugger/qpacketprotocol/tst_qpacketprotocol.cpp
@@ -1,31 +1,26 @@
/****************************************************************************
**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
**
** This file is part of the test suite of the Qt Toolkit.
**
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
** $QT_END_LICENSE$
**
@@ -38,7 +33,8 @@
#include <QDebug>
#include <QBuffer>
-#include "../../../../../src/plugins/qmltooling/shared/qpacketprotocol.h"
+#include <private/qpacketprotocol_p.h>
+#include <private/qpacket_p.h>
#include "debugutil_p.h"
@@ -55,18 +51,10 @@ private slots:
void init();
void cleanup();
- void maximumPacketSize();
- void setMaximumPacketSize();
- void setMaximumPacketSize_data();
void send();
- void send_data();
void packetsAvailable();
void packetsAvailable_data();
- void clear();
void read();
- void device();
-
- void tst_QPacket_clear();
};
void tst_QPacketProtocol::init()
@@ -95,65 +83,26 @@ void tst_QPacketProtocol::cleanup()
delete m_server;
}
-void tst_QPacketProtocol::maximumPacketSize()
-{
- QPacketProtocol p(m_client);
- QCOMPARE(p.maximumPacketSize(), 0x7FFFFFFF);
-}
-
-void tst_QPacketProtocol::setMaximumPacketSize()
-{
- QFETCH(qint32, size);
- QFETCH(qint32, expected);
-
- QPacketProtocol out(m_serverConn);
- QCOMPARE(out.setMaximumPacketSize(size), expected);
-}
-
-void tst_QPacketProtocol::setMaximumPacketSize_data()
-{
- QTest::addColumn<int>("size");
- QTest::addColumn<int>("expected");
-
- QTest::newRow("invalid") << qint32(sizeof(qint32) - 1) << qint32(0x7FFFFFFF);
- QTest::newRow("still invalid") << qint32(sizeof(qint32)) << qint32(0x7FFFFFFF);
- QTest::newRow("valid") << qint32(sizeof(qint32) + 1) << qint32(sizeof(qint32) + 1);
-}
-
void tst_QPacketProtocol::send()
{
- QFETCH(bool, useAutoSend);
-
QPacketProtocol in(m_client);
QPacketProtocol out(m_serverConn);
QByteArray ba;
int num;
- if (useAutoSend) {
- out.send() << "Hello world" << 123;
- } else {
- QPacket packet;
- packet << "Hello world" << 123;
- out.send(packet);
- }
+ QPacket packet(QDataStream::Qt_DefaultCompiledVersion);
+ packet << "Hello world" << 123;
+ out.send(packet.data());
QVERIFY(QQmlDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
- QPacket p = in.read();
+ QPacket p(QDataStream::Qt_DefaultCompiledVersion, in.read());
p >> ba >> num;
QCOMPARE(ba, QByteArray("Hello world") + '\0');
QCOMPARE(num, 123);
}
-void tst_QPacketProtocol::send_data()
-{
- QTest::addColumn<bool>("useAutoSend");
-
- QTest::newRow("auto send") << true;
- QTest::newRow("no auto send") << false;
-}
-
void tst_QPacketProtocol::packetsAvailable()
{
QFETCH(int, packetCount);
@@ -164,8 +113,11 @@ void tst_QPacketProtocol::packetsAvailable()
QCOMPARE(out.packetsAvailable(), qint64(0));
QCOMPARE(in.packetsAvailable(), qint64(0));
- for (int i=0; i<packetCount; i++)
- out.send() << "Hello";
+ for (int i=0; i<packetCount; i++) {
+ QPacket packet(QDataStream::Qt_DefaultCompiledVersion);
+ packet << "Hello";
+ out.send(packet.data());
+ }
QVERIFY(QQmlDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
QCOMPARE(in.packetsAvailable(), qint64(packetCount));
@@ -180,19 +132,6 @@ void tst_QPacketProtocol::packetsAvailable_data()
QTest::newRow("10") << 10;
}
-void tst_QPacketProtocol::clear()
-{
- QPacketProtocol in(m_client);
- QPacketProtocol out(m_serverConn);
-
- out.send() << 123;
- out.send() << 456;
- QVERIFY(QQmlDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
-
- in.clear();
- QVERIFY(in.read().isEmpty());
-}
-
void tst_QPacketProtocol::read()
{
QPacketProtocol in(m_client);
@@ -200,61 +139,30 @@ void tst_QPacketProtocol::read()
QVERIFY(in.read().isEmpty());
- out.send() << 123;
- out.send() << 456;
+ QPacket packet(QDataStream::Qt_DefaultCompiledVersion);
+ packet << 123;
+ out.send(packet.data());
+
+ QPacket packet2(QDataStream::Qt_DefaultCompiledVersion);
+ packet2 << 456;
+ out.send(packet2.data());
QVERIFY(QQmlDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
int num;
- QPacket p1 = in.read();
- QVERIFY(!p1.isEmpty());
+ QPacket p1(QDataStream::Qt_DefaultCompiledVersion, in.read());
+ QVERIFY(!p1.atEnd());
p1 >> num;
QCOMPARE(num, 123);
- QPacket p2 = in.read();
- QVERIFY(!p2.isEmpty());
+ QPacket p2(QDataStream::Qt_DefaultCompiledVersion, in.read());
+ QVERIFY(!p2.atEnd());
p2 >> num;
QCOMPARE(num, 456);
QVERIFY(in.read().isEmpty());
}
-void tst_QPacketProtocol::device()
-{
- QPacketProtocol p(m_client);
- QCOMPARE(p.device(), m_client);
-}
-
-void tst_QPacketProtocol::tst_QPacket_clear()
-{
- QPacketProtocol protocol(m_client);
-
- QPacket packet;
-
- packet << "Hello world!" << 123;
- protocol.send(packet);
-
- packet.clear();
- QVERIFY(packet.isEmpty());
- packet << "Goodbyte world!" << 789;
- protocol.send(packet);
-
- QByteArray ba;
- int num;
- QPacketProtocol in(m_serverConn);
- QVERIFY(QQmlDebugTest::waitForSignal(&in, SIGNAL(readyRead())));
-
- QPacket p1 = in.read();
- p1 >> ba >> num;
- QCOMPARE(ba, QByteArray("Hello world!") + '\0');
- QCOMPARE(num, 123);
-
- QPacket p2 = in.read();
- p2 >> ba >> num;
- QCOMPARE(ba, QByteArray("Goodbyte world!") + '\0');
- QCOMPARE(num, 789);
-}
-
QTEST_MAIN(tst_QPacketProtocol)
#include "tst_qpacketprotocol.moc"
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 13:05:31 +0000