summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rbutil/rbutilqt/test/test-httpget.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/rbutil/rbutilqt/test/test-httpget.cpp b/rbutil/rbutilqt/test/test-httpget.cpp
index c6f5abf9fc..0388081452 100644
--- a/rbutil/rbutilqt/test/test-httpget.cpp
+++ b/rbutil/rbutilqt/test/test-httpget.cpp
@@ -169,8 +169,9 @@ class TestHttpGet : public QObject
169 bool m_waitTimeoutOccured; 169 bool m_waitTimeoutOccured;
170 QString m_now; 170 QString m_now;
171 QDir m_cachedir; 171 QDir m_cachedir;
172 HttpGet *m_getter = NULL; 172 HttpGet *m_getter;
173 QSignalSpy *m_doneSpy = NULL; 173 QSignalSpy *m_doneSpy;
174 QSignalSpy *m_progressSpy;
174}; 175};
175 176
176 177
@@ -183,6 +184,7 @@ void TestHttpGet::init(void)
183 m_cachedir = temporaryFolder(); 184 m_cachedir = temporaryFolder();
184 m_getter = new HttpGet(this); 185 m_getter = new HttpGet(this);
185 m_doneSpy = new QSignalSpy(m_getter, SIGNAL(done(bool))); 186 m_doneSpy = new QSignalSpy(m_getter, SIGNAL(done(bool)));
187 m_progressSpy = new QSignalSpy(m_getter, SIGNAL(dataReadProgress(int, int)));
186 m_waitTimeoutOccured = false; 188 m_waitTimeoutOccured = false;
187} 189}
188 190
@@ -194,6 +196,7 @@ void TestHttpGet::cleanup(void)
194 } 196 }
195 if(m_daemon) { delete m_daemon; m_daemon = NULL; } 197 if(m_daemon) { delete m_daemon; m_daemon = NULL; }
196 if(m_doneSpy) { delete m_doneSpy; m_doneSpy = NULL; } 198 if(m_doneSpy) { delete m_doneSpy; m_doneSpy = NULL; }
199 if(m_progressSpy) { delete m_progressSpy; m_progressSpy = NULL; }
197} 200}
198 201
199void TestHttpGet::testFileUrlRequest(void) 202void TestHttpGet::testFileUrlRequest(void)
@@ -214,6 +217,7 @@ void TestHttpGet::testFileUrlRequest(void)
214 QCOMPARE(m_daemon->lastRequestData().size(), 0); 217 QCOMPARE(m_daemon->lastRequestData().size(), 0);
215 QCOMPARE(m_getter->readAll(), teststring.toLatin1()); 218 QCOMPARE(m_getter->readAll(), teststring.toLatin1());
216 QCOMPARE(m_getter->httpResponse(), 200); 219 QCOMPARE(m_getter->httpResponse(), 200);
220 QCOMPARE(m_progressSpy->at(0).at(0).toInt(), 0);
217} 221}
218 222
219 223
@@ -423,6 +427,8 @@ void TestHttpGet::testContentToBuffer(void)
423 QCOMPARE(m_getter->readAll(), QByteArray(TEST_BINARY_BLOB)); 427 QCOMPARE(m_getter->readAll(), QByteArray(TEST_BINARY_BLOB));
424 // sizeof(TEST_BINARY_BLOB) will include an additional terminating NULL. 428 // sizeof(TEST_BINARY_BLOB) will include an additional terminating NULL.
425 QCOMPARE((unsigned long)m_getter->readAll().size(), sizeof(TEST_BINARY_BLOB) - 1); 429 QCOMPARE((unsigned long)m_getter->readAll().size(), sizeof(TEST_BINARY_BLOB) - 1);
430 QCOMPARE(m_progressSpy->at(m_progressSpy->count() - 1).at(0).toInt(), (int)sizeof(TEST_BINARY_BLOB) - 1);
431 QCOMPARE(m_progressSpy->at(m_progressSpy->count() - 1).at(1).toInt(), (int)sizeof(TEST_BINARY_BLOB) - 1);
426} 432}
427 433
428void TestHttpGet::testContentToFile(void) 434void TestHttpGet::testContentToFile(void)