philipp/qhttpengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor adjustments to a couple of tests.

Browse Source
This commit is contained in:
Nathan Osman
2015-07-18 16:43:37 -07:00
parent c8e6812b5d
commit 150f6b257f
2 changed files with 56 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/TestQFilesystemHandler.cpp
View File

@@ -118,8 +118,7 @@ bool TestQFilesystemHandler::createFile(const QString &path)
return false;
}
file.write(Data);
return true;
return file.write(Data) == Data.length();
}
bool TestQFilesystemHandler::createDirectory(const QString &path)

111
tests/TestQHttpHandler.cpp
View File

@@ -50,66 +50,13 @@ class TestQHttpHandler : public QObject
private Q_SLOTS:
void testSubHandler_data();
void testSubHandler();
void testRedirect_data();
void testRedirect();
void testSubHandler_data();
void testSubHandler();
};
void TestQHttpHandler::testSubHandler_data()
{
QTest::addColumn<QRegExp>("pattern");
QTest::addColumn<QByteArray>("path");
QTest::addColumn<QString>("pathRemainder");
QTest::addColumn<int>("statusCode");
QTest::newRow("match")
<< QRegExp("\\w+")
<< QByteArray("test")
<< QString("")
<< static_cast<int>(QHttpSocket::OK);
QTest::newRow("no match")
<< QRegExp("\\d+")
<< QByteArray("test")
<< QString("")
<< static_cast<int>(QHttpSocket::NotFound);
QTest::newRow("path")
<< QRegExp("one/")
<< QByteArray("one/two")
<< QString("two")
<< static_cast<int>(QHttpSocket::OK);
}
void TestQHttpHandler::testSubHandler()
{
QFETCH(QRegExp, pattern);
QFETCH(QByteArray, path);
QFETCH(QString, pathRemainder);
QFETCH(int, statusCode);
QSocketPair pair;
QTRY_VERIFY(pair.isConnected());
QSimpleHttpClient client(pair.client());
QHttpSocket socket(pair.server(), &pair);
client.sendHeaders("GET", path, QHttpHeaderMap());
QTRY_VERIFY(socket.isHeadersParsed());
DummyHandler subHandler;
QHttpHandler handler;
handler.addSubHandler(pattern, &subHandler);
handler.route(&socket, socket.path());
QTRY_COMPARE(client.statusCode(), statusCode);
QCOMPARE(subHandler.mPathRemainder, pathRemainder);
}
void TestQHttpHandler::testRedirect_data()
{
QTest::addColumn<QRegExp>("pattern");
@@ -167,5 +114,57 @@ void TestQHttpHandler::testRedirect()
}
}
void TestQHttpHandler::testSubHandler_data()
{
QTest::addColumn<QRegExp>("pattern");
QTest::addColumn<QByteArray>("path");
QTest::addColumn<QString>("pathRemainder");
QTest::addColumn<int>("statusCode");
QTest::newRow("match")
<< QRegExp("\\w+")
<< QByteArray("test")
<< QString("")
<< static_cast<int>(QHttpSocket::OK);
QTest::newRow("no match")
<< QRegExp("\\d+")
<< QByteArray("test")
<< QString("")
<< static_cast<int>(QHttpSocket::NotFound);
QTest::newRow("path")
<< QRegExp("one/")
<< QByteArray("one/two")
<< QString("two")
<< static_cast<int>(QHttpSocket::OK);
}
void TestQHttpHandler::testSubHandler()
{
QFETCH(QRegExp, pattern);
QFETCH(QByteArray, path);
QFETCH(QString, pathRemainder);
QFETCH(int, statusCode);
QSocketPair pair;
QTRY_VERIFY(pair.isConnected());
QSimpleHttpClient client(pair.client());
QHttpSocket socket(pair.server(), &pair);
client.sendHeaders("GET", path, QHttpHeaderMap());
QTRY_VERIFY(socket.isHeadersParsed());
DummyHandler subHandler;
QHttpHandler handler;
handler.addSubHandler(pattern, &subHandler);
handler.route(&socket, socket.path());
QTRY_COMPARE(client.statusCode(), statusCode);
QCOMPARE(subHandler.mPathRemainder, pathRemainder);
}
QTEST_MAIN(TestQHttpHandler)
#include "TestQHttpHandler.moc"