ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix tests

pull/228/head
Michael Zanetti 2019-10-30 11:45:21 +01:00
parent 1cebaaee9d
commit feee5ef23a
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/devices/testdevices.cpp
View File

@ -371,7 +371,7 @@ void TestDevices::addConfiguredDevice()
QVariant response = injectAndWait("Devices.AddConfiguredDevice", params);
if (!jsonValidation) {
QCOMPARE(response.toMap().value("status").toString(), "error");
QCOMPARE(response.toMap().value("status").toString(), QString("error"));
return;
}
verifyDeviceError(response, deviceError);
@ -784,7 +784,7 @@ void TestDevices::getStateTypes()
QVariantList stateTypes = response.toMap().value("params").toMap().value("stateTypes").toList();
QCOMPARE(stateTypes.count(), resultCount);
if (resultCount > 0) {
QCOMPARE(stateTypes.first().toMap().value("id").toUuid(), mockIntStateTypeId);
QCOMPARE(stateTypes.first().toMap().value("id").toUuid().toString(), mockIntStateTypeId.toString());
}
}
@ -814,7 +814,7 @@ void TestDevices::getStateType()
QVariantMap stateType = response.toMap().value("params").toMap().value("stateType").toMap();
QVERIFY2(!stateType.isEmpty(), "Got no stateType");
QCOMPARE(stateType.value("id").toUuid(), stateTypeId);
QCOMPARE(stateType.value("id").toUuid().toString(), stateTypeId.toString());
}
void TestDevices::getStateValue_data()

6
tests/auto/jsonrpc/testjsonrpc.cpp
View File

@ -841,7 +841,7 @@ void TestJSONRPC::ruleActiveChangedNotifications()
notificationVariant = checkNotification(clientSpy, "Rules.RuleActiveChanged");
verifyRuleError(response);
QCOMPARE(notificationVariant.toMap().value("params").toMap().value("ruleId").toUuid(), ruleId);
QCOMPARE(notificationVariant.toMap().value("params").toMap().value("ruleId").toUuid().toString(), ruleId.toString());
QCOMPARE(notificationVariant.toMap().value("params").toMap().value("active").toBool(), true);
spy.clear(); clientSpy.clear();
@ -859,7 +859,7 @@ void TestJSONRPC::ruleActiveChangedNotifications()
notificationVariant = checkNotification(clientSpy, "Rules.RuleActiveChanged");
verifyRuleError(response);
QCOMPARE(notificationVariant.toMap().value("params").toMap().value("ruleId").toUuid(), ruleId);
QCOMPARE(notificationVariant.toMap().value("params").toMap().value("ruleId").toUuid().toString(), ruleId.toString());
QCOMPARE(notificationVariant.toMap().value("params").toMap().value("active").toBool(), false);
// now remove the rule and check the RuleRemoved notification
@ -872,7 +872,7 @@ void TestJSONRPC::ruleActiveChangedNotifications()
checkNotification(clientSpy, "Logging.LogDatabaseUpdated");
verifyRuleError(response);
QCOMPARE(notificationVariant.toMap().value("params").toMap().value("ruleId").toUuid(), ruleId);
QCOMPARE(notificationVariant.toMap().value("params").toMap().value("ruleId").toUuid().toString(), ruleId.toString());
}
void TestJSONRPC::deviceChangedNotifications()

6
tests/auto/logging/testlogging.cpp
View File

@ -253,7 +253,7 @@ void TestLogging::eventLogs()
if (logEntry.value("deviceId").toUuid() == device->id()) {
found = true;
// Make sure the notification contains all the stuff we expect
QCOMPARE(logEntry.value("typeId").toUuid(), mockEvent1EventTypeId);
QCOMPARE(logEntry.value("typeId").toUuid().toString(), mockEvent1EventTypeId.toString());
QCOMPARE(logEntry.value("eventType").toString(), enumValueName(Logging::LoggingEventTypeTrigger));
QCOMPARE(logEntry.value("source").toString(), enumValueName(Logging::LoggingSourceEvents));
QCOMPARE(logEntry.value("loggingLevel").toString(), enumValueName(Logging::LoggingLevelInfo));
@ -323,7 +323,7 @@ void TestLogging::actionLog()
if (logEntry.value("deviceId").toUuid() == m_mockDeviceId) {
found = true;
// Make sure the notification contains all the stuff we expect
QCOMPARE(logEntry.value("typeId").toUuid(), mockWithParamsActionTypeId);
QCOMPARE(logEntry.value("typeId").toUuid().toString(), mockWithParamsActionTypeId.toString());
QCOMPARE(logEntry.value("eventType").toString(), enumValueName(Logging::LoggingEventTypeTrigger));
QCOMPARE(logEntry.value("source").toString(), enumValueName(Logging::LoggingSourceActions));
QCOMPARE(logEntry.value("loggingLevel").toString(), enumValueName(Logging::LoggingLevelInfo));
@ -382,7 +382,7 @@ void TestLogging::actionLog()
if (logEntry.value("deviceId").toUuid() == m_mockDeviceId) {
found = true;
// Make sure the notification contains all the stuff we expect
QCOMPARE(logEntry.value("typeId").toUuid(), mockFailingActionTypeId);
QCOMPARE(logEntry.value("typeId").toUuid().toString(), mockFailingActionTypeId.toString());
QCOMPARE(logEntry.value("eventType").toString(), enumValueName(Logging::LoggingEventTypeTrigger));
QCOMPARE(logEntry.value("source").toString(), enumValueName(Logging::LoggingSourceActions));
QCOMPARE(logEntry.value("loggingLevel").toString(), enumValueName(Logging::LoggingLevelAlert));

2
tests/auto/rules/testrules.cpp
View File

@ -1080,7 +1080,7 @@ void TestRules::findRule()
response = injectAndWait("Rules.FindRules", params);
QCOMPARE(response.toMap().value("params").toMap().value("ruleIds").toList().count(), 1);
QCOMPARE(response.toMap().value("params").toMap().value("ruleIds").toList().first().toUuid(), ruleId);
QCOMPARE(response.toMap().value("params").toMap().value("ruleIds").toList().first().toUuid().toString(), ruleId.toString());
// REMOVE rule
QVariantMap removeParams;