ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added OPTIONS tests and fixed pairing device for REST

pull/135/head
Simon Stürz 2015-09-21 15:08:26 +02:00 committed by Michael Zanetti
parent e0533ee014
commit 0fb45733dc
2 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/rest/devicesresource.cpp
View File

@ -47,7 +47,7 @@ HttpReply *DevicesResource::proccessRequest(const HttpRequest &request, const QS
m_device = 0;
// get the main resource
if (urlTokens.count() >= 4) {
if (urlTokens.count() >= 4 && urlTokens.at(3) != "pair" && urlTokens.at(3) != "confirmpairing") {
DeviceId deviceId = DeviceId(urlTokens.at(3));
if (deviceId.isNull()) {
qCWarning(dcRest) << "Could not parse DeviceId:" << urlTokens.at(3);

42
tests/auto/webserver/testwebserver.cpp
View File

@ -51,6 +51,9 @@ private slots:
void badRequests_data();
void badRequests();
void getOptions_data();
void getOptions();
void getFiles_data();
void getFiles();
@ -232,7 +235,7 @@ void TestWebserver::badRequests_data()
wrongHeaderFormatting.append("\r\n");
QByteArray userAgentMissing;
userAgentMissing.append("GET / HTTP/1.1\r\n");
userAgentMissing.append("GET /abc HTTP/1.1\r\n");
userAgentMissing.append("\r\n");
QTest::newRow("wrong content length") << wrongContentLength << 400;
@ -276,6 +279,43 @@ void TestWebserver::badRequests()
socket->deleteLater();
}
void TestWebserver::getOptions_data()
{
QTest::addColumn<QString>("path");
QTest::newRow("get OPTIONS /api/v1/devices") << "/api/v1/devices";
QTest::newRow("get OPTIONS /api/v1/devices/{id}") << "/api/v1/devices/" + m_mockDeviceId.toString();
QTest::newRow("get OPTIONS /api/v1/devices/pair") << "/api/v1/devices/pair";
QTest::newRow("get OPTIONS /api/v1/devices/confirmpairing") << "/api/v1/devices/confirmpairing";
QTest::newRow("get OPTIONS /api/v1/rules") << "/api/v1/rules";
QTest::newRow("get OPTIONS /api/v1/plugins") << "/api/v1/plugins";
QTest::newRow("get OPTIONS /api/v1/logs") << "/api/v1/logs";
QTest::newRow("get OPTIONS /api/v1/deviceclasses") << "/api/v1/deviceclasses";
QTest::newRow("get OPTIONS /api/v1/vendors") << "/api/v1/vendors";
}
void TestWebserver::getOptions()
{
QFETCH(QString, path);
QNetworkAccessManager *nam = new QNetworkAccessManager(this);
QSignalSpy clientSpy(nam, SIGNAL(finished(QNetworkReply*)));
QNetworkRequest request;
request.setUrl(QUrl("http://localhost:3333" + path));
QNetworkReply *reply = nam->sendCustomRequest(request, "OPTIONS");
clientSpy.wait();
QCOMPARE(clientSpy.count(), 1);
bool ok = false;
int statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(&ok);
QVERIFY2(ok, "Could not convert statuscode from response to int");
QCOMPARE(statusCode, 200);
reply->deleteLater();
}
void TestWebserver::getFiles_data()
{
QTest::addColumn<QString>("query");