From 4e2d5d10187af1ce3b5be90152205985518c1780 Mon Sep 17 00:00:00 2001
From: Nathan Osman <nathan@quickmediasolutions.com>
Date: Tue, 23 Jun 2015 18:42:20 -0700
Subject: [PATCH] Minor fixes to the QHttpSocket tests.

---
 tests/core/TestQHttpSocket.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/tests/core/TestQHttpSocket.cpp b/tests/core/TestQHttpSocket.cpp
index d34fb78..8d7710b 100644
--- a/tests/core/TestQHttpSocket.cpp
+++ b/tests/core/TestQHttpSocket.cpp
@@ -31,7 +31,6 @@
 #include "common/qsocketpair.h"
 #include "core/qhttpsocket.h"
 #include "util/qhttpparser.h"
-#include "util/qiodevicecopier.h"
 
 // Utility macro (avoids duplication) that creates a pair of connected
 // sockets, a QSimpleHttpClient for the client and a QHttpSocket for the
@@ -99,11 +98,8 @@ void TestQHttpSocket::testData()
     client.sendHeaders(Method, Path, headers);
     client.sendData(Data);
 
-    QBuffer buffer;
-    QIODeviceCopier copier(&server, &buffer);
-    copier.start();
-
-    QTRY_COMPARE(buffer.data(), Data);
+    QTRY_COMPARE(server.bytesAvailable(), Data.length());
+    QCOMPARE(server.readAll(), Data);
 
     server.writeHeaders();
     server.write(Data);
@@ -135,7 +131,7 @@ void TestQHttpSocket::testSignals()
     server.writeHeaders();
     server.write(Data);
 
-    QTRY_COMPARE(client.data(), Data);
+    QTRY_COMPARE(client.data().length(), Data.length());
     QVERIFY(bytesWrittenSpy.count() > 0);
 
     qint64 bytesWritten = 0;