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:
Michael Zanetti 2019-10-30 17:35:43 +01:00
parent 0b5f475991
commit 0d00342b3a
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -948,7 +948,7 @@ void TestJSONRPC::deviceChangedNotifications()
void TestJSONRPC::stateChangeEmitsNotifications() void TestJSONRPC::stateChangeEmitsNotifications()
{ {
enableNotifications({"Devices"}); enableNotifications({"Devices", "States", "Logging", "Events"});
bool found = false; bool found = false;
// Setup connection to mock client // Setup connection to mock client

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

@ -217,7 +217,7 @@ void TestLogging::eventLogs()
QVERIFY2(devices.count() > 0, "There needs to be at least one configured Mock Device for this test"); QVERIFY2(devices.count() > 0, "There needs to be at least one configured Mock Device for this test");
Device *device = devices.first(); Device *device = devices.first();
enableNotifications({"Events"}); enableNotifications({"Events", "Logging"});
// Setup connection to mock client // Setup connection to mock client
QNetworkAccessManager nam; QNetworkAccessManager nam;

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

@ -216,6 +216,7 @@ QVariantMap TestRules::createStateEvaluatorFromSingleDescriptor(const QVariantMa
void TestRules::setWritableStateValue(const DeviceId &deviceId, const StateTypeId &stateTypeId, const QVariant &value) void TestRules::setWritableStateValue(const DeviceId &deviceId, const StateTypeId &stateTypeId, const QVariant &value)
{ {
enableNotifications({"Devices"});
QVariantMap params; QVariantMap params;
params.insert("deviceId", deviceId); params.insert("deviceId", deviceId);
params.insert("stateTypeId", stateTypeId); params.insert("stateTypeId", stateTypeId);

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

@ -2011,7 +2011,7 @@ void TestTimeManager::initTimeManager()
{ {
cleanupMockHistory(); cleanupMockHistory();
removeAllRules(); removeAllRules();
enableNotifications({"Rules"}); enableNotifications({"Rules", "Devices", "Events"});
NymeaCore::instance()->timeManager()->stopTimer(); NymeaCore::instance()->timeManager()->stopTimer();
qDebug() << NymeaCore::instance()->timeManager()->currentTime().toString(); qDebug() << NymeaCore::instance()->timeManager()->currentTime().toString();
qDebug() << NymeaCore::instance()->timeManager()->currentDate().toString(); qDebug() << NymeaCore::instance()->timeManager()->currentDate().toString();

5
tests/testlib/nymeatestbase.cpp
View File

@ -369,10 +369,13 @@ void NymeaTestBase::enableNotifications(const QStringList &namespaces)
foreach (const QString &ns, namespaces) { foreach (const QString &ns, namespaces) {
variantList << ns; variantList << ns;
} }
std::sort(variantList.begin(), variantList.end());
QVariantMap notificationParams; QVariantMap notificationParams;
notificationParams.insert("namespaces", variantList); notificationParams.insert("namespaces", variantList);
QVariant response = injectAndWait("JSONRPC.SetNotificationStatus", notificationParams); QVariant response = injectAndWait("JSONRPC.SetNotificationStatus", notificationParams);
QCOMPARE(response.toMap().value("params").toMap().value("namespaces").toList(), variantList); QVariantList resultList = response.toMap().value("params").toMap().value("namespaces").toList();
std::sort(resultList.begin(), resultList.end());
QCOMPARE(resultList, variantList);
} }
bool NymeaTestBase::disableNotifications() bool NymeaTestBase::disableNotifications()