diff --git a/doc/plugin-json.qdoc b/doc/plugin-json.qdoc index 938d33ba..756f6c3a 100644 --- a/doc/plugin-json.qdoc +++ b/doc/plugin-json.qdoc @@ -21,7 +21,6 @@ The \tt plugininfo.h has to be included in the main plugin \tt cpp file (\tt{deviceplugin<\b pluginName>.cpp}). The \tt extern-plugininfo.h can be included in other classes/files of the plugin to get the extern definitions of the ID's and the logging category. - \section1 Basic structure The name convention fot the plugin json file is: diff --git a/server/rest/devicesresource.cpp b/server/rest/devicesresource.cpp index 613fee15..b589495f 100644 --- a/server/rest/devicesresource.cpp +++ b/server/rest/devicesresource.cpp @@ -317,7 +317,6 @@ HttpReply *DevicesResource::removeDevice(Device *device, const QVariantMap ¶ return createDeviceErrorReply(HttpReply::Ok, status.first); return createDeviceErrorReply(HttpReply::BadRequest, status.first); - } HttpReply *DevicesResource::executeAction(Device *device, const ActionTypeId &actionTypeId, const QByteArray &payload) const diff --git a/tests/auto/devices/testdevices.cpp b/tests/auto/devices/testdevices.cpp index ae7d74b5..635a6e55 100644 --- a/tests/auto/devices/testdevices.cpp +++ b/tests/auto/devices/testdevices.cpp @@ -657,11 +657,11 @@ void TestDevices::getEventTypes() params.insert("deviceClassId", deviceClassId); QVariant response = injectAndWait("Devices.GetEventTypes", params); + qDebug() << response; + QVariantList eventTypes = response.toMap().value("params").toMap().value("eventTypes").toList(); QCOMPARE(eventTypes.count(), resultCount); - if (resultCount > 0) { - QCOMPARE(eventTypes.first().toMap().value("id").toString(), mockEvent1Id.toString()); - } + } void TestDevices::getStateTypes_data()