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

fix tests

Browse Source
This commit is contained in:
Simon Stürz 2016-03-04 11:24:31 +01:00 committed by Michael Zanetti
parent da7cfc27f8
commit adff8306b3
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,6 +200,7 @@ void TestJSONRPC::enableDisableNotifications()
void TestJSONRPC::stateChangeEmitsNotifications() void TestJSONRPC::stateChangeEmitsNotifications()
{ {
QCOMPARE(enableNotifications(), true); QCOMPARE(enableNotifications(), true);
bool found = false;
// Setup connection to mock client // Setup connection to mock client
QNetworkAccessManager nam; QNetworkAccessManager nam;
@ -208,19 +209,19 @@ void TestJSONRPC::stateChangeEmitsNotifications()
// trigger state change in mock device // trigger state change in mock device
int newVal = 38; int newVal = 38;
QUuid stateTypeId("80baec19-54de-4948-ac46-31eabfaceb83"); QUuid stateTypeId("80baec19-54de-4948-ac46-31eabfaceb83");
QNetworkRequest request(QUrl(QString("http://localhost:%1/setstate?%2=%3").arg(m_mockDevice1Port).arg(stateTypeId.toString()).arg(newVal))); QNetworkRequest request(QUrl(QString("http://localhost:%1/setstate?%2=%3").arg(m_mockDevice1Port).arg(stateTypeId.toString()).arg(QString::number(newVal))));
QNetworkReply *reply = nam.get(request); QNetworkReply *reply = nam.get(request);
reply->deleteLater(); reply->deleteLater();
clientSpy.wait(2000); clientSpy.wait();
// Make sure the notification contains all the stuff we expect // Make sure the notification contains all the stuff we expect
QVariantList stateChangedVariants = checkNotifications(clientSpy, "Devices.StateChanged"); QVariantList stateChangedVariants = checkNotifications(clientSpy, "Devices.StateChanged");
QVERIFY2(!stateChangedVariants.isEmpty(), "Did not get Devices.StateChanged notification."); QVERIFY2(!stateChangedVariants.isEmpty(), "Did not get Devices.StateChanged notification.");
qDebug() << "got" << stateChangedVariants.count() << "Devices.StateChanged notifications";
bool found = false; qDebug() << "got" << stateChangedVariants.count() << "Devices.StateChanged notifications";
foreach (const QVariant &stateChangedVariant, stateChangedVariants) { foreach (const QVariant &stateChangedVariant, stateChangedVariants) {
qDebug() << QJsonDocument::fromVariant(stateChangedVariant).toJson();
if (stateChangedVariant.toMap().value("params").toMap().value("stateTypeId").toUuid() == stateTypeId) { if (stateChangedVariant.toMap().value("params").toMap().value("stateTypeId").toUuid() == stateTypeId) {
found = true; found = true;
QCOMPARE(stateChangedVariant.toMap().value("params").toMap().value("value").toInt(), newVal); QCOMPARE(stateChangedVariant.toMap().value("params").toMap().value("value").toInt(), newVal);
@ -230,25 +231,41 @@ void TestJSONRPC::stateChangeEmitsNotifications()
QVERIFY2(found, "Could not find the correct Devices.StateChanged notification"); QVERIFY2(found, "Could not find the correct Devices.StateChanged notification");
// Make sure the logg notification contains all the stuff we expect // Make sure the logg notification contains all the stuff we expect
QVariantList loggEntryAddedVariant = checkNotifications(clientSpy, "Logging.LogEntryAdded"); QVariantList loggEntryAddedVariants = checkNotifications(clientSpy, "Logging.LogEntryAdded");
QVERIFY2(!loggEntryAddedVariant.isEmpty(), "Did not get Logging.LogEntryAdded notification."); QVERIFY2(!loggEntryAddedVariants.isEmpty(), "Did not get Logging.LogEntryAdded notification.");
qDebug() << "got" << loggEntryAddedVariant.count() << "Logging.LogEntryAdded notifications"; qDebug() << "got" << loggEntryAddedVariants.count() << "Logging.LogEntryAdded notifications";
found = false;
qDebug() << "got" << loggEntryAddedVariants.count() << "Logging.LogEntryAdded";
foreach (const QVariant &loggEntryAddedVariant, loggEntryAddedVariants) {
qDebug() << QJsonDocument::fromVariant(loggEntryAddedVariant).toJson();
if (loggEntryAddedVariant.toMap().value("params").toMap().value("logEntry").toMap().value("typeId").toUuid() == stateTypeId) {
found = true;
QCOMPARE(loggEntryAddedVariant.toMap().value("params").toMap().value("logEntry").toMap().value("source").toString(), QString("LoggingSourceStates"));
QCOMPARE(loggEntryAddedVariant.toMap().value("params").toMap().value("logEntry").toMap().value("value").toInt(), newVal);
break;
}
}
QVERIFY2(found, "Could not find the correct Events.EventTriggered notification");
// Make sure the notification contains all the stuff we expect // Make sure the notification contains all the stuff we expect
QVariantList eventTriggeredVariants = checkNotifications(clientSpy, "Events.EventTriggered"); QVariantList eventTriggeredVariants = checkNotifications(clientSpy, "Events.EventTriggered");
QVERIFY2(!eventTriggeredVariants.isEmpty(), "Did not get Events.EventTriggered notification."); QVERIFY2(!eventTriggeredVariants.isEmpty(), "Did not get Events.EventTriggered notification.");
qDebug() << "got" << eventTriggeredVariants.count() << "Events.EventTriggered notifications";
found = false; found = false;
qDebug() << "got" << eventTriggeredVariants.count() << "Events.EventTriggered notifications";
foreach (const QVariant &eventTriggeredVariant, eventTriggeredVariants) { foreach (const QVariant &eventTriggeredVariant, eventTriggeredVariants) {
qDebug() << QJsonDocument::fromVariant(eventTriggeredVariant).toJson();
if (eventTriggeredVariant.toMap().value("params").toMap().value("event").toMap().value("eventTypeId").toUuid() == stateTypeId) { if (eventTriggeredVariant.toMap().value("params").toMap().value("event").toMap().value("eventTypeId").toUuid() == stateTypeId) {
found = true; found = true;
QCOMPARE(eventTriggeredVariant.toMap().value("params").toMap().value("event").toMap().value("params").toList().first().toMap().value("value").toInt(), newVal); QCOMPARE(eventTriggeredVariant.toMap().value("params").toMap().value("event").toMap().value("params").toList().first().toMap().value("value").toInt(), newVal);
break; break;
} }
} }
QVERIFY2(found, "Could not find the correct Devices.StateChanged notification"); QVERIFY2(found, "Could not find the correct Events.EventTriggered notification");
// Now turn off notifications // Now turn off notifications
QCOMPARE(disableNotifications(), true); QCOMPARE(disableNotifications(), true);

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

@ -924,7 +924,6 @@ void TestRules::loadStoreConfig()
stateEvaluator2.insert("stateDescriptor", stateDescriptor2); stateEvaluator2.insert("stateDescriptor", stateDescriptor2);
stateEvaluator2.insert("operator", JsonTypes::stateOperatorToString(Types::StateOperatorAnd)); stateEvaluator2.insert("operator", JsonTypes::stateOperatorToString(Types::StateOperatorAnd));
QVariantMap stateDescriptor3; QVariantMap stateDescriptor3;
stateDescriptor3.insert("deviceId", m_mockDeviceId); stateDescriptor3.insert("deviceId", m_mockDeviceId);
stateDescriptor3.insert("operator", JsonTypes::valueOperatorToString(Types::ValueOperatorEquals)); stateDescriptor3.insert("operator", JsonTypes::valueOperatorToString(Types::ValueOperatorEquals));