From a225423b73c04fdbe1651c81218a3ed78abff386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Fri, 4 Mar 2016 11:35:24 +0100 Subject: [PATCH] other small fixes --- tests/auto/rules/testrules.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/auto/rules/testrules.cpp b/tests/auto/rules/testrules.cpp index 4a822410..41a63e7d 100644 --- a/tests/auto/rules/testrules.cpp +++ b/tests/auto/rules/testrules.cpp @@ -89,7 +89,7 @@ private slots: void TestRules::cleanupMockHistory() { QNetworkAccessManager nam; QSignalSpy spy(&nam, SIGNAL(finished(QNetworkReply*))); - QNetworkRequest request(QUrl(QString("http://localhost:%1/clearactionhistory").arg(m_mockDevice1Port).arg(mockEvent1Id.toString()))); + QNetworkRequest request(QUrl(QString("http://localhost:%1/clearactionhistory").arg(QString::number(m_mockDevice1Port)))); QNetworkReply *reply = nam.get(request); spy.wait(1000); QCOMPARE(spy.count(), 1); @@ -132,7 +132,7 @@ void TestRules::verifyRuleExecuted(const ActionTypeId &actionTypeId) // Verify rule got executed QNetworkAccessManager nam; QSignalSpy spy(&nam, SIGNAL(finished(QNetworkReply*))); - QNetworkRequest request(QUrl(QString("http://localhost:%1/actionhistory").arg(m_mockDevice1Port))); + QNetworkRequest request(QUrl(QString("http://localhost:%1/actionhistory").arg(QString::number(m_mockDevice1Port)))); QNetworkReply *reply = nam.get(request); spy.wait(1000); QCOMPARE(spy.count(), 1); @@ -148,7 +148,7 @@ void TestRules::verifyRuleNotExecuted() { QNetworkAccessManager nam; QSignalSpy spy(&nam, SIGNAL(finished(QNetworkReply*))); - QNetworkRequest request(QUrl(QString("http://localhost:%1/actionhistory").arg(m_mockDevice1Port))); + QNetworkRequest request(QUrl(QString("http://localhost:%1/actionhistory").arg(QString::number(m_mockDevice1Port)))); QNetworkReply *reply = nam.get(request); spy.wait(); QCOMPARE(spy.count(), 1); @@ -972,7 +972,6 @@ void TestRules::loadStoreConfig() validActionEventBasedParam2.insert("value", false); validActionEventBased.insert("ruleActionParams", QVariantList() << validActionEventBasedParam1 << validActionEventBasedParam2); - QVariantList validEventDescriptors3; QVariantMap validEventDescriptor3; validEventDescriptor3.insert("eventTypeId", mockEvent2Id);