From bc611ca8aa6f08d6f19a07c5685587f6944f9e0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Mon, 18 Apr 2016 19:11:54 +0200 Subject: [PATCH] add clear action history --- tests/auto/timemanager/testtimemanager.cpp | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/tests/auto/timemanager/testtimemanager.cpp b/tests/auto/timemanager/testtimemanager.cpp index 77b9f284..deca0ac3 100644 --- a/tests/auto/timemanager/testtimemanager.cpp +++ b/tests/auto/timemanager/testtimemanager.cpp @@ -186,25 +186,10 @@ void TestTimeManager::loadSaveTimeDescriptor() action.insert("deviceId", m_mockDeviceId); action.insert("ruleActionParams", QVariantList()); -// // Exit action (with params) -// QVariantList actionParams; -// QVariantMap param1; -// param1.insert("name", "mockActionParam1"); -// param1.insert("value", 12); -// actionParams.append(param1); -// QVariantMap param2; -// param2.insert("name", "mockActionParam2"); -// param2.insert("value", true); -// actionParams.append(param2); -// exitAction.insert("actionTypeId", mockActionIdWithParams); -// exitAction.insert("deviceId", m_mockDeviceId); -// exitAction.insert("ruleActionParams", actionParams); - // Create the rule map ruleMap.insert("name", "Time based weekly calendar rule"); ruleMap.insert("timeDescriptor", timeDescriptor); ruleMap.insert("actions", QVariantList() << action); - //ruleMap.insert("exitActions", QVariantList() << exitAction); // Add the rule QVariant response = injectAndWait("Rules.AddRule", ruleMap); @@ -220,8 +205,6 @@ void TestTimeManager::loadSaveTimeDescriptor() restartServer(); // Get the loaded rule - - response = injectAndWait("Rules.GetRuleDetails", params); verifyRuleError(response); @@ -1135,6 +1118,7 @@ void TestTimeManager::testEventItemHourly() // not triggering GuhCore::instance()->timeManager()->setTime(beforeEventDateTime.addSecs(120)); verifyRuleNotExecuted(); + cleanupMockHistory(); } cleanupMockHistory();