From ef874a8c42d545beaf96f1417d31aa7665d8445d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Fri, 4 Mar 2016 16:09:08 +0100 Subject: [PATCH] add mock device debugs recheck rule tests --- plugins/deviceplugins/mock/httpdaemon.cpp | 6 ++++++ tests/auto/rules/testrules.cpp | 2 ++ 2 files changed, 8 insertions(+) diff --git a/plugins/deviceplugins/mock/httpdaemon.cpp b/plugins/deviceplugins/mock/httpdaemon.cpp index 55b6fb1e..63926b86 100644 --- a/plugins/deviceplugins/mock/httpdaemon.cpp +++ b/plugins/deviceplugins/mock/httpdaemon.cpp @@ -63,6 +63,7 @@ void HttpDaemon::incomingConnection(qintptr socket) void HttpDaemon::actionExecuted(const ActionTypeId &actionTypeId) { + qCDebug(dcMockDevice) << "Log actions executed" << actionTypeId.toString(); m_actionList.append(qMakePair(actionTypeId, QDateTime::currentDateTime())); } @@ -81,19 +82,24 @@ void HttpDaemon::readClient() QUrl url("http://foo.bar" + tokens[1]); QUrlQuery query(url); if (url.path() == "/setstate") { + qCDebug(dcMockDevice) << "Set state value" << query.queryItems().first().second; emit setState(StateTypeId(query.queryItems().first().first), QVariant(query.queryItems().first().second)); } else if (url.path() == "/generateevent") { emit triggerEvent(EventTypeId(query.queryItemValue("eventtypeid"))); } else if (url.path() == "/actionhistory") { + qCDebug(dcMockDevice) << "Get action history called"; + QTextStream os(socket); os.setAutoDetectUnicode(true); os << generateHeader(); for (int i = 0; i < m_actionList.count(); ++i) { os << m_actionList.at(i).first.toString() << '\n'; + qCDebug(dcMockDevice) << " " << m_actionList.at(i).first.toString(); } socket->close(); return; } else if (url.path() == "/clearactionhistory") { + qCDebug(dcMockDevice) << "Clear action history"; m_actionList.clear(); } if (tokens[0] == "GET") { diff --git a/tests/auto/rules/testrules.cpp b/tests/auto/rules/testrules.cpp index b3f52386..d9431e77 100644 --- a/tests/auto/rules/testrules.cpp +++ b/tests/auto/rules/testrules.cpp @@ -818,6 +818,7 @@ void TestRules::executeRuleActions() cleanupMockHistory(); // EXECUTE actions + qDebug() << "Execute rule actions"; QVariantMap executeParams; executeParams.insert("ruleId", ruleId.toString()); response = injectAndWait("Rules.ExecuteActions", executeParams); @@ -835,6 +836,7 @@ void TestRules::executeRuleActions() cleanupMockHistory(); // EXECUTE exit actions + qDebug() << "Execute rule exit actions"; response = injectAndWait("Rules.ExecuteExitActions", executeParams); verifyRuleError(response, ruleError);