diff options
Diffstat (limited to 'utils/rbutilqt/test/test-httpget.cpp')
-rw-r--r-- | utils/rbutilqt/test/test-httpget.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/utils/rbutilqt/test/test-httpget.cpp b/utils/rbutilqt/test/test-httpget.cpp index 9230122f63..86f1a6e13e 100644 --- a/utils/rbutilqt/test/test-httpget.cpp +++ b/utils/rbutilqt/test/test-httpget.cpp | |||
@@ -195,11 +195,11 @@ void TestHttpGet::cleanup(void) | |||
195 | { | 195 | { |
196 | rmTree(m_cachedir.absolutePath()); | 196 | rmTree(m_cachedir.absolutePath()); |
197 | if(m_getter) { | 197 | if(m_getter) { |
198 | m_getter->abort(); delete m_getter; m_getter = NULL; | 198 | m_getter->abort(); delete m_getter; m_getter = nullptr; |
199 | } | 199 | } |
200 | if(m_daemon) { delete m_daemon; m_daemon = NULL; } | 200 | if(m_daemon) { delete m_daemon; m_daemon = nullptr; } |
201 | if(m_doneSpy) { delete m_doneSpy; m_doneSpy = NULL; } | 201 | if(m_doneSpy) { delete m_doneSpy; m_doneSpy = nullptr; } |
202 | if(m_progressSpy) { delete m_progressSpy; m_progressSpy = NULL; } | 202 | if(m_progressSpy) { delete m_progressSpy; m_progressSpy = nullptr; } |
203 | } | 203 | } |
204 | 204 | ||
205 | void TestHttpGet::testFileUrlRequest(void) | 205 | void TestHttpGet::testFileUrlRequest(void) |
@@ -299,7 +299,7 @@ void TestHttpGet::testCachedRequest(void) | |||
299 | 299 | ||
300 | QList<QString> requests = m_daemon->lastRequestData(); | 300 | QList<QString> requests = m_daemon->lastRequestData(); |
301 | QCOMPARE(m_doneSpy->count(), 1); | 301 | QCOMPARE(m_doneSpy->count(), 1); |
302 | QCOMPARE(m_doneSpy->at(0).at(0).toBool(), false); | 302 | QCOMPARE(m_doneSpy->at(0).at(0).toInt(), QNetworkReply::NoError); |
303 | QCOMPARE(m_waitTimeoutOccured, false); | 303 | QCOMPARE(m_waitTimeoutOccured, false); |
304 | QCOMPARE(requests.size(), 2); | 304 | QCOMPARE(requests.size(), 2); |
305 | QCOMPARE(requests.at(0).startsWith("GET"), true); | 305 | QCOMPARE(requests.at(0).startsWith("GET"), true); |
@@ -311,7 +311,7 @@ void TestHttpGet::testCachedRequest(void) | |||
311 | while(m_doneSpy->count() < 2 && m_waitTimeoutOccured == false) | 311 | while(m_doneSpy->count() < 2 && m_waitTimeoutOccured == false) |
312 | QCoreApplication::processEvents(); | 312 | QCoreApplication::processEvents(); |
313 | QCOMPARE(m_doneSpy->count(), 2); // 2 requests, 2 times done() | 313 | QCOMPARE(m_doneSpy->count(), 2); // 2 requests, 2 times done() |
314 | QCOMPARE(m_doneSpy->at(1).at(0).toBool(), false); | 314 | QCOMPARE(m_doneSpy->at(1).at(0).toInt(), QNetworkReply::NoError); |
315 | QCOMPARE(m_waitTimeoutOccured, false); | 315 | QCOMPARE(m_waitTimeoutOccured, false); |
316 | QCOMPARE(m_daemon->lastRequestData().size(), 3); | 316 | QCOMPARE(m_daemon->lastRequestData().size(), 3); |
317 | // redirect will not cache as the redirection target file. | 317 | // redirect will not cache as the redirection target file. |
@@ -402,7 +402,7 @@ void TestHttpGet::testResponseCode(void) | |||
402 | QCoreApplication::processEvents(); | 402 | QCoreApplication::processEvents(); |
403 | 403 | ||
404 | QCOMPARE(m_doneSpy->count(), 1); | 404 | QCOMPARE(m_doneSpy->count(), 1); |
405 | QCOMPARE(m_doneSpy->at(0).at(0).toBool(), true); | 405 | QCOMPARE(m_doneSpy->at(0).at(0).toInt(), QNetworkReply::ContentNotFoundError); |
406 | QCOMPARE(m_waitTimeoutOccured, false); | 406 | QCOMPARE(m_waitTimeoutOccured, false); |
407 | QCOMPARE(m_daemon->lastRequestData().size(), 1); | 407 | QCOMPARE(m_daemon->lastRequestData().size(), 1); |
408 | QCOMPARE(m_daemon->lastRequestData().at(0).startsWith("GET"), true); | 408 | QCOMPARE(m_daemon->lastRequestData().at(0).startsWith("GET"), true); |
@@ -472,7 +472,7 @@ void TestHttpGet::testNoServer(void) | |||
472 | QCoreApplication::processEvents(); | 472 | QCoreApplication::processEvents(); |
473 | 473 | ||
474 | QCOMPARE(m_doneSpy->count(), 1); | 474 | QCOMPARE(m_doneSpy->count(), 1); |
475 | QCOMPARE(m_doneSpy->at(0).at(0).toBool(), true); | 475 | QCOMPARE(m_doneSpy->at(0).at(0).toInt(), QNetworkReply::ConnectionRefusedError); |
476 | QCOMPARE(m_waitTimeoutOccured, false); | 476 | QCOMPARE(m_waitTimeoutOccured, false); |
477 | } | 477 | } |
478 | 478 | ||