TestHTTPServer: Make listening an explicit operation that reports failure.

Use this to print the error message when listening fails, and switch to always
stack allocating TestHTTPServer instances for easier cleanup.

Change-Id: I63b2bd38963b66611dc08a5c322615d91a91e675
Reviewed-by: John Brooks <john.brooks@dereferenced.net>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>

5 files changed, 67 insertions, 62 deletions

diff --git a/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp b/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp
index dbf28a5471..d5a5f10634 100644
--- a/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp
+++ b/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp
@@ -267,8 +267,8 @@ void tst_qqmlcomponent::qmlCreateParentReference()
 
 void tst_qqmlcomponent::async()
 {
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
+    TestHTTPServer server;
+    QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
     server.serveDirectory(dataDirectory());
 
     QQmlComponent component(&engine);
@@ -287,8 +287,8 @@ void tst_qqmlcomponent::async()
 
 void tst_qqmlcomponent::asyncHierarchy()
 {
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
+    TestHTTPServer server;
+    QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
     server.serveDirectory(dataDirectory());
 
     // ensure that the item hierarchy is compiled correctly.
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index b6c564a6ce..2809124028 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -4169,8 +4169,8 @@ void tst_qqmlecmascript::importScripts()
     QFETCH(QStringList, propertyNames);
     QFETCH(QVariantList, propertyValues);
 
-    TestHTTPServer server(8111);
-    QVERIFY(server.isValid());
+    TestHTTPServer server;
+    QVERIFY2(server.listen(8111), qPrintable(server.errorString()));
     server.serveDirectory(dataDirectory() + "/remote");
 
     QStringList importPathList = engine.importPathList();
@@ -5997,8 +5997,8 @@ void tst_qqmlecmascript::include()
 
     // Remote - error
     {
-    TestHTTPServer server(8111);
-    QVERIFY(server.isValid());
+    TestHTTPServer server;
+    QVERIFY2(server.listen(8111), qPrintable(server.errorString()));
     server.serveDirectory(dataDirectory());
 
     QQmlComponent component(&engine, testFileUrl("include_remote_missing.qml"));
@@ -6022,8 +6022,8 @@ void tst_qqmlecmascript::includeRemoteSuccess()
 #endif
 
     // Remote - success
-    TestHTTPServer server(8111);
-    QVERIFY(server.isValid());
+    TestHTTPServer server;
+    QVERIFY2(server.listen(8111), qPrintable(server.errorString()));
     server.serveDirectory(dataDirectory());
 
     QQmlComponent component(&engine, testFileUrl("include_remote.qml"));
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index fa0c393d66..cf43352c40 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -2237,7 +2237,8 @@ void tst_qqmllanguage::basicRemote()
     QFETCH(QString, type);
     QFETCH(QString, error);
 
-    TestHTTPServer server(14447);
+    TestHTTPServer server;
+    QVERIFY2(server.listen(14447), qPrintable(server.errorString()));
     server.serveDirectory(dataDirectory());
 
     QQmlComponent component(&engine, url);
@@ -2281,7 +2282,8 @@ void tst_qqmllanguage::importsRemote()
     QFETCH(QString, type);
     QFETCH(QString, error);
 
-    TestHTTPServer server(14447);
+    TestHTTPServer server;
+    QVERIFY2(server.listen(14447), qPrintable(server.errorString()));
     server.serveDirectory(dataDirectory());
 
     testType(qml,type,error);
@@ -2373,7 +2375,8 @@ void tst_qqmllanguage::importsInstalledRemote()
     QFETCH(QString, type);
     QFETCH(QString, error);
 
-    TestHTTPServer server(14447);
+    TestHTTPServer server;
+    QVERIFY2(server.listen(14447), qPrintable(server.errorString()));
     server.serveDirectory(dataDirectory());
 
     QString serverdir = "http://127.0.0.1:14447/lib/";
@@ -2439,7 +2442,8 @@ void tst_qqmllanguage::importsPath()
     QFETCH(QString, qml);
     QFETCH(QString, value);
 
-    TestHTTPServer server(14447);
+    TestHTTPServer server;
+    QVERIFY2(server.listen(14447), qPrintable(server.errorString()));
     server.serveDirectory(dataDirectory());
 
     engine.setImportPathList(QStringList(defaultImportPathList) << importPath);
@@ -3018,7 +3022,8 @@ void tst_qqmllanguage::registeredCompositeType()
 // QTBUG-18268
 void tst_qqmllanguage::remoteLoadCrash()
 {
-    TestHTTPServer server(14448);
+    TestHTTPServer server;
+    QVERIFY2(server.listen(14448), qPrintable(server.errorString()));
     server.serveDirectory(dataDirectory());
 
     QQmlComponent component(&engine);
@@ -3508,7 +3513,8 @@ void tst_qqmllanguage::compositeSingletonQmlDirError()
 // Load a remote composite singleton type via qmldir that defines the type as a singleton
 void tst_qqmllanguage::compositeSingletonRemote()
 {
-    TestHTTPServer server(14447);
+    TestHTTPServer server;
+    QVERIFY2(server.listen(14447), qPrintable(server.errorString()));
     server.serveDirectory(dataDirectory());
 
     QQmlComponent component(&engine, testFile("singletonTest15.qml"));
diff --git a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
index 15be1fdbc0..1861b37bea 100644
--- a/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
+++ b/tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp
@@ -247,8 +247,8 @@ void tst_qqmlmoduleplugin::importPluginWithQmlFile()
 
 void tst_qqmlmoduleplugin::remoteImportWithQuotedUrl()
 {
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
+    TestHTTPServer server;
+    QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
     server.serveDirectory(m_dataImportsDirectory);
 
     QQmlEngine engine;
@@ -268,8 +268,8 @@ void tst_qqmlmoduleplugin::remoteImportWithQuotedUrl()
 
 void tst_qqmlmoduleplugin::remoteImportWithUnquotedUri()
 {
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
+    TestHTTPServer server;
+    QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
     server.serveDirectory(m_dataImportsDirectory);
 
     QQmlEngine engine;
diff --git a/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp b/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp
index 17becb3714..e1ccde2c42 100644
--- a/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp
+++ b/tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp
@@ -240,13 +240,12 @@ void tst_qqmlxmlhttprequest::open()
     QFETCH(QString, url);
     QFETCH(bool, remote);
 
-    QScopedPointer<TestHTTPServer> server; // ensure deletion in case test fails
+    TestHTTPServer server;
     if (remote) {
-        server.reset(new TestHTTPServer(SERVER_PORT));
-        QVERIFY(server->isValid());
-        QVERIFY(server->wait(testFileUrl("open_network.expect"),
-                             testFileUrl("open_network.reply"),
-                             testFileUrl("testdocument.html")));
+        QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
+        QVERIFY(server.wait(testFileUrl("open_network.expect"),
+                            testFileUrl("open_network.reply"),
+                            testFileUrl("testdocument.html")));
     }
 
     QQmlComponent component(&engine, qmlFile);
@@ -322,8 +321,8 @@ void tst_qqmlxmlhttprequest::open_arg_count()
 // Test valid setRequestHeader() calls
 void tst_qqmlxmlhttprequest::setRequestHeader()
 {
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
+    TestHTTPServer server;
+    QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
     QVERIFY(server.wait(testFileUrl("setRequestHeader.expect"),
                         testFileUrl("setRequestHeader.reply"),
                         testFileUrl("testdocument.html")));
@@ -340,8 +339,8 @@ void tst_qqmlxmlhttprequest::setRequestHeader()
 // Test valid setRequestHeader() calls with different header cases
 void tst_qqmlxmlhttprequest::setRequestHeader_caseInsensitive()
 {
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
+    TestHTTPServer server;
+    QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
     QVERIFY(server.wait(testFileUrl("setRequestHeader.expect"),
                         testFileUrl("setRequestHeader.reply"),
                         testFileUrl("testdocument.html")));
@@ -397,8 +396,8 @@ void tst_qqmlxmlhttprequest::setRequestHeader_illegalName()
 {
     QFETCH(QString, name);
 
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
+    TestHTTPServer server;
+    QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
     QVERIFY(server.wait(testFileUrl("open_network.expect"),
                         testFileUrl("open_network.reply"),
                         testFileUrl("testdocument.html")));
@@ -423,8 +422,8 @@ void tst_qqmlxmlhttprequest::setRequestHeader_illegalName()
 // Test that attempting to set a header after a request is sent throws an exception
 void tst_qqmlxmlhttprequest::setRequestHeader_sent()
 {
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
+    TestHTTPServer server;
+    QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
     QVERIFY(server.wait(testFileUrl("open_network.expect"),
                         testFileUrl("open_network.reply"),
                         testFileUrl("testdocument.html")));
@@ -475,8 +474,8 @@ void tst_qqmlxmlhttprequest::send_alreadySent()
 void tst_qqmlxmlhttprequest::send_ignoreData()
 {
     {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
+        TestHTTPServer server;
+        QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
         QVERIFY(server.wait(testFileUrl("send_ignoreData_GET.expect"),
                             testFileUrl("send_ignoreData.reply"),
                             testFileUrl("testdocument.html")));
@@ -492,8 +491,8 @@ void tst_qqmlxmlhttprequest::send_ignoreData()
     }
 
     {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
+        TestHTTPServer server;
+        QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
         QVERIFY(server.wait(testFileUrl("send_ignoreData_HEAD.expect"),
                             testFileUrl("send_ignoreData.reply"),
                             QUrl()));
@@ -509,8 +508,8 @@ void tst_qqmlxmlhttprequest::send_ignoreData()
     }
 
     {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
+        TestHTTPServer server;
+        QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
         QVERIFY(server.wait(testFileUrl("send_ignoreData_DELETE.expect"),
                             testFileUrl("send_ignoreData.reply"),
                             QUrl()));
@@ -532,8 +531,8 @@ void tst_qqmlxmlhttprequest::send_withdata()
     QFETCH(QString, file_expected);
     QFETCH(QString, file_qml);
 
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
+    TestHTTPServer server;
+    QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
     QVERIFY(server.wait(testFileUrl(file_expected),
                         testFileUrl("send_data.reply"),
                         testFileUrl("testdocument.html")));
@@ -602,8 +601,8 @@ void tst_qqmlxmlhttprequest::abort_opened()
 // Test abort() aborts in progress send
 void tst_qqmlxmlhttprequest::abort()
 {
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
+    TestHTTPServer server;
+    QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
     QVERIFY(server.wait(testFileUrl("abort.expect"),
                         testFileUrl("abort.reply"),
                         testFileUrl("testdocument.html")));
@@ -626,8 +625,8 @@ void tst_qqmlxmlhttprequest::getResponseHeader()
 {
     QQmlEngine engine; // Avoid cookie contamination
 
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
+    TestHTTPServer server;
+    QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
     QVERIFY(server.wait(testFileUrl("getResponseHeader.expect"),
                         testFileUrl("getResponseHeader.reply"),
                         testFileUrl("testdocument.html")));
@@ -693,8 +692,8 @@ void tst_qqmlxmlhttprequest::getAllResponseHeaders()
 {
     QQmlEngine engine; // Avoid cookie contamination
 
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
+    TestHTTPServer server;
+    QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
     QVERIFY(server.wait(testFileUrl("getResponseHeader.expect"),
                         testFileUrl("getResponseHeader.reply"),
                         testFileUrl("testdocument.html")));
@@ -754,8 +753,8 @@ void tst_qqmlxmlhttprequest::status()
     QFETCH(QUrl, replyUrl);
     QFETCH(int, status);
 
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
+    TestHTTPServer server;
+    QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
     QVERIFY(server.wait(testFileUrl("status.expect"),
                         replyUrl,
                         testFileUrl("testdocument.html")));
@@ -793,8 +792,8 @@ void tst_qqmlxmlhttprequest::statusText()
     QFETCH(QUrl, replyUrl);
     QFETCH(QString, statusText);
 
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
+    TestHTTPServer server;
+    QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
     QVERIFY(server.wait(testFileUrl("status.expect"),
                         replyUrl,
                         testFileUrl("testdocument.html")));
@@ -833,8 +832,8 @@ void tst_qqmlxmlhttprequest::responseText()
     QFETCH(QUrl, bodyUrl);
     QFETCH(QString, responseText);
 
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
+    TestHTTPServer server;
+    QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
     QVERIFY(server.wait(testFileUrl("status.expect"),
                         replyUrl,
                         bodyUrl));
@@ -934,8 +933,8 @@ void tst_qqmlxmlhttprequest::invalidMethodUsage()
 void tst_qqmlxmlhttprequest::redirects()
 {
     {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
+        TestHTTPServer server;
+        QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
         server.addRedirect("redirect.html", "http://127.0.0.1:14445/redirecttarget.html");
         server.serveDirectory(dataDirectory());
 
@@ -951,8 +950,8 @@ void tst_qqmlxmlhttprequest::redirects()
     }
 
     {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
+        TestHTTPServer server;
+        QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
         server.addRedirect("redirect.html", "http://127.0.0.1:14445/redirectmissing.html");
         server.serveDirectory(dataDirectory());
 
@@ -968,8 +967,8 @@ void tst_qqmlxmlhttprequest::redirects()
     }
 
     {
-        TestHTTPServer server(SERVER_PORT);
-        QVERIFY(server.isValid());
+        TestHTTPServer server;
+        QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
         server.addRedirect("redirect.html", "http://127.0.0.1:14445/redirect.html");
         server.serveDirectory(dataDirectory());
 
@@ -1070,8 +1069,8 @@ void tst_qqmlxmlhttprequest::stateChangeCallingContext()
     // ensure that we don't crash by attempting to evaluate
     // without a valid calling context.
 
-    TestHTTPServer server(SERVER_PORT);
-    QVERIFY(server.isValid());
+    TestHTTPServer server;
+    QVERIFY2(server.listen(SERVER_PORT), qPrintable(server.errorString()));
     server.serveDirectory(dataDirectory(), TestHTTPServer::Delay);
 
     QQmlComponent component(&engine, testFileUrl("stateChangeCallingContext.qml"));