diff options
author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-02-10 16:21:26 +0100 |
---|---|---|
committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-02-20 10:22:28 +0000 |
commit | d6bca86cad962a0078c2a8111133cff123f1ba0a (patch) | |
tree | 0f8cf9863c04675c24efe2bf6b0aa023a56a0f4c /tests/auto | |
parent | 0ff36e52afb503a99c8fded093d25321a46b3d19 (diff) |
Use local sockets for client-server communication
Change-Id: I12bfef671ab31ae9fb8c4bb02776517e7f434d27
Task-number: QTIFW-228
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/installer/clientserver/tst_clientserver.cpp | 39 |
1 files changed, 28 insertions, 11 deletions
diff --git a/tests/auto/installer/clientserver/tst_clientserver.cpp b/tests/auto/installer/clientserver/tst_clientserver.cpp index 4f8f78ba1..316bc3051 100644 --- a/tests/auto/installer/clientserver/tst_clientserver.cpp +++ b/tests/auto/installer/clientserver/tst_clientserver.cpp @@ -40,10 +40,11 @@ #include <remoteserver.h> #include <QSettings> -#include <QTcpSocket> -#include <QTemporaryFile> +#include <QLocalSocket> #include <QTest> #include <QSignalSpy> +#include <QTemporaryFile> +#include <QUuid> using namespace QInstaller; @@ -60,14 +61,16 @@ private slots: void testServerConnectDebug() { RemoteServer server; - server.init(Protocol::DefaultPort, QString(Protocol::DefaultAuthorizationKey), + QString socketName = QUuid::createUuid().toString(); + + server.init(socketName, QString(Protocol::DefaultAuthorizationKey), Protocol::Mode::Debug); server.start(); - QTcpSocket socket; - socket.connectToHost(QLatin1String(Protocol::DefaultHostAddress), Protocol::DefaultPort); + QLocalSocket socket; + socket.connectToServer(socketName); QVERIFY2(socket.waitForConnected(), "Could not connect to server."); - QCOMPARE(socket.state() == QAbstractSocket::ConnectedState, true); + QCOMPARE(socket.state() == QLocalSocket::ConnectedState, true); QDataStream stream; stream.setDevice(&socket); @@ -96,14 +99,14 @@ private slots: void testServerConnectRelease() { RemoteServer server; - quint16 port = (30000 + qrand() % 100); - server.init(port, QString("SomeKey"), Protocol::Mode::Production); + QString socketName = QUuid::createUuid().toString(); + server.init(socketName, QString("SomeKey"), Protocol::Mode::Production); server.start(); - QTcpSocket socket; - socket.connectToHost(QLatin1String(Protocol::DefaultHostAddress), port); + QLocalSocket socket; + socket.connectToServer(socketName); QVERIFY2(socket.waitForConnected(), "Could not connect to server."); - QCOMPARE(socket.state() == QAbstractSocket::ConnectedState, true); + QCOMPARE(socket.state() == QLocalSocket::ConnectedState, true); QDataStream stream; stream.setDevice(&socket); @@ -132,8 +135,13 @@ private slots: void testQSettingsWrapper() { RemoteServer server; + QString socketName = QUuid::createUuid().toString(); + server.init(socketName, QLatin1String("SomeKey"), Protocol::Mode::Production); server.start(); + RemoteClient::instance().init(socketName, QLatin1String("SomeKey"), Protocol::Mode::Debug, + Protocol::StartAs::User); + QSettingsWrapper wrapper("digia", "clientserver"); QCOMPARE(wrapper.isConnectedToServer(), false); wrapper.clear(); @@ -247,8 +255,12 @@ private slots: void testQProcessWrapper() { RemoteServer server; + QString socketName = QUuid::createUuid().toString(); + server.init(socketName, QLatin1String("SomeKey"), Protocol::Mode::Production); server.start(); + RemoteClient::instance().init(socketName, QLatin1String("SomeKey"), Protocol::Mode::Debug, + Protocol::StartAs::User); { QProcess process; QProcessWrapper wrapper; @@ -343,8 +355,13 @@ private slots: void testRemoteFileEngine() { RemoteServer server; + QString socketName = QUuid::createUuid().toString(); + server.init(socketName, QLatin1String("SomeKey"), Protocol::Mode::Production); server.start(); + RemoteClient::instance().init(socketName, QLatin1String("SomeKey"), Protocol::Mode::Debug, + Protocol::StartAs::User); + QString filename; { QTemporaryFile file; |