ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix missing remove rule

Browse Source
This commit is contained in:
Simon Stürz 2016-04-19 14:12:15 +02:00 committed by Michael Zanetti
parent d4f2d9fc8e
commit 9283edb357
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/auto/timemanager/testtimemanager.cpp
View File

@ -212,6 +212,12 @@ void TestTimeManager::loadSaveTimeDescriptor()
QVariantMap timeDescriptorMapLoaded = response.toMap().value("params").toMap().value("rule").toMap().value("timeDescriptor").toMap(); QVariantMap timeDescriptorMapLoaded = response.toMap().value("params").toMap().value("rule").toMap().value("timeDescriptor").toMap();
QCOMPARE(timeDescriptorMap, timeDescriptorMapLoaded); QCOMPARE(timeDescriptorMap, timeDescriptorMapLoaded);
// REMOVE rule
QVariantMap removeParams;
removeParams.insert("ruleId", ruleId);
response = injectAndWait("Rules.RemoveRule", removeParams);
verifyRuleError(response);
} }
void TestTimeManager::addTimeDescriptor_data() void TestTimeManager::addTimeDescriptor_data()
@ -500,8 +506,6 @@ void TestTimeManager::testCalendarItemHourly()
GuhCore::instance()->timeManager()->setTime(QDateTime(currentDateTime.date(), QTime(future.time().hour(), 10))); GuhCore::instance()->timeManager()->setTime(QDateTime(currentDateTime.date(), QTime(future.time().hour(), 10)));
verifyRuleExecuted(mockActionIdWithParams); verifyRuleExecuted(mockActionIdWithParams);
cleanupMockHistory(); cleanupMockHistory();
cleanupMockHistory();
// inactive unchanged // inactive unchanged
GuhCore::instance()->timeManager()->setTime(QDateTime(currentDateTime.date(), QTime(future.time().hour(), 11))); GuhCore::instance()->timeManager()->setTime(QDateTime(currentDateTime.date(), QTime(future.time().hour(), 11)));
verifyRuleNotExecuted(); verifyRuleNotExecuted();
@ -970,6 +974,7 @@ void TestTimeManager::testCalendarYearlyDateTime()
GuhCore::instance()->timeManager()->setTime(dateTime); GuhCore::instance()->timeManager()->setTime(dateTime);
verifyRuleExecuted(mockActionIdNoParams); verifyRuleExecuted(mockActionIdNoParams);
cleanupMockHistory(); cleanupMockHistory();
cleanupMockHistory();
// active unchanged // active unchanged
GuhCore::instance()->timeManager()->setTime(dateTime.addSecs(duration * 30)); GuhCore::instance()->timeManager()->setTime(dateTime.addSecs(duration * 30));
verifyRuleNotExecuted(); verifyRuleNotExecuted();
@ -977,6 +982,7 @@ void TestTimeManager::testCalendarYearlyDateTime()
GuhCore::instance()->timeManager()->setTime(dateTime.addSecs(duration * 60)); GuhCore::instance()->timeManager()->setTime(dateTime.addSecs(duration * 60));
verifyRuleExecuted(mockActionIdWithParams); verifyRuleExecuted(mockActionIdWithParams);
cleanupMockHistory(); cleanupMockHistory();
cleanupMockHistory();
// inactive unchanged // inactive unchanged
GuhCore::instance()->timeManager()->setTime(dateTime.addSecs((duration + 1) * 60)); GuhCore::instance()->timeManager()->setTime(dateTime.addSecs((duration + 1) * 60));
verifyRuleNotExecuted(); verifyRuleNotExecuted();
@ -992,6 +998,7 @@ void TestTimeManager::testCalendarYearlyDateTime()
GuhCore::instance()->timeManager()->setTime(dateTime); GuhCore::instance()->timeManager()->setTime(dateTime);
verifyRuleExecuted(mockActionIdNoParams); verifyRuleExecuted(mockActionIdNoParams);
cleanupMockHistory(); cleanupMockHistory();
cleanupMockHistory();
// active unchanged // active unchanged
GuhCore::instance()->timeManager()->setTime(dateTime.addSecs(duration * 30)); GuhCore::instance()->timeManager()->setTime(dateTime.addSecs(duration * 30));
verifyRuleNotExecuted(); verifyRuleNotExecuted();
@ -999,6 +1006,7 @@ void TestTimeManager::testCalendarYearlyDateTime()
GuhCore::instance()->timeManager()->setTime(dateTime.addSecs(duration * 60)); GuhCore::instance()->timeManager()->setTime(dateTime.addSecs(duration * 60));
verifyRuleExecuted(mockActionIdWithParams); verifyRuleExecuted(mockActionIdWithParams);
cleanupMockHistory(); cleanupMockHistory();
// inactive unchanged // inactive unchanged
GuhCore::instance()->timeManager()->setTime(dateTime.addSecs((duration + 1) * 60)); GuhCore::instance()->timeManager()->setTime(dateTime.addSecs((duration + 1) * 60));
verifyRuleNotExecuted(); verifyRuleNotExecuted();
@ -1503,6 +1511,7 @@ void TestTimeManager::testEnableDisableTimeRule()
void TestTimeManager::initTimeManager() void TestTimeManager::initTimeManager()
{ {
cleanupMockHistory();
GuhCore::instance()->timeManager()->stopTimer(); GuhCore::instance()->timeManager()->stopTimer();
qDebug() << GuhCore::instance()->timeManager()->currentTime().toString(); qDebug() << GuhCore::instance()->timeManager()->currentTime().toString();
qDebug() << GuhCore::instance()->timeManager()->currentDate().toString(); qDebug() << GuhCore::instance()->timeManager()->currentDate().toString();