From 1c1231a92629efa435a52e0c7138baadce2ad7ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Tue, 15 Feb 2022 17:33:46 +0100 Subject: [PATCH] Fix issue #25 remote proxy tests for Qt > 5.12 --- tests/test-proxy/remoteproxytestsproxy.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/test-proxy/remoteproxytestsproxy.cpp b/tests/test-proxy/remoteproxytestsproxy.cpp index 7f4f56a..5e5649f 100644 --- a/tests/test-proxy/remoteproxytestsproxy.cpp +++ b/tests/test-proxy/remoteproxytestsproxy.cpp @@ -169,9 +169,9 @@ void RemoteProxyTestsProxy::monitorServer() QVERIFY(connectionTwo->state() == RemoteProxyConnection::StateRemoteConnected); QCOMPARE(connectionOne->tunnelPartnerName(), nameConnectionTwo); - QCOMPARE(connectionOne->tunnelPartnerUuid(), uuidConnectionTwo.toString()); + QCOMPARE(QUuid(connectionOne->tunnelPartnerUuid()), uuidConnectionTwo); QCOMPARE(connectionTwo->tunnelPartnerName(), nameConnectionOne); - QCOMPARE(connectionTwo->tunnelPartnerUuid(), uuidConnectionOne.toString()); + QCOMPARE(QUuid(connectionTwo->tunnelPartnerUuid()), uuidConnectionOne); // Get monitor data @@ -638,9 +638,9 @@ void RemoteProxyTestsProxy::authenticateNonce() QVERIFY(connectionTwo->state() == RemoteProxyConnection::StateRemoteConnected); QCOMPARE(connectionOne->tunnelPartnerName(), nameConnectionTwo); - QCOMPARE(connectionOne->tunnelPartnerUuid(), uuidConnectionTwo.toString()); + QCOMPARE(QUuid(connectionOne->tunnelPartnerUuid()), uuidConnectionTwo); QCOMPARE(connectionTwo->tunnelPartnerName(), nameConnectionOne); - QCOMPARE(connectionTwo->tunnelPartnerUuid(), uuidConnectionOne.toString()); + QCOMPARE(QUuid(connectionTwo->tunnelPartnerUuid()), uuidConnectionOne); // Pipe data trought the tunnel QSignalSpy remoteConnectionDataOne(connectionOne, &RemoteProxyConnection::dataReady); @@ -877,9 +877,9 @@ void RemoteProxyTestsProxy::remoteConnection() QVERIFY(connectionTwo->state() == RemoteProxyConnection::StateRemoteConnected); QCOMPARE(connectionOne->tunnelPartnerName(), nameConnectionTwo); - QCOMPARE(connectionOne->tunnelPartnerUuid(), uuidConnectionTwo.toString()); + QCOMPARE(QUuid(connectionOne->tunnelPartnerUuid()), uuidConnectionTwo); QCOMPARE(connectionTwo->tunnelPartnerName(), nameConnectionOne); - QCOMPARE(connectionTwo->tunnelPartnerUuid(), uuidConnectionOne.toString()); + QCOMPARE(QUuid(connectionTwo->tunnelPartnerUuid()), uuidConnectionOne); // Pipe data trought the tunnel QSignalSpy remoteConnectionDataOne(connectionOne, &RemoteProxyConnection::dataReady); @@ -1293,9 +1293,9 @@ void RemoteProxyTestsProxy::tcpRemoteConnection() QVERIFY(connectionTwo->state() == RemoteProxyConnection::StateRemoteConnected); QCOMPARE(connectionOne->tunnelPartnerName(), nameConnectionTwo); - QCOMPARE(connectionOne->tunnelPartnerUuid(), uuidConnectionTwo.toString()); + QCOMPARE(QUuid(connectionOne->tunnelPartnerUuid()), uuidConnectionTwo); QCOMPARE(connectionTwo->tunnelPartnerName(), nameConnectionOne); - QCOMPARE(connectionTwo->tunnelPartnerUuid(), uuidConnectionOne.toString()); + QCOMPARE(QUuid(connectionTwo->tunnelPartnerUuid()), uuidConnectionOne); // Pipe data trought the tunnel QSignalSpy remoteConnectionDataOne(connectionOne, &RemoteProxyConnection::dataReady); @@ -1387,9 +1387,9 @@ void RemoteProxyTestsProxy::tcpWebsocketRemoteConnection() QVERIFY(connectionTwo->state() == RemoteProxyConnection::StateRemoteConnected); QCOMPARE(connectionOne->tunnelPartnerName(), nameConnectionTwo); - QCOMPARE(connectionOne->tunnelPartnerUuid(), uuidConnectionTwo.toString()); + QCOMPARE(QUuid(connectionOne->tunnelPartnerUuid()), uuidConnectionTwo); QCOMPARE(connectionTwo->tunnelPartnerName(), nameConnectionOne); - QCOMPARE(connectionTwo->tunnelPartnerUuid(), uuidConnectionOne.toString()); + QCOMPARE(QUuid(connectionTwo->tunnelPartnerUuid()), uuidConnectionOne); // Pipe data trought the tunnel QSignalSpy remoteConnectionDataOne(connectionOne, &RemoteProxyConnection::dataReady);