Make HttpServer to server resource from dirs for unhandled requests

Change-Id: I2e15dff77c8f18af60a565cb74558f57c3527db8
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>

1 files changed, 2 insertions, 32 deletions

diff --git a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
index aad7a205c..e3b7af18c 100644
--- a/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
+++ b/tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
@@ -188,37 +188,6 @@ public:
     }
 };
 
-class TestServer : public HttpServer
-{
-public:
-    TestServer()
-    {
-        connect(this, &HttpServer::newRequest, this, &TestServer::onNewRequest);
-    }
-
-private:
-    void onNewRequest(HttpReqRep *rr)
-    {
-        const QDir resourceDir(TESTS_SOURCE_DIR "qwebengineurlrequestinterceptor/resources");
-        QString path = rr->requestPath();
-        path.remove(0, 1);
-
-        if (rr->requestMethod() != "GET" || !resourceDir.exists(path)) {
-            rr->sendResponse(404);
-            return;
-        }
-
-        QFile file(resourceDir.filePath(path));
-        file.open(QIODevice::ReadOnly);
-        QByteArray data = file.readAll();
-        rr->setResponseBody(data);
-        QMimeDatabase db;
-        QMimeType mime = db.mimeTypeForFileNameAndData(file.fileName(), data);
-        rr->setResponseHeader(QByteArrayLiteral("content-type"), mime.name().toUtf8());
-        rr->sendResponse();
-    }
-};
-
 class ConsolePage : public QWebEnginePage {
     Q_OBJECT
 public:
@@ -759,7 +728,8 @@ void tst_QWebEngineUrlRequestInterceptor::jsServiceWorker()
 {
     QFETCH(InterceptorSetter, setter);
 
-    TestServer server;
+    HttpServer server;
+    server.setResourceDirs({ TESTS_SOURCE_DIR "qwebengineurlrequestinterceptor/resources" });
     QVERIFY(server.start());
 
     QWebEngineProfile profile(QStringLiteral("Test"));