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

clean up code and debug outputs

Browse Source
This commit is contained in:
Simon Stürz 2016-04-18 13:56:05 +02:00 committed by Michael Zanetti
parent 501c576525
commit f3848c5daa
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/ruleengine.cpp
View File

@ -334,7 +334,7 @@ QList<Rule> RuleEngine::evaluateEvent(const Event &event)
{
Device *device = GuhCore::instance()->deviceManager()->findConfiguredDevice(event.deviceId());
qCDebug(dcRuleEngine) << "got event:" << event << device->name() << event.eventTypeId();
qCDebug(dcRuleEngine) << "Got event:" << event << device->name() << event.eventTypeId();
QList<Rule> rules;
foreach (const RuleId &id, ruleIds()) {
@ -346,9 +346,7 @@ QList<Rule> RuleEngine::evaluateEvent(const Event &event)
// This rule seems to have only states, check on state changed
if (containsState(rule.stateEvaluator(), event)) {
if (rule.stateEvaluator().evaluate()) {
if (m_activeRules.contains(rule.id())) {
qCDebug(dcRuleEngine) << "Rule" << rule.id() << "still in active state.";
} else {
if (!m_activeRules.contains(rule.id())) {
qCDebug(dcRuleEngine) << "Rule" << rule.id() << "entered active state.";
rule.setActive(true);
m_rules[rule.id()] = rule;
@ -396,12 +394,10 @@ QList<Rule> RuleEngine::evaluateTime(const QDateTime &dateTime)
// check if this rule is based on calendarItems
if (!rule.timeDescriptor().calendarItems().isEmpty()) {
qCDebug(dcRuleEngine()) << "Evaluate CalendarItem against" << dateTime.toString("dd:MM:yyyy hh:mm") << "for rule" << rule.id().toString();
//qCDebug(dcRuleEngine()) << "Evaluate CalendarItem against" << dateTime.toString("dd:MM:yyyy hh:mm") << "for rule" << rule.id().toString();
bool active = rule.timeDescriptor().evaluate(dateTime);
if (active) {
if (m_activeRules.contains(rule.id())) {
qCDebug(dcRuleEngine) << "Rule" << rule.id().toString() << "still active.";
} else {
if (!m_activeRules.contains(rule.id())) {
qCDebug(dcRuleEngine) << "Rule" << rule.id().toString() << "active.";
rule.setActive(true);
m_rules[rule.id()] = rule;
@ -422,7 +418,6 @@ QList<Rule> RuleEngine::evaluateTime(const QDateTime &dateTime)
// check if this rule is based on timeEventItems
if (!rule.timeDescriptor().timeEventItems().isEmpty()) {
bool valid = rule.timeDescriptor().evaluate(dateTime);
qCDebug(dcRuleEngine()) << "Result:" << (valid ? "valid" : "invalid");
if (valid) {
rules.append(rule);
}

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

@ -131,12 +131,10 @@ void TestTimeManager::changeTimeZone()
QDateTime currentDateTime = GuhCore::instance()->timeManager()->currentDateTime();
qDebug() << currentDateTime.toString();
GuhCore::instance()->timeManager()->setTimeZone(timeZoneId);
QDateTime newDateTime = GuhCore::instance()->timeManager()->currentDateTime();
qDebug() << newDateTime.toString();
int offsetOriginal = currentTimeZone.offsetFromUtc(currentDateTime);
int offsetNew = newTimeZone.offsetFromUtc(newDateTime);
@ -228,15 +226,9 @@ void TestTimeManager::loadSaveTimeDescriptor()
verifyRuleError(response);
QVariantMap timeDescriptorMap = response.toMap().value("params").toMap().value("rule").toMap().value("timeDescriptor").toMap();
//qDebug() << QJsonDocument::fromVariant(timeDescriptorMap).toJson();
QVariantMap timeDescriptorMapLoaded = response.toMap().value("params").toMap().value("rule").toMap().value("timeDescriptor").toMap();
//qDebug() << QJsonDocument::fromVariant(timeDescriptorMapLoaded).toJson();
qDebug() << endl << timeDescriptorMap << endl << endl << timeDescriptorMapLoaded;
QCOMPARE(timeDescriptorMap, timeDescriptorMapLoaded);
}
void TestTimeManager::addTimeDescriptor_data()
@ -505,7 +497,6 @@ void TestTimeManager::testCalendarItemHourly()
// Check if should be enabled always
if (duration == 60) {
qDebug() << "Enabled always";
GuhCore::instance()->timeManager()->setTime(future);
// Should be active since adding
verifyRuleExecuted(mockActionIdNoParams);
@ -1529,7 +1520,6 @@ void TestTimeManager::initTimeManager()
GuhCore::instance()->timeManager()->stopTimer();
qDebug() << GuhCore::instance()->timeManager()->currentTime().toString();
qDebug() << GuhCore::instance()->timeManager()->currentDate().toString();
qDebug() << GuhCore::instance()->timeManager()->currentDateTime().toString();
}
void TestTimeManager::verifyRuleExecuted(const ActionTypeId &actionTypeId)