diff options
Diffstat (limited to 'utils')
-rw-r--r-- | utils/rbutilqt/test/test-httpget.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/utils/rbutilqt/test/test-httpget.cpp b/utils/rbutilqt/test/test-httpget.cpp index 9d895d9487..9230122f63 100644 --- a/utils/rbutilqt/test/test-httpget.cpp +++ b/utils/rbutilqt/test/test-httpget.cpp | |||
@@ -18,8 +18,8 @@ | |||
18 | * | 18 | * |
19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
20 | 20 | ||
21 | #include <QtTest/QtTest> | 21 | #include <QtTest> |
22 | #include <QtCore/QObject> | 22 | #include <QObject> |
23 | #include "httpget.h" | 23 | #include "httpget.h" |
24 | 24 | ||
25 | #define TEST_USER_AGENT "TestAgent/2.3" | 25 | #define TEST_USER_AGENT "TestAgent/2.3" |
@@ -354,10 +354,11 @@ void TestHttpGet::testUserAgent(void) | |||
354 | QCOMPARE(requests.at(0).startsWith("GET"), true); | 354 | QCOMPARE(requests.at(0).startsWith("GET"), true); |
355 | 355 | ||
356 | for(int i = 0; i < requests.size(); ++i) { | 356 | for(int i = 0; i < requests.size(); ++i) { |
357 | QRegExp rx("User-Agent:[\t ]+([a-zA-Z0-9\\./]+)"); | 357 | QRegularExpression rx("User-Agent:[\t ]+([a-zA-Z0-9\\./]+)"); |
358 | bool userAgentFound = rx.indexIn(requests.at(i)) > 0 ? true : false; | 358 | auto match = rx.match(requests.at(i)); |
359 | bool userAgentFound = match.hasMatch(); | ||
359 | QCOMPARE(userAgentFound, true); | 360 | QCOMPARE(userAgentFound, true); |
360 | QString userAgentString = rx.cap(1); | 361 | QString userAgentString = match.captured(1); |
361 | QCOMPARE(userAgentString, QString(TEST_USER_AGENT)); | 362 | QCOMPARE(userAgentString, QString(TEST_USER_AGENT)); |
362 | } | 363 | } |
363 | } | 364 | } |
@@ -539,7 +540,8 @@ void TestHttpGet::testMovedQuery(void) | |||
539 | QCOMPARE(m_daemon->lastRequestData().at(0).startsWith("GET"), true); | 540 | QCOMPARE(m_daemon->lastRequestData().at(0).startsWith("GET"), true); |
540 | QCOMPARE(m_daemon->lastRequestData().at(1).startsWith("GET"), true); | 541 | QCOMPARE(m_daemon->lastRequestData().at(1).startsWith("GET"), true); |
541 | // current implementation keeps order of query items. | 542 | // current implementation keeps order of query items. |
542 | QCOMPARE((bool)m_daemon->lastRequestData().at(1).contains("/test2.php?var=1&b=foo"), true); | 543 | qDebug() << m_daemon->lastRequestData().at(1); |
544 | QCOMPARE(m_daemon->lastRequestData().at(1).contains("/test2.php?var=1&b=foo"), true); | ||
543 | } | 545 | } |
544 | 546 | ||
545 | QTEST_MAIN(TestHttpGet) | 547 | QTEST_MAIN(TestHttpGet) |