Moved the handler classes to a separate directory.

src/CMakeLists.txt

@@ -3,20 +3,20 @@ configure_file(qhttpengine.pc.in "${CMAKE_CURRENT_BINARY_DIR}/qhttpengine.pc" @O
 
 set(INCLUDE
     "${CMAKE_CURRENT_BINARY_DIR}/config.h"
+    handler/qhttphandler.h
+    handler/qhttpsubhandler.h
     qhttpengine.h
-    qhttphandler.h
     qhttpserver.h
     qhttpsocket.h
-    qhttpsubhandler.h
     qiodevicecopier.h
 )
 
 set(SRC
+    handler/qhttphandler.cpp
+    handler/qhttpsubhandler.cpp
     qhttpengine.cpp
-    qhttphandler.cpp
     qhttpserver.cpp
     qhttpsocket.cpp
-    qhttpsubhandler.cpp
     qiodevicecopier.cpp
 )
 

tests/TestQHttpSubHandler.cpp

@@ -25,7 +25,7 @@
 #include <QRegExp>
 #include <QTest>
 
-#include "qhttpsubhandler.h"
+#include "handler/qhttpsubhandler.h"
 
 class DummyHandler : public QHttpHandler
 {
@@ -59,14 +59,14 @@ void TestQHttpSubHandler::testPatterns_data()
     QTest::addColumn<bool>("match");
 
     QTest::newRow("success")
-            << QRegExp("test")
+            << QRegExp("\\w+")
             << QString("test")
             << QString("")
             << true;
 
     QTest::newRow("failure")
-            << QRegExp("test")
-            << QString("fail")
+            << QRegExp("\\d+")
+            << QString("test")
             << QString("")
             << false;