From 61d219721ebe002dcca791e2ffc04beb8499186d Mon Sep 17 00:00:00 2001 From: Nathan Osman Date: Fri, 7 Jul 2017 21:56:09 -0700 Subject: [PATCH] Move everything into the QHttpEngine namespace. --- examples/auth/client.cpp | 2 +- examples/chatserver/apihandler.cpp | 6 +-- examples/chatserver/apihandler.h | 4 +- examples/chatserver/main.cpp | 6 +-- examples/fileserver/main.cpp | 4 +- src/include/qhttpengine/basicauthmiddleware.h | 5 ++ src/include/qhttpengine/filesystemhandler.h | 5 ++ src/include/qhttpengine/handler.h | 6 +++ src/include/qhttpengine/ibytearray.h | 5 ++ src/include/qhttpengine/localauthmiddleware.h | 5 ++ src/include/qhttpengine/localfile.h | 5 ++ src/include/qhttpengine/middleware.h | 5 ++ src/include/qhttpengine/parser.h | 5 ++ src/include/qhttpengine/proxyhandler.h | 5 ++ src/include/qhttpengine/qiodevicecopier.h | 6 +++ src/include/qhttpengine/qobjecthandler.h | 6 +++ src/include/qhttpengine/range.h | 5 ++ src/include/qhttpengine/server.h | 6 +++ src/include/qhttpengine/socket.h | 6 +++ src/src/basicauthmiddleware.cpp | 2 + src/src/basicauthmiddleware_p.h | 5 ++ src/src/filesystemhandler.cpp | 2 + src/src/filesystemhandler_p.h | 5 ++ src/src/handler.cpp | 2 + src/src/handler_p.h | 5 ++ src/src/localauthmiddleware.cpp | 2 + src/src/localauthmiddleware_p.h | 5 ++ src/src/localfile.cpp | 2 + src/src/localfile_p.h | 7 ++- src/src/parser.cpp | 2 + src/src/proxyhandler.cpp | 2 + src/src/proxyhandler_p.h | 5 ++ src/src/proxysocket.cpp | 2 + src/src/proxysocket.h | 2 + src/src/qiodevicecopier.cpp | 2 + src/src/qiodevicecopier_p.h | 6 +++ src/src/qobjecthandler.cpp | 2 + src/src/qobjecthandler_p.h | 5 ++ src/src/range.cpp | 2 + src/src/range_p.h | 5 ++ src/src/server.cpp | 2 + src/src/server_p.h | 5 ++ src/src/socket.cpp | 2 + src/src/socket_p.h | 5 ++ tests/TestQFilesystemHandler.cpp | 30 +++++------ tests/TestQHttpBasicAuth.cpp | 14 ++--- tests/TestQHttpHandler.cpp | 26 ++++----- tests/TestQHttpMiddleware.cpp | 12 ++--- tests/TestQHttpParser.cpp | 54 +++++++++---------- tests/TestQHttpRange.cpp | 14 ++--- tests/TestQHttpServer.cpp | 10 ++-- tests/TestQHttpSocket.cpp | 12 ++--- tests/TestQIByteArray.cpp | 8 +-- tests/TestQIODeviceCopier.cpp | 8 +-- tests/TestQLocalAuth.cpp | 6 +-- tests/TestQLocalFile.cpp | 2 +- tests/TestQObjectHandler.cpp | 30 +++++------ tests/TestQProxyHandler.cpp | 12 ++--- tests/common/qsimplehttpclient.cpp | 4 +- tests/common/qsimplehttpclient.h | 6 +-- 60 files changed, 295 insertions(+), 136 deletions(-) diff --git a/examples/auth/client.cpp b/examples/auth/client.cpp index b2bb141..9816bd3 100644 --- a/examples/auth/client.cpp +++ b/examples/auth/client.cpp @@ -37,7 +37,7 @@ int main(int argc, char * argv[]) QCoreApplication a(argc, argv); // Attempt to open the local file and read from it - LocalFile file; + QHttpEngine::LocalFile file; if (!file.open()) { qCritical("Unable to open local file - is server running?"); return 1; diff --git a/examples/chatserver/apihandler.cpp b/examples/chatserver/apihandler.cpp index 9f6f46e..271b115 100644 --- a/examples/chatserver/apihandler.cpp +++ b/examples/chatserver/apihandler.cpp @@ -27,7 +27,7 @@ #include "apihandler.h" -void ApiHandler::messages(Socket *socket) +void ApiHandler::messages(QHttpEngine::Socket *socket) { QJsonObject object; object.insert("messages", QJsonArray::fromStringList(mMessages)); @@ -35,7 +35,7 @@ void ApiHandler::messages(Socket *socket) } -void ApiHandler::messagesNew(Socket *socket) +void ApiHandler::messagesNew(QHttpEngine::Socket *socket) { QJsonDocument document; if (socket->readJson(document)) { @@ -49,5 +49,5 @@ void ApiHandler::messagesNew(Socket *socket) } // If execution reaches this point, malformed data was supplied - socket->writeError(Socket::BadRequest); + socket->writeError(QHttpEngine::Socket::BadRequest); } diff --git a/examples/chatserver/apihandler.h b/examples/chatserver/apihandler.h index dc0b657..420c127 100644 --- a/examples/chatserver/apihandler.h +++ b/examples/chatserver/apihandler.h @@ -34,8 +34,8 @@ class ApiHandler : public QObject public Q_SLOTS: - void messages(Socket *socket); - void messagesNew(Socket *socket); + void messages(QHttpEngine::Socket *socket); + void messagesNew(QHttpEngine::Socket *socket); private: diff --git a/examples/chatserver/main.cpp b/examples/chatserver/main.cpp index 70a5cbc..f3eb362 100644 --- a/examples/chatserver/main.cpp +++ b/examples/chatserver/main.cpp @@ -64,16 +64,16 @@ int main(int argc, char * argv[]) quint16 port = parser.value(portOption).toInt(); // Build the hierarchy of handlers - FilesystemHandler handler(":/static"); + QHttpEngine::FilesystemHandler handler(":/static"); handler.addRedirect(QRegExp("^$"), "/index.html"); ApiHandler renameMe; - QObjectHandler apiHandler; + QHttpEngine::QObjectHandler apiHandler; apiHandler.registerMethod("messages", &renameMe, &ApiHandler::messages); apiHandler.registerMethod("messages/new", &renameMe, &ApiHandler::messagesNew); handler.addSubHandler(QRegExp("api/"), &apiHandler); - Server server(&handler); + QHttpEngine::Server server(&handler); // Attempt to listen on the specified port if (!server.listen(address, port)) { diff --git a/examples/fileserver/main.cpp b/examples/fileserver/main.cpp index e854846..8e656b8 100644 --- a/examples/fileserver/main.cpp +++ b/examples/fileserver/main.cpp @@ -68,8 +68,8 @@ int main(int argc, char * argv[]) QString dir = parser.value(dirOption); // Create the filesystem handler and server - FilesystemHandler handler(dir); - Server server(&handler); + QHttpEngine::FilesystemHandler handler(dir); + QHttpEngine::Server server(&handler); // Attempt to listen on the specified port if (!server.listen(address, port)) { diff --git a/src/include/qhttpengine/basicauthmiddleware.h b/src/include/qhttpengine/basicauthmiddleware.h index c9b2a36..0c112a9 100644 --- a/src/include/qhttpengine/basicauthmiddleware.h +++ b/src/include/qhttpengine/basicauthmiddleware.h @@ -27,6 +27,9 @@ #include "qhttpengine_global.h" +namespace QHttpEngine +{ + class QHTTPENGINE_EXPORT BasicAuthMiddlewarePrivate; /** @@ -79,4 +82,6 @@ private: BasicAuthMiddlewarePrivate *const d; }; +} + #endif // QHTTPENGINE_BASICAUTHMIDDLEWARE_H diff --git a/src/include/qhttpengine/filesystemhandler.h b/src/include/qhttpengine/filesystemhandler.h index 5ff26ad..7216887 100644 --- a/src/include/qhttpengine/filesystemhandler.h +++ b/src/include/qhttpengine/filesystemhandler.h @@ -27,6 +27,9 @@ #include "qhttpengine_global.h" +namespace QHttpEngine +{ + class QHTTPENGINE_EXPORT FilesystemHandlerPrivate; /** @@ -82,4 +85,6 @@ private: friend class FilesystemHandlerPrivate; }; +} + #endif // QHTTPENGINE_FILESYSTEMHANDLER_H diff --git a/src/include/qhttpengine/handler.h b/src/include/qhttpengine/handler.h index 6137ccd..1c7490c 100644 --- a/src/include/qhttpengine/handler.h +++ b/src/include/qhttpengine/handler.h @@ -28,6 +28,10 @@ #include "qhttpengine_global.h" class QRegExp; + +namespace QHttpEngine +{ + class Middleware; class Socket; @@ -128,4 +132,6 @@ private: friend class HandlerPrivate; }; +} + #endif // QHTTPENGINE_HANDLER_H diff --git a/src/include/qhttpengine/ibytearray.h b/src/include/qhttpengine/ibytearray.h index e8a55c9..9e52e71 100644 --- a/src/include/qhttpengine/ibytearray.h +++ b/src/include/qhttpengine/ibytearray.h @@ -29,6 +29,9 @@ #include "qhttpengine_global.h" +namespace QHttpEngine +{ + /** * @brief Case-insensitive subclass of QByteArray * @@ -94,4 +97,6 @@ inline bool operator>=(const IByteArray &a1, const QByteArray &a2) { return a1.t inline bool operator>=(const QByteArray &a1, const IByteArray &a2) { return a1.toLower() >= a2.toLower(); } inline bool operator>=(const IByteArray &a1, const IByteArray &a2) { return a1.toLower() >= a2.toLower(); } +} + #endif // QHTTPENGINE_IBYTEARRAY_H diff --git a/src/include/qhttpengine/localauthmiddleware.h b/src/include/qhttpengine/localauthmiddleware.h index 625e769..a9950dd 100644 --- a/src/include/qhttpengine/localauthmiddleware.h +++ b/src/include/qhttpengine/localauthmiddleware.h @@ -29,6 +29,9 @@ #include "qhttpengine_global.h" +namespace QHttpEngine +{ + class QHTTPENGINE_EXPORT LocalAuthMiddlewarePrivate; /** @@ -98,4 +101,6 @@ private: LocalAuthMiddlewarePrivate *const d; }; +} + #endif // QHTTPENGINE_LOCALAUTHMIDDLEWARE_H diff --git a/src/include/qhttpengine/localfile.h b/src/include/qhttpengine/localfile.h index 3d7150c..bfbf717 100644 --- a/src/include/qhttpengine/localfile.h +++ b/src/include/qhttpengine/localfile.h @@ -27,6 +27,9 @@ #include "qhttpengine_global.h" +namespace QHttpEngine +{ + class QHTTPENGINE_EXPORT LocalFilePrivate; /** @@ -75,4 +78,6 @@ private: friend class LocalFilePrivate; }; +} + #endif // QHTTPENGINE_LOCALFILE_H diff --git a/src/include/qhttpengine/middleware.h b/src/include/qhttpengine/middleware.h index 9240106..d2452d6 100644 --- a/src/include/qhttpengine/middleware.h +++ b/src/include/qhttpengine/middleware.h @@ -27,6 +27,9 @@ #include "qhttpengine_global.h" +namespace QHttpEngine +{ + class Socket; /** @@ -56,4 +59,6 @@ public: virtual bool process(Socket *socket) = 0; }; +} + #endif // QHTTPENGINE_MIDDLEWARE_H diff --git a/src/include/qhttpengine/parser.h b/src/include/qhttpengine/parser.h index cb0d183..5961eee 100644 --- a/src/include/qhttpengine/parser.h +++ b/src/include/qhttpengine/parser.h @@ -29,6 +29,9 @@ #include "qhttpengine_global.h" +namespace QHttpEngine +{ + /** * @brief Utility methods for parsing HTTP requests and responses * @@ -86,4 +89,6 @@ public: static bool parseResponseHeaders(const QByteArray &data, int &statusCode, QByteArray &statusReason, Socket::HeaderMap &headers); }; +} + #endif // QHTTPENGINE_PARSER_H diff --git a/src/include/qhttpengine/proxyhandler.h b/src/include/qhttpengine/proxyhandler.h index ca58be9..2c2ea57 100644 --- a/src/include/qhttpengine/proxyhandler.h +++ b/src/include/qhttpengine/proxyhandler.h @@ -29,6 +29,9 @@ #include "qhttpengine_global.h" +namespace QHttpEngine +{ + class QHTTPENGINE_EXPORT ProxyHandlerPrivate; /** @@ -57,4 +60,6 @@ private: ProxyHandlerPrivate *const d; }; +} + #endif // QHTTPENGINE_PROXYHANDLER_H diff --git a/src/include/qhttpengine/qiodevicecopier.h b/src/include/qhttpengine/qiodevicecopier.h index 47ca389..103e7d6 100644 --- a/src/include/qhttpengine/qiodevicecopier.h +++ b/src/include/qhttpengine/qiodevicecopier.h @@ -28,6 +28,10 @@ #include "qhttpengine_global.h" class QIODevice; + +namespace QHttpEngine +{ + class QHTTPENGINE_EXPORT QIODeviceCopierPrivate; /** @@ -126,4 +130,6 @@ private: friend class QIODeviceCopierPrivate; }; +} + #endif // QHTTPENGINE_QIODEVICECOPIER_H diff --git a/src/include/qhttpengine/qobjecthandler.h b/src/include/qhttpengine/qobjecthandler.h index 13e4526..a023de1 100644 --- a/src/include/qhttpengine/qobjecthandler.h +++ b/src/include/qhttpengine/qobjecthandler.h @@ -27,7 +27,11 @@ #include "qhttpengine_global.h" +namespace QHttpEngine +{ + class Socket; + class QHTTPENGINE_EXPORT QObjectHandlerPrivate; /** @@ -185,4 +189,6 @@ private: friend class QObjectHandlerPrivate; }; +} + #endif // QHTTPENGINE_QOBJECTHANDLER_H diff --git a/src/include/qhttpengine/range.h b/src/include/qhttpengine/range.h index 785ff64..e5d69c4 100644 --- a/src/include/qhttpengine/range.h +++ b/src/include/qhttpengine/range.h @@ -27,6 +27,9 @@ #include "qhttpengine_global.h" +namespace QHttpEngine +{ + class QHTTPENGINE_EXPORT RangePrivate; /** @@ -266,4 +269,6 @@ private: RangePrivate *const d; }; +} + #endif // QHTTPENGINE_RANGE_H diff --git a/src/include/qhttpengine/server.h b/src/include/qhttpengine/server.h index e711f81..7eacb7d 100644 --- a/src/include/qhttpengine/server.h +++ b/src/include/qhttpengine/server.h @@ -33,7 +33,11 @@ class QSslConfiguration; #endif +namespace QHttpEngine +{ + class Handler; + class QHTTPENGINE_EXPORT ServerPrivate; /** @@ -104,4 +108,6 @@ private: friend class ServerPrivate; }; +} + #endif // QHTTPENGINE_SERVER_H diff --git a/src/include/qhttpengine/socket.h b/src/include/qhttpengine/socket.h index 8483273..7afdd89 100644 --- a/src/include/qhttpengine/socket.h +++ b/src/include/qhttpengine/socket.h @@ -33,6 +33,10 @@ class QJsonDocument; class QTcpSocket; + +namespace QHttpEngine +{ + class QHTTPENGINE_EXPORT SocketPrivate; /** @@ -358,4 +362,6 @@ private: friend class SocketPrivate; }; +} + #endif // QHTTPENGINE_SOCKET_H diff --git a/src/src/basicauthmiddleware.cpp b/src/src/basicauthmiddleware.cpp index f835226..3ad43fc 100644 --- a/src/src/basicauthmiddleware.cpp +++ b/src/src/basicauthmiddleware.cpp @@ -27,6 +27,8 @@ #include "basicauthmiddleware_p.h" +using namespace QHttpEngine; + BasicAuthMiddlewarePrivate::BasicAuthMiddlewarePrivate(QObject *parent, const QString &realm) : QObject(parent), realm(realm) diff --git a/src/src/basicauthmiddleware_p.h b/src/src/basicauthmiddleware_p.h index 1e1e9b3..e02ec38 100644 --- a/src/src/basicauthmiddleware_p.h +++ b/src/src/basicauthmiddleware_p.h @@ -26,6 +26,9 @@ #include #include +namespace QHttpEngine +{ + class BasicAuthMiddlewarePrivate : public QObject { Q_OBJECT @@ -38,4 +41,6 @@ public: QMap map; }; +} + #endif // QHTTPENGINE_BASICAUTHMIDDLEWARE_P_H diff --git a/src/src/filesystemhandler.cpp b/src/src/filesystemhandler.cpp index e38c919..42ea268 100644 --- a/src/src/filesystemhandler.cpp +++ b/src/src/filesystemhandler.cpp @@ -32,6 +32,8 @@ #include "filesystemhandler_p.h" +using namespace QHttpEngine; + // Template for listing directory contents const QString ListTemplate = "" diff --git a/src/src/filesystemhandler_p.h b/src/src/filesystemhandler_p.h index 46bc00a..306051a 100644 --- a/src/src/filesystemhandler_p.h +++ b/src/src/filesystemhandler_p.h @@ -27,6 +27,9 @@ #include #include +namespace QHttpEngine +{ + class FilesystemHandler; class Socket; @@ -48,4 +51,6 @@ public: QMimeDatabase database; }; +} + #endif // QHTTPENGINE_FILESYSTEMHANDLER_P_H diff --git a/src/src/handler.cpp b/src/src/handler.cpp index ceaa043..dbcd9d0 100644 --- a/src/src/handler.cpp +++ b/src/src/handler.cpp @@ -26,6 +26,8 @@ #include "handler_p.h" +using namespace QHttpEngine; + HandlerPrivate::HandlerPrivate(Handler *handler) : QObject(handler), q(handler) diff --git a/src/src/handler_p.h b/src/src/handler_p.h index 3bd5793..b1d2927 100644 --- a/src/src/handler_p.h +++ b/src/src/handler_p.h @@ -30,6 +30,9 @@ #include +namespace QHttpEngine +{ + typedef QPair Redirect; typedef QPair SubHandler; @@ -50,4 +53,6 @@ private: Handler *const q; }; +} + #endif // QHTTPENGINE_HANDLER_P_H diff --git a/src/src/localauthmiddleware.cpp b/src/src/localauthmiddleware.cpp index a3134f8..9ed4aed 100644 --- a/src/src/localauthmiddleware.cpp +++ b/src/src/localauthmiddleware.cpp @@ -29,6 +29,8 @@ #include "localauthmiddleware_p.h" +using namespace QHttpEngine; + LocalAuthMiddlewarePrivate::LocalAuthMiddlewarePrivate(QObject *parent) : QObject(parent), tokenHeader("X-Auth-Token"), diff --git a/src/src/localauthmiddleware_p.h b/src/src/localauthmiddleware_p.h index 1e33ebe..06d63bc 100644 --- a/src/src/localauthmiddleware_p.h +++ b/src/src/localauthmiddleware_p.h @@ -28,6 +28,9 @@ #include +namespace QHttpEngine +{ + class LocalAuthMiddlewarePrivate : public QObject { Q_OBJECT @@ -44,4 +47,6 @@ public: QString token; }; +} + #endif // QHTTPENGINE_LOCALAUTHMIDDLEWARE_P_H diff --git a/src/src/localfile.cpp b/src/src/localfile.cpp index 3871f56..cf1fa24 100644 --- a/src/src/localfile.cpp +++ b/src/src/localfile.cpp @@ -34,6 +34,8 @@ #include "localfile_p.h" +using namespace QHttpEngine; + LocalFilePrivate::LocalFilePrivate(LocalFile *localFile) : QObject(localFile), q(localFile) diff --git a/src/src/localfile_p.h b/src/src/localfile_p.h index 4bd7b49..bea6a0b 100644 --- a/src/src/localfile_p.h +++ b/src/src/localfile_p.h @@ -25,6 +25,9 @@ #include +namespace QHttpEngine +{ + class LocalFile; class LocalFilePrivate : public QObject @@ -40,7 +43,9 @@ public: private: - LocalFile*const q; + LocalFile *const q; }; +} + #endif // QHTTPENGINE_LOCALFILE_P_H diff --git a/src/src/parser.cpp b/src/src/parser.cpp index edf4200..2559e4a 100644 --- a/src/src/parser.cpp +++ b/src/src/parser.cpp @@ -26,6 +26,8 @@ #include +using namespace QHttpEngine; + void Parser::split(const QByteArray &data, const QByteArray &delim, int maxSplit, QByteArrayList &parts) { int index = 0; diff --git a/src/src/proxyhandler.cpp b/src/src/proxyhandler.cpp index e992565..b46e2ee 100644 --- a/src/src/proxyhandler.cpp +++ b/src/src/proxyhandler.cpp @@ -25,6 +25,8 @@ #include "proxyhandler_p.h" #include "proxysocket.h" +using namespace QHttpEngine; + ProxyHandlerPrivate::ProxyHandlerPrivate(QObject *parent, const QHostAddress &address, quint16 port) : QObject(parent), address(address), diff --git a/src/src/proxyhandler_p.h b/src/src/proxyhandler_p.h index e1837e1..df56d3f 100644 --- a/src/src/proxyhandler_p.h +++ b/src/src/proxyhandler_p.h @@ -28,6 +28,9 @@ #include +namespace QHttpEngine +{ + class ProxyHandlerPrivate : public QObject { Q_OBJECT @@ -40,4 +43,6 @@ public: quint16 port; }; +} + #endif // QHTTPENGINE_PROXYHANDLER_P_H diff --git a/src/src/proxysocket.cpp b/src/src/proxysocket.cpp index 52acd83..4f45a8a 100644 --- a/src/src/proxysocket.cpp +++ b/src/src/proxysocket.cpp @@ -24,6 +24,8 @@ #include "proxysocket.h" +using namespace QHttpEngine; + QProxySocket::QProxySocket(Socket *socket, const QString &path, const QHostAddress &address, quint16 port) : QObject(socket), mDownstreamSocket(socket), diff --git a/src/src/proxysocket.h b/src/src/proxysocket.h index ab5321e..f2bdc9c 100644 --- a/src/src/proxysocket.h +++ b/src/src/proxysocket.h @@ -29,6 +29,8 @@ #include +using namespace QHttpEngine; + /** * @brief HTTP socket for connecting to a proxy */ diff --git a/src/src/qiodevicecopier.cpp b/src/src/qiodevicecopier.cpp index acf3f70..6733d1e 100644 --- a/src/src/qiodevicecopier.cpp +++ b/src/src/qiodevicecopier.cpp @@ -27,6 +27,8 @@ #include "qiodevicecopier_p.h" +using namespace QHttpEngine; + // Default value for the bufferSize property const qint64 DefaultBufferSize = 65536; diff --git a/src/src/qiodevicecopier_p.h b/src/src/qiodevicecopier_p.h index be55258..1212e81 100644 --- a/src/src/qiodevicecopier_p.h +++ b/src/src/qiodevicecopier_p.h @@ -26,6 +26,10 @@ #include class QIODevice; + +namespace QHttpEngine +{ + class QIODeviceCopier; class QIODeviceCopierPrivate : public QObject @@ -56,4 +60,6 @@ private: QIODeviceCopier *const q; }; +} + #endif // QHTTPENGINE_QIODEVICECOPIER_P_H diff --git a/src/src/qobjecthandler.cpp b/src/src/qobjecthandler.cpp index 4574d5b..49c39ff 100644 --- a/src/src/qobjecthandler.cpp +++ b/src/src/qobjecthandler.cpp @@ -28,6 +28,8 @@ #include "qobjecthandler_p.h" +using namespace QHttpEngine; + QObjectHandlerPrivate::QObjectHandlerPrivate(QObjectHandler *handler) : QObject(handler), q(handler) diff --git a/src/src/qobjecthandler_p.h b/src/src/qobjecthandler_p.h index 2475493..190f9ee 100644 --- a/src/src/qobjecthandler_p.h +++ b/src/src/qobjecthandler_p.h @@ -26,6 +26,9 @@ #include #include +namespace QHttpEngine +{ + class Socket; class QObjectHandler; @@ -69,4 +72,6 @@ private: QObjectHandler *const q; }; +} + #endif // QHTTPENGINE_QOBJECTHANDLER_P_H diff --git a/src/src/range.cpp b/src/src/range.cpp index 420bb5b..aa9e29e 100644 --- a/src/src/range.cpp +++ b/src/src/range.cpp @@ -26,6 +26,8 @@ #include "range_p.h" +using namespace QHttpEngine; + RangePrivate::RangePrivate(Range *range) : q(range) { diff --git a/src/src/range_p.h b/src/src/range_p.h index 05c23a0..9df8781 100644 --- a/src/src/range_p.h +++ b/src/src/range_p.h @@ -25,6 +25,9 @@ #include +namespace QHttpEngine +{ + class RangePrivate { public: @@ -40,4 +43,6 @@ private: Range *const q; }; +} + #endif // QHTTPENGINE_RANGE_P_H diff --git a/src/src/server.cpp b/src/src/server.cpp index fadb05e..fcdd00c 100644 --- a/src/src/server.cpp +++ b/src/src/server.cpp @@ -29,6 +29,8 @@ #include "server_p.h" +using namespace QHttpEngine; + ServerPrivate::ServerPrivate(Server *httpServer) : QObject(httpServer), q(httpServer), diff --git a/src/src/server_p.h b/src/src/server_p.h index 062b61d..7537cad 100644 --- a/src/src/server_p.h +++ b/src/src/server_p.h @@ -32,6 +32,9 @@ #include +namespace QHttpEngine +{ + class Handler; class ServerPrivate : public QObject @@ -55,4 +58,6 @@ private: Server *const q; }; +} + #endif // QHTTPENGINE_SERVER_P_H diff --git a/src/src/socket.cpp b/src/src/socket.cpp index d54069d..290c8ee 100644 --- a/src/src/socket.cpp +++ b/src/src/socket.cpp @@ -30,6 +30,8 @@ #include "socket_p.h" +using namespace QHttpEngine; + // Predefined error response requires a simple HTML template to be returned to // the client describing the error condition const QString ErrorTemplate = diff --git a/src/src/socket_p.h b/src/src/socket_p.h index 85ec56c..accdef5 100644 --- a/src/src/socket_p.h +++ b/src/src/socket_p.h @@ -27,6 +27,9 @@ class QTcpSocket; +namespace QHttpEngine +{ + class SocketPrivate : public QObject { Q_OBJECT @@ -79,4 +82,6 @@ private: Socket*const q; }; +} + #endif // QHTTPENGINE_SOCKET_P_H diff --git a/tests/TestQFilesystemHandler.cpp b/tests/TestQFilesystemHandler.cpp index 71917c4..d519c56 100644 --- a/tests/TestQFilesystemHandler.cpp +++ b/tests/TestQFilesystemHandler.cpp @@ -72,22 +72,22 @@ void TestQFilesystemHandler::testRequests_data() QTest::newRow("nonexistent resource") << "nonexistent" - << static_cast(Socket::NotFound) + << static_cast(QHttpEngine::Socket::NotFound) << QByteArray(); QTest::newRow("outside document root") << "../outside" - << static_cast(Socket::NotFound) + << static_cast(QHttpEngine::Socket::NotFound) << QByteArray(); QTest::newRow("inside document root") << "inside" - << static_cast(Socket::OK) + << static_cast(QHttpEngine::Socket::OK) << Data; QTest::newRow("directory listing") << "" - << static_cast(Socket::OK) + << static_cast(QHttpEngine::Socket::OK) << QByteArray(); } @@ -97,13 +97,13 @@ void TestQFilesystemHandler::testRequests() QFETCH(int, statusCode); QFETCH(QByteArray, data); - FilesystemHandler handler(QDir(dir.path()).absoluteFilePath("root")); + QHttpEngine::FilesystemHandler handler(QDir(dir.path()).absoluteFilePath("root")); QSocketPair pair; QTRY_VERIFY(pair.isConnected()); QSimpleHttpClient client(pair.client()); - Socket socket(pair.server(), &pair); + QHttpEngine::Socket socket(pair.server(), &pair); handler.route(&socket, path); @@ -124,37 +124,37 @@ void TestQFilesystemHandler::testRangeRequests_data() QTest::newRow("full file") << "inside" << "" - << static_cast(Socket::OK) + << static_cast(QHttpEngine::Socket::OK) << "" << Data; QTest::newRow("range 0-2") << "inside" << "0-2" - << static_cast(Socket::PartialContent) + << static_cast(QHttpEngine::Socket::PartialContent) << "bytes 0-2/4" << Data.mid(0, 3); QTest::newRow("range 1-2") << "inside" << "1-2" - << static_cast(Socket::PartialContent) + << static_cast(QHttpEngine::Socket::PartialContent) << "bytes 1-2/4" << Data.mid(1, 2); QTest::newRow("skip first 1 byte") << "inside" << "1-" - << static_cast(Socket::PartialContent) + << static_cast(QHttpEngine::Socket::PartialContent) << "bytes 1-3/4" << Data.mid(1); QTest::newRow("last 2 bytes") << "inside" << "-2" - << static_cast(Socket::PartialContent) + << static_cast(QHttpEngine::Socket::PartialContent) << "bytes 2-3/4" << Data.mid(2); QTest::newRow("bad range request") << "inside" << "abcd" - << static_cast(Socket::OK) + << static_cast(QHttpEngine::Socket::OK) << "" << Data; } @@ -167,16 +167,16 @@ void TestQFilesystemHandler::testRangeRequests() QFETCH(QString, contentRange); QFETCH(QByteArray, data); - FilesystemHandler handler(QDir(dir.path()).absoluteFilePath("root")); + QHttpEngine::FilesystemHandler handler(QDir(dir.path()).absoluteFilePath("root")); QSocketPair pair; QTRY_VERIFY(pair.isConnected()); QSimpleHttpClient client(pair.client()); - Socket socket(pair.server(), &pair); + QHttpEngine::Socket socket(pair.server(), &pair); if (!range.isEmpty()) { - Socket::HeaderMap inHeaders; + QHttpEngine::Socket::HeaderMap inHeaders; inHeaders.insert("Range", QByteArray("bytes=") + range.toUtf8()); client.sendHeaders("GET", path.toUtf8(), inHeaders); QTRY_VERIFY(socket.isHeadersParsed()); diff --git a/tests/TestQHttpBasicAuth.cpp b/tests/TestQHttpBasicAuth.cpp index a8b0ad9..01dae4b 100644 --- a/tests/TestQHttpBasicAuth.cpp +++ b/tests/TestQHttpBasicAuth.cpp @@ -49,7 +49,7 @@ private Q_SLOTS: private: - BasicAuthMiddleware auth; + QHttpEngine::BasicAuthMiddleware auth; }; void TestQHttpBasicAuth::initTestCase() @@ -68,19 +68,19 @@ void TestQHttpBasicAuth::testProcess_data() << false << QString() << QString() - << static_cast(Socket::Unauthorized); + << static_cast(QHttpEngine::Socket::Unauthorized); QTest::newRow("invalid credentials") << true << Username << QString() - << static_cast(Socket::Unauthorized); + << static_cast(QHttpEngine::Socket::Unauthorized); QTest::newRow("valid credentials") << true << Username << Password - << static_cast(Socket::NotFound); + << static_cast(QHttpEngine::Socket::NotFound); } void TestQHttpBasicAuth::testProcess() @@ -94,9 +94,9 @@ void TestQHttpBasicAuth::testProcess() QTRY_VERIFY(pair.isConnected()); QSimpleHttpClient client(pair.client()); - Socket socket(pair.server(), &pair); + QHttpEngine::Socket socket(pair.server(), &pair); - Socket::HeaderMap headers; + QHttpEngine::Socket::HeaderMap headers; if (header) { headers.insert( @@ -108,7 +108,7 @@ void TestQHttpBasicAuth::testProcess() client.sendHeaders("GET", "/", headers); QTRY_VERIFY(socket.isHeadersParsed()); - Handler handler; + QHttpEngine::Handler handler; handler.addMiddleware(&auth); handler.route(&socket, "/"); diff --git a/tests/TestQHttpHandler.cpp b/tests/TestQHttpHandler.cpp index e7ce627..5e243f4 100644 --- a/tests/TestQHttpHandler.cpp +++ b/tests/TestQHttpHandler.cpp @@ -29,13 +29,13 @@ #include "common/qsimplehttpclient.h" #include "common/qsocketpair.h" -class DummyHandler : public Handler +class DummyHandler : public QHttpEngine::Handler { Q_OBJECT public: - virtual void process(Socket *socket, const QString &path) { + virtual void process(QHttpEngine::Socket *socket, const QString &path) { mPathRemainder = path; socket->writeHeaders(); socket->close(); @@ -69,20 +69,20 @@ void TestQHttpHandler::testRedirect_data() << QRegExp("\\w+") << QString("/two") << QByteArray("one") - << static_cast(Socket::Found) + << static_cast(QHttpEngine::Socket::Found) << QByteArray("/two"); QTest::newRow("no match") << QRegExp("\\d+") << QString("") << QByteArray("test") - << static_cast(Socket::NotFound); + << static_cast(QHttpEngine::Socket::NotFound); QTest::newRow("captured texts") << QRegExp("(\\d+)") << QString("/path/%1") << QByteArray("123") - << static_cast(Socket::Found) + << static_cast(QHttpEngine::Socket::Found) << QByteArray("/path/123"); } @@ -97,18 +97,18 @@ void TestQHttpHandler::testRedirect() QTRY_VERIFY(pair.isConnected()); QSimpleHttpClient client(pair.client()); - Socket socket(pair.server(), &pair); + QHttpEngine::Socket socket(pair.server(), &pair); client.sendHeaders("GET", path); QTRY_VERIFY(socket.isHeadersParsed()); - Handler handler; + QHttpEngine::Handler handler; handler.addRedirect(pattern, destination); handler.route(&socket, socket.path()); QTRY_COMPARE(client.statusCode(), statusCode); - if (statusCode == Socket::Found) { + if (statusCode == QHttpEngine::Socket::Found) { QFETCH(QByteArray, location); QCOMPARE(client.headers().value("Location"), location); } @@ -125,19 +125,19 @@ void TestQHttpHandler::testSubHandler_data() << QRegExp("\\w+") << QByteArray("test") << QString("") - << static_cast(Socket::OK); + << static_cast(QHttpEngine::Socket::OK); QTest::newRow("no match") << QRegExp("\\d+") << QByteArray("test") << QString("") - << static_cast(Socket::NotFound); + << static_cast(QHttpEngine::Socket::NotFound); QTest::newRow("path") << QRegExp("one/") << QByteArray("one/two") << QString("two") - << static_cast(Socket::OK); + << static_cast(QHttpEngine::Socket::OK); } void TestQHttpHandler::testSubHandler() @@ -151,13 +151,13 @@ void TestQHttpHandler::testSubHandler() QTRY_VERIFY(pair.isConnected()); QSimpleHttpClient client(pair.client()); - Socket socket(pair.server(), &pair); + QHttpEngine::Socket socket(pair.server(), &pair); client.sendHeaders("GET", path); QTRY_VERIFY(socket.isHeadersParsed()); DummyHandler subHandler; - Handler handler; + QHttpEngine::Handler handler; handler.addSubHandler(pattern, &subHandler); handler.route(&socket, socket.path()); diff --git a/tests/TestQHttpMiddleware.cpp b/tests/TestQHttpMiddleware.cpp index 936a253..697f4f6 100644 --- a/tests/TestQHttpMiddleware.cpp +++ b/tests/TestQHttpMiddleware.cpp @@ -29,15 +29,15 @@ #include "common/qsimplehttpclient.h" #include "common/qsocketpair.h" -class DummyMiddleware : public Middleware +class DummyMiddleware : public QHttpEngine::Middleware { Q_OBJECT public: - virtual bool process(Socket *socket) + virtual bool process(QHttpEngine::Socket *socket) { - socket->writeError(Socket::Forbidden); + socket->writeError(QHttpEngine::Socket::Forbidden); return false; } }; @@ -57,17 +57,17 @@ void TestQHttpMiddleware::testProcess() QTRY_VERIFY(pair.isConnected()); QSimpleHttpClient client(pair.client()); - Socket socket(pair.server(), &pair); + QHttpEngine::Socket socket(pair.server(), &pair); client.sendHeaders("GET", "/"); QTRY_VERIFY(socket.isHeadersParsed()); DummyMiddleware middleware; - Handler handler; + QHttpEngine::Handler handler; handler.addMiddleware(&middleware); handler.route(&socket, "/"); - QTRY_COMPARE(client.statusCode(), static_cast(Socket::Forbidden)); + QTRY_COMPARE(client.statusCode(), static_cast(QHttpEngine::Socket::Forbidden)); } QTEST_MAIN(TestQHttpMiddleware) diff --git a/tests/TestQHttpParser.cpp b/tests/TestQHttpParser.cpp index 07ff376..3cd5501 100644 --- a/tests/TestQHttpParser.cpp +++ b/tests/TestQHttpParser.cpp @@ -30,15 +30,15 @@ typedef QList QByteArrayList; -Q_DECLARE_METATYPE(Socket::Method) -Q_DECLARE_METATYPE(Socket::QueryStringMap) -Q_DECLARE_METATYPE(Socket::HeaderMap) +Q_DECLARE_METATYPE(QHttpEngine::Socket::Method) +Q_DECLARE_METATYPE(QHttpEngine::Socket::QueryStringMap) +Q_DECLARE_METATYPE(QHttpEngine::Socket::HeaderMap) -const IByteArray Key1 = "a"; +const QHttpEngine::IByteArray Key1 = "a"; const QByteArray Value1 = "b"; const QByteArray Line1 = Key1 + ": " + Value1; -const IByteArray Key2 = "c"; +const QHttpEngine::IByteArray Key2 = "c"; const QByteArray Value2 = "d"; const QByteArray Line2 = Key2 + ": " + Value2; @@ -72,7 +72,7 @@ private Q_SLOTS: private: - Socket::HeaderMap headers; + QHttpEngine::Socket::HeaderMap headers; }; TestQHttpParser::TestQHttpParser() @@ -127,7 +127,7 @@ void TestQHttpParser::testSplit() QFETCH(QByteArrayList, parts); QByteArrayList outParts; - Parser::split(data, delim, maxSplit, outParts); + QHttpEngine::Parser::split(data, delim, maxSplit, outParts); QCOMPARE(outParts, parts); } @@ -136,29 +136,29 @@ void TestQHttpParser::testParsePath_data() { QTest::addColumn("rawPath"); QTest::addColumn("path"); - QTest::addColumn("map"); + QTest::addColumn("map"); QTest::newRow("no query string") << QByteArray("/path") << QString("/path") - << Socket::QueryStringMap(); + << QHttpEngine::Socket::QueryStringMap(); QTest::newRow("single parameter") << QByteArray("/path?a=b") << QString("/path") - << Socket::QueryStringMap{{"a", "b"}}; + << QHttpEngine::Socket::QueryStringMap{{"a", "b"}}; } void TestQHttpParser::testParsePath() { QFETCH(QByteArray, rawPath); QFETCH(QString, path); - QFETCH(Socket::QueryStringMap, map); + QFETCH(QHttpEngine::Socket::QueryStringMap, map); QString outPath; - Socket::QueryStringMap outMap; + QHttpEngine::Socket::QueryStringMap outMap; - QVERIFY(Parser::parsePath(rawPath, outPath, outMap)); + QVERIFY(QHttpEngine::Parser::parsePath(rawPath, outPath, outMap)); QCOMPARE(path, outPath); QCOMPARE(map, outMap); @@ -168,7 +168,7 @@ void TestQHttpParser::testParseHeaderList_data() { QTest::addColumn("success"); QTest::addColumn("lines"); - QTest::addColumn("headers"); + QTest::addColumn("headers"); QTest::newRow("empty line") << false @@ -185,11 +185,11 @@ void TestQHttpParser::testParseHeaderList() QFETCH(bool, success); QFETCH(QByteArrayList, lines); - Socket::HeaderMap outHeaders; - QCOMPARE(Parser::parseHeaderList(lines, outHeaders), success); + QHttpEngine::Socket::HeaderMap outHeaders; + QCOMPARE(QHttpEngine::Parser::parseHeaderList(lines, outHeaders), success); if (success) { - QFETCH(Socket::HeaderMap, headers); + QFETCH(QHttpEngine::Socket::HeaderMap, headers); QCOMPARE(outHeaders, headers); } } @@ -216,9 +216,9 @@ void TestQHttpParser::testParseHeaders() QFETCH(QByteArray, data); QByteArrayList outParts; - Socket::HeaderMap outHeaders; + QHttpEngine::Socket::HeaderMap outHeaders; - QCOMPARE(Parser::parseHeaders(data, outParts, outHeaders), success); + QCOMPARE(QHttpEngine::Parser::parseHeaders(data, outParts, outHeaders), success); if (success) { QFETCH(QByteArrayList, parts); @@ -230,7 +230,7 @@ void TestQHttpParser::testParseRequestHeaders_data() { QTest::addColumn("success"); QTest::addColumn("data"); - QTest::addColumn("method"); + QTest::addColumn("method"); QTest::addColumn("path"); QTest::newRow("bad HTTP version") @@ -240,7 +240,7 @@ void TestQHttpParser::testParseRequestHeaders_data() QTest::newRow("GET request") << true << QByteArray("GET / HTTP/1.0") - << Socket::GET + << QHttpEngine::Socket::GET << QByteArray("/"); } @@ -249,14 +249,14 @@ void TestQHttpParser::testParseRequestHeaders() QFETCH(bool, success); QFETCH(QByteArray, data); - Socket::Method outMethod; + QHttpEngine::Socket::Method outMethod; QByteArray outPath; - Socket::HeaderMap outHeaders; + QHttpEngine::Socket::HeaderMap outHeaders; - QCOMPARE(Parser::parseRequestHeaders(data, outMethod, outPath, outHeaders), success); + QCOMPARE(QHttpEngine::Parser::parseRequestHeaders(data, outMethod, outPath, outHeaders), success); if (success) { - QFETCH(Socket::Method, method); + QFETCH(QHttpEngine::Socket::Method, method); QFETCH(QByteArray, path); QCOMPARE(method, outMethod); @@ -289,9 +289,9 @@ void TestQHttpParser::testParseResponseHeaders() int outStatusCode; QByteArray outStatusReason; - Socket::HeaderMap outHeaders; + QHttpEngine::Socket::HeaderMap outHeaders; - QCOMPARE(Parser::parseResponseHeaders(data, outStatusCode, outStatusReason, outHeaders), success); + QCOMPARE(QHttpEngine::Parser::parseResponseHeaders(data, outStatusCode, outStatusReason, outHeaders), success); if (success) { QFETCH(int, statusCode); diff --git a/tests/TestQHttpRange.cpp b/tests/TestQHttpRange.cpp index 347f780..d95c4e6 100644 --- a/tests/TestQHttpRange.cpp +++ b/tests/TestQHttpRange.cpp @@ -58,15 +58,15 @@ TestQHttpRange::TestQHttpRange() void TestQHttpRange::testDefaultConstructor() { - Range range; + QHttpEngine::Range range; QCOMPARE(range.isValid(), false); } void TestQHttpRange::testAssignmentOperator() { - Range range; - Range otherRange(100, 200, -1); + QHttpEngine::Range range; + QHttpEngine::Range otherRange(100, 200, -1); range = otherRange; @@ -110,7 +110,7 @@ void TestQHttpRange::testFromToLength() QFETCH(int, to); QFETCH(int, length); - Range range(inFrom, inTo, inDataSize); + QHttpEngine::Range range(inFrom, inTo, inDataSize); QCOMPARE(range.from(), from); QCOMPARE(range.to(), to); @@ -162,7 +162,7 @@ void TestQHttpRange::testIsValid() QFETCH(int, dataSize); QFETCH(bool, valid); - Range range(from, to, dataSize); + QHttpEngine::Range range(from, to, dataSize); QCOMPARE(range.isValid(), valid); } @@ -235,7 +235,7 @@ void TestQHttpRange::testParseFromString() QFETCH(int, dataSize); QFETCH(bool, valid); - Range range(data, dataSize); + QHttpEngine::Range range(data, dataSize); QCOMPARE(range.isValid(), valid); @@ -281,7 +281,7 @@ void TestQHttpRange::testContentRange() QFETCH(int, dataSize); QFETCH(QString, contentRange); - Range range(from, to, dataSize); + QHttpEngine::Range range(from, to, dataSize); QCOMPARE(range.contentRange(), contentRange); } diff --git a/tests/TestQHttpServer.cpp b/tests/TestQHttpServer.cpp index 6796598..aff91a0 100644 --- a/tests/TestQHttpServer.cpp +++ b/tests/TestQHttpServer.cpp @@ -37,7 +37,7 @@ #include "common/qsimplehttpclient.h" -class TestHandler : public Handler +class TestHandler : public QHttpEngine::Handler { Q_OBJECT @@ -45,12 +45,12 @@ public: TestHandler() : mSocket(0) {} - virtual void process(Socket *socket, const QString &path) { + virtual void process(QHttpEngine::Socket *socket, const QString &path) { mSocket = socket; mPath = path; } - Socket *mSocket; + QHttpEngine::Socket *mSocket; QString mPath; }; @@ -70,7 +70,7 @@ private Q_SLOTS: void TestQHttpServer::testServer() { TestHandler handler; - Server server(&handler); + QHttpEngine::Server server(&handler); QVERIFY(server.listen(QHostAddress::LocalHost)); @@ -102,7 +102,7 @@ void TestQHttpServer::testSsl() config.setPrivateKey(key); config.setLocalCertificateChain(certs); - Server server; + QHttpEngine::Server server; server.setSslConfiguration(config); QVERIFY(server.listen(QHostAddress::LocalHost)); diff --git a/tests/TestQHttpSocket.cpp b/tests/TestQHttpSocket.cpp index b22f1c5..d09e29e 100644 --- a/tests/TestQHttpSocket.cpp +++ b/tests/TestQHttpSocket.cpp @@ -32,7 +32,7 @@ #include "common/qsimplehttpclient.h" #include "common/qsocketpair.h" -Q_DECLARE_METATYPE(Socket::QueryStringMap) +Q_DECLARE_METATYPE(QHttpEngine::Socket::QueryStringMap) // Utility macro (avoids duplication) that creates a pair of connected // sockets, a QSimpleHttpClient for the client and a QHttpSocket for the @@ -41,7 +41,7 @@ Q_DECLARE_METATYPE(Socket::QueryStringMap) QSocketPair pair; \ QTRY_VERIFY(pair.isConnected()); \ QSimpleHttpClient client(pair.client()); \ - Socket server(pair.server()) + QHttpEngine::Socket server(pair.server()) const QByteArray Method = "POST"; const QByteArray Path = "/test"; @@ -67,7 +67,7 @@ private Q_SLOTS: private: - Socket::HeaderMap headers; + QHttpEngine::Socket::HeaderMap headers; }; TestQHttpSocket::TestQHttpSocket() @@ -82,7 +82,7 @@ void TestQHttpSocket::testProperties() client.sendHeaders(Method, Path, headers); - QTRY_COMPARE(server.method(), Socket::POST); + QTRY_COMPARE(server.method(), QHttpEngine::Socket::POST); QCOMPARE(server.rawPath(), Path); QCOMPARE(server.headers(), headers); @@ -120,7 +120,7 @@ void TestQHttpSocket::testRedirect() server.writeRedirect(Path, true); - QTRY_COMPARE(client.statusCode(), static_cast(Socket::MovedPermanently)); + QTRY_COMPARE(client.statusCode(), static_cast(QHttpEngine::Socket::MovedPermanently)); QCOMPARE(client.headers().value("Location"), Path); QTRY_COMPARE(disconnectedSpy.count(), 1); } @@ -170,7 +170,7 @@ void TestQHttpSocket::testJson() QJsonObject object{{"a", "b"}, {"c", 123}}; QByteArray data = QJsonDocument(object).toJson(); - client.sendHeaders(Method, Path, Socket::HeaderMap{ + client.sendHeaders(Method, Path, QHttpEngine::Socket::HeaderMap{ {"Content-Length", QByteArray::number(data.length())}, {"Content-Type", "application/json"} }); diff --git a/tests/TestQIByteArray.cpp b/tests/TestQIByteArray.cpp index 5a06211..dbe3c12 100644 --- a/tests/TestQIByteArray.cpp +++ b/tests/TestQIByteArray.cpp @@ -31,8 +31,8 @@ const char *Value2 = "TEST"; // Helpful macros to cut down on the amount of duplicated code #define TEST_OPERATOR(tn,t,on,o,v) void test##tn##on() \ { \ - QCOMPARE(IByteArray(Value1) o static_cast(Value2), v); \ - QCOMPARE(static_cast(Value1) o IByteArray(Value1), v); \ + QCOMPARE(QHttpEngine::IByteArray(Value1) o static_cast(Value2), v); \ + QCOMPARE(static_cast(Value1) o QHttpEngine::IByteArray(Value1), v); \ } #define TEST_TYPE(tn,t) \ TEST_OPERATOR(tn, t, Equals, ==, true) \ @@ -50,7 +50,7 @@ private Q_SLOTS: TEST_TYPE(ConstChar, const char *) TEST_TYPE(QByteArray, QByteArray) - TEST_TYPE(IByteArray, IByteArray) + TEST_TYPE(IByteArray, QHttpEngine::IByteArray) TEST_TYPE(QString, QString) void testContains(); @@ -58,7 +58,7 @@ private Q_SLOTS: void TestQIByteArray::testContains() { - IByteArray v(Value1); + QHttpEngine::IByteArray v(Value1); QVERIFY(v.contains('t')); QVERIFY(v.contains(Value2)); diff --git a/tests/TestQIODeviceCopier.cpp b/tests/TestQIODeviceCopier.cpp index 50812bd..505bde0 100644 --- a/tests/TestQIODeviceCopier.cpp +++ b/tests/TestQIODeviceCopier.cpp @@ -55,7 +55,7 @@ void TestQIODeviceCopier::testQBuffer() QByteArray destData; QBuffer dest(&destData); - QIODeviceCopier copier(&src, &dest); + QHttpEngine::QIODeviceCopier copier(&src, &dest); copier.setBufferSize(2); QSignalSpy errorSpy(&copier, SIGNAL(error(QString))); @@ -76,7 +76,7 @@ void TestQIODeviceCopier::testQTcpSocket() QByteArray destData; QBuffer dest(&destData); - QIODeviceCopier copier(pair.server(), &dest); + QHttpEngine::QIODeviceCopier copier(pair.server(), &dest); copier.setBufferSize(2); QSignalSpy errorSpy(&copier, SIGNAL(error(QString))); @@ -100,7 +100,7 @@ void TestQIODeviceCopier::testStop() QByteArray destData; QBuffer dest(&destData); - QIODeviceCopier copier(pair.server(), &dest); + QHttpEngine::QIODeviceCopier copier(pair.server(), &dest); copier.start(); @@ -141,7 +141,7 @@ void TestQIODeviceCopier::testRange() QByteArray destData; QBuffer dest(&destData); - QIODeviceCopier copier(&src, &dest); + QHttpEngine::QIODeviceCopier copier(&src, &dest); copier.setBufferSize(bufferSize); copier.setRange(from, to); diff --git a/tests/TestQLocalAuth.cpp b/tests/TestQLocalAuth.cpp index ba28cf4..9f96d53 100644 --- a/tests/TestQLocalAuth.cpp +++ b/tests/TestQLocalAuth.cpp @@ -51,9 +51,9 @@ void TestQLocalAuth::testAuth() QTRY_VERIFY(pair.isConnected()); QSimpleHttpClient client(pair.client()); - Socket socket(pair.server(), &pair); + QHttpEngine::Socket socket(pair.server(), &pair); - LocalAuthMiddleware localAuth; + QHttpEngine::LocalAuthMiddleware localAuth; localAuth.setData(QVariantMap{ {CustomName, CustomData} }); @@ -67,7 +67,7 @@ void TestQLocalAuth::testAuth() QVERIFY(data.contains("token")); QCOMPARE(data.value(CustomName).toByteArray(), CustomData); - client.sendHeaders("GET", "/", Socket::HeaderMap{ + client.sendHeaders("GET", "/", QHttpEngine::Socket::HeaderMap{ {HeaderName, data.value("token").toByteArray()} }); QTRY_VERIFY(socket.isHeadersParsed()); diff --git a/tests/TestQLocalFile.cpp b/tests/TestQLocalFile.cpp index ae2e2cd..151ec6d 100644 --- a/tests/TestQLocalFile.cpp +++ b/tests/TestQLocalFile.cpp @@ -46,7 +46,7 @@ void TestQLocalFile::initTestCase() void TestQLocalFile::testOpen() { - LocalFile file; + QHttpEngine::LocalFile file; QVERIFY(file.open()); QVERIFY(file.remove()); } diff --git a/tests/TestQObjectHandler.cpp b/tests/TestQObjectHandler.cpp index 854da1e..0912022 100644 --- a/tests/TestQObjectHandler.cpp +++ b/tests/TestQObjectHandler.cpp @@ -37,8 +37,8 @@ public Q_SLOTS: void wrongArgumentCount() {} void wrongArgumentType(int) {} - void valid(Socket *socket) { - socket->writeError(Socket::OK); + void valid(QHttpEngine::Socket *socket) { + socket->writeError(QHttpEngine::Socket::OK); } }; @@ -60,19 +60,19 @@ void TestQObjectHandler::testOldConnection_data() QTest::newRow("invalid slot") << QByteArray(SLOT(invalid())) - << static_cast(Socket::InternalServerError); + << static_cast(QHttpEngine::Socket::InternalServerError); QTest::newRow("wrong argument count") << QByteArray(SLOT(wrongArgumentCount())) - << static_cast(Socket::InternalServerError); + << static_cast(QHttpEngine::Socket::InternalServerError); QTest::newRow("wrong argument type") << QByteArray(SLOT(wrongArgumentType(int))) - << static_cast(Socket::InternalServerError); + << static_cast(QHttpEngine::Socket::InternalServerError); QTest::newRow("valid") << QByteArray(SLOT(valid(Socket*))) - << static_cast(Socket::OK); + << static_cast(QHttpEngine::Socket::OK); } void TestQObjectHandler::testOldConnection() @@ -80,7 +80,7 @@ void TestQObjectHandler::testOldConnection() QFETCH(QByteArray, slot); QFETCH(int, statusCode); - QObjectHandler handler; + QHttpEngine::QObjectHandler handler; DummyAPI api; handler.registerMethod("test", &api, slot.constData()); @@ -89,7 +89,7 @@ void TestQObjectHandler::testOldConnection() QTRY_VERIFY(pair.isConnected()); QSimpleHttpClient client(pair.client()); - Socket socket(pair.server(), &pair); + QHttpEngine::Socket socket(pair.server(), &pair); client.sendHeaders("GET", "test"); QTRY_VERIFY(socket.isHeadersParsed()); @@ -100,18 +100,18 @@ void TestQObjectHandler::testOldConnection() void TestQObjectHandler::testNewConnection() { - QObjectHandler handler; + QHttpEngine::QObjectHandler handler; DummyAPI api; // Connect to object slot handler.registerMethod("0", &api, &DummyAPI::valid); // Connect to functor - handler.registerMethod("1", [](Socket *socket) { - socket->writeError(Socket::OK); + handler.registerMethod("1", [](QHttpEngine::Socket *socket) { + socket->writeError(QHttpEngine::Socket::OK); }); - handler.registerMethod("2", &api, [](Socket *socket) { - socket->writeError(Socket::OK); + handler.registerMethod("2", &api, [](QHttpEngine::Socket *socket) { + socket->writeError(QHttpEngine::Socket::OK); }); for (int i = 0; i < 3; ++i) { @@ -119,13 +119,13 @@ void TestQObjectHandler::testNewConnection() QTRY_VERIFY(pair.isConnected()); QSimpleHttpClient client(pair.client()); - Socket socket(pair.server(), &pair); + QHttpEngine::Socket socket(pair.server(), &pair); client.sendHeaders("GET", QByteArray::number(i)); QTRY_VERIFY(socket.isHeadersParsed()); handler.route(&socket, socket.path()); - QTRY_COMPARE(client.statusCode(), static_cast(Socket::OK)); + QTRY_COMPARE(client.statusCode(), static_cast(QHttpEngine::Socket::OK)); } } diff --git a/tests/TestQProxyHandler.cpp b/tests/TestQProxyHandler.cpp index 4ce7bae..fe47a28 100644 --- a/tests/TestQProxyHandler.cpp +++ b/tests/TestQProxyHandler.cpp @@ -47,27 +47,27 @@ private Q_SLOTS: void TestQProxyHandler::testDataPassthrough() { // Create the upstream handler (simple echo) - QObjectHandler upstreamHandler; - upstreamHandler.registerMethod(Path, [](Socket *socket) { + QHttpEngine::QObjectHandler upstreamHandler; + upstreamHandler.registerMethod(Path, [](QHttpEngine::Socket *socket) { socket->write(socket->readAll()); socket->close(); }, true); // Create the upstream server and begin listening - Server upstreamServer(&upstreamHandler); + QHttpEngine::Server upstreamServer(&upstreamHandler); QVERIFY(upstreamServer.listen(QHostAddress::LocalHost)); // Create the proxy handler - ProxyHandler handler(upstreamServer.serverAddress(), upstreamServer.serverPort()); + QHttpEngine::ProxyHandler handler(upstreamServer.serverAddress(), upstreamServer.serverPort()); QSocketPair pair; QTRY_VERIFY(pair.isConnected()); QSimpleHttpClient client(pair.client()); - Socket socket(pair.server()); + QHttpEngine::Socket socket(pair.server()); // Send the headers and wait for them to be parsed - Socket::HeaderMap headers{ + QHttpEngine::Socket::HeaderMap headers{ {"Content-Length", QByteArray::number(Data.length())} }; client.sendHeaders("POST", QString("/%1").arg(Path).toUtf8(), headers); diff --git a/tests/common/qsimplehttpclient.cpp b/tests/common/qsimplehttpclient.cpp index f67bd5e..17f3ee8 100644 --- a/tests/common/qsimplehttpclient.cpp +++ b/tests/common/qsimplehttpclient.cpp @@ -33,7 +33,7 @@ QSimpleHttpClient::QSimpleHttpClient(QTcpSocket *socket) onReadyRead(); } -void QSimpleHttpClient::sendHeaders(const QByteArray &method, const QByteArray &path, const Socket::HeaderMap &headers) +void QSimpleHttpClient::sendHeaders(const QByteArray &method, const QByteArray &path, const QHttpEngine::Socket::HeaderMap &headers) { QByteArray data = method + " " + path + " HTTP/1.0\r\n"; for (auto i = headers.constBegin(); i != headers.constEnd(); ++i) { @@ -59,7 +59,7 @@ void QSimpleHttpClient::onReadyRead() // Parse the headers if the double CRLF sequence was found int index = mBuffer.indexOf("\r\n\r\n"); if (index != -1) { - Parser::parseResponseHeaders(mBuffer.left(index), mStatusCode, mStatusReason, mHeaders); + QHttpEngine::Parser::parseResponseHeaders(mBuffer.left(index), mStatusCode, mStatusReason, mHeaders); mHeadersParsed = true; mData.append(mBuffer.mid(index + 4)); diff --git a/tests/common/qsimplehttpclient.h b/tests/common/qsimplehttpclient.h index b43c405..cfcf60e 100644 --- a/tests/common/qsimplehttpclient.h +++ b/tests/common/qsimplehttpclient.h @@ -45,7 +45,7 @@ public: QSimpleHttpClient(QTcpSocket *socket); - void sendHeaders(const QByteArray &method, const QByteArray &path, const Socket::HeaderMap &headers=Socket::HeaderMap()); + void sendHeaders(const QByteArray &method, const QByteArray &path, const QHttpEngine::Socket::HeaderMap &headers = QHttpEngine::Socket::HeaderMap()); void sendData(const QByteArray &data); int statusCode() const { @@ -56,7 +56,7 @@ public: return mStatusReason; } - Socket::HeaderMap headers() const { + QHttpEngine::Socket::HeaderMap headers() const { return mHeaders; } @@ -79,7 +79,7 @@ private: int mStatusCode; QByteArray mStatusReason; - Socket::HeaderMap mHeaders; + QHttpEngine::Socket::HeaderMap mHeaders; QByteArray mData; };