Merge lp:~ahayzen/ubuntu-ui-extras/job-impressions-update into lp:~phablet-team/ubuntu-ui-extras/printer-staging

[Andrew Hayzen]

* Connect job-impressions-completed from cups to PrinterJob::impressionsCompleted()
* In the job model listen to printerStateChanged as changes t job-impressions-completed causes that signal
* Improve the PrinterSignalHandler to limit the maximum wait time of unprocessed signals to four times the timeout
* Add unit test for SignalRateLimiter to check it does perform a flush
* Rename PrinterSignalHandler to SignalRateLimiter

* Connect job-impressions-completed from cups to PrinterJob::impressionsCompleted()
* In the job model listen to printerStateChanged as changes t job-impressions-completed causes that signal
* Improve the PrinterSignalHandler to limit the maximum wait time of unprocessed signals to four times the timeout
* Add unit test for SignalRateLimiter to check it does perform a flush
* Rename PrinterSignalHandler to SignalRateLimiter

[Andrew Hayzen (ahayzen)]

Testing:
- Add a printer which has an address of lpd://127.0.0.1 so that it will spool on the cups server
- Download the serverguide.pdf (which has loads of pages) from [0]
- Open the PrinterQueue.qml example and open the printer you just added
- Add the serverguide.pdf to the printer queue for the printer you just added
- Watch the printing N pages count increment (also note the freezes that happen, eg if there is already a job being rendered when starting the example it can freeze)

0 - http://bazaar.launchpad.net/~ubuntu-docviewer-dev/ubuntu-docviewer-app/lo-viewer/download/head:/serverguide.pdf-20150423201617-20cgubqqf8rhokei-1/serverguide.pdf

[Andrew Hayzen (ahayzen)]

Should job-media-sheets-completed be used instead of job-impressesions-completed? Does this then take duplex into account?

review: Needs Information

[Jonas G. Drange (jonas-drange)]

ack on the rate limiter! good stuff

[Jonas G. Drange (jonas-drange)]

Re: job-media-*, I'd have to read the IPP spec to be sure. Maybe mimic SCP here?

[Jonas G. Drange (jonas-drange)]

Got this one:
void PrinterJob::loadDefaults() 12
QObject::connect: Cannot queue arguments of type 'QVector<int>'
(Make sure 'QVector<int>' is registered using qRegisterMetaType().)

Introduced by this branch?

review: Needs Information

[Jonas G. Drange (jonas-drange)]

The window only freezes, no queues are displayed. I think we need to fix that.

And the freezing is introduced by this branch, because using printer-staging trunk, going to Printers.qml -> <printer> -> Jobs enumerates the jobs without the lag.

review: Needs Fixing

[lp:~ahayzen/ubuntu-ui-extras/job-impressions-update]

153. By Andrew Hayzen on 2017-03-14

* Pull of upstream

154. By Andrew Hayzen on 2017-03-14

* Try to use job-media-sheets-completed first

[Andrew Hayzen (ahayzen)]

This is now much more stable for me :-)

Also I've tried sending a few (non-)duplex jobs for my HP printer, job-media-sheets-completed and job-impressions-completed are always the same (I wonder if the driver isn't correct).

The spec states the following:
- job-media-sheets-completed: "This job attribute specifies the media-sheets completed marking and stacking for the entire job so far whether those sheets have been processed on one side or on both."
- job-impressions-completed: "This job attribute specifies the number of impressions completed for the job so far. For printing devices, the impressions completed includes interpreting, marking, and stacking the output."

[lp:~ahayzen/ubuntu-ui-extras/job-impressions-update]

155. By Andrew Hayzen on 2017-03-15

* Pull of upstream
* Fix tests (emulation in MockBackend::printerGetJobAttributes)

156. By Andrew Hayzen on 2017-03-15

* Pull of upstream

[Jonas G. Drange (jonas-drange)]

works well! Thank you!

review: Approve

=== modified file 'modules/Ubuntu/Components/Extras/Example/PrinterQueue.qml'
--- modules/Ubuntu/Components/Extras/Example/PrinterQueue.qml	2017-03-01 13:45:14 +0000
+++ modules/Ubuntu/Components/Extras/Example/PrinterQueue.qml	2017-03-15 17:52:16 +0000
@@ -72,10 +72,7 @@
                     ListItemLayout {
                         id: modelLayout
                         title.text: displayName
-                        subtitle.text: model.title + " (" + model.id + ") State: " + model.state
-                                       + " Color: " + model.colorModel + " CreationTime: "
-                                       + model.creationTime + " PageRange: "
-                                       + model.printRange + " Messages: " + model.messages;
+                        subtitle.text: model.title + " (" + model.id + ")\nPrinting " + model.impressionsCompleted + " pages"
                         subtitle.wrapMode: Text.WrapAtWordBoundaryOrAnywhere
                         subtitle.maximumLineCount: 3
                     }

=== modified file 'modules/Ubuntu/Components/Extras/Printers/CMakeLists.txt'
--- modules/Ubuntu/Components/Extras/Printers/CMakeLists.txt	2017-03-15 17:52:16 +0000
+++ modules/Ubuntu/Components/Extras/Printers/CMakeLists.txt	2017-03-15 17:52:16 +0000
@@ -42,7 +42,7 @@
 
     printer/printer.cpp
     printer/printerjob.cpp
-    printer/printersignalhandler.cpp
+    printer/signalratelimiter.cpp
     printers/printers.cpp
 
     enums.h

=== modified file 'modules/Ubuntu/Components/Extras/Printers/backend/backend_cups.cpp'
--- modules/Ubuntu/Components/Extras/Printers/backend/backend_cups.cpp	2017-03-15 17:52:16 +0000
+++ modules/Ubuntu/Components/Extras/Printers/backend/backend_cups.cpp	2017-03-15 17:52:16 +0000
@@ -487,6 +487,16 @@
         map.insert("Duplex", QVariant(""));
     }
 
+    // Try job-media-sheets-completed first as it should include duplex
+    // if it doesn't exist fallback to job-impressions-completed
+    if (__CUPS_ATTR_EXISTS(rawMap, "job-media-sheets-completed", int)) {
+        map.insert("impressionsCompleted", rawMap.value("job-media-sheets-completed"));
+    } else if (__CUPS_ATTR_EXISTS(rawMap, "job-impressions-completed", int)) {
+        map.insert("impressionsCompleted", rawMap.value("job-impressions-completed"));
+    } else {
+        map.insert("impressionsCompleted", QVariant(0));
+    }
+
     if (__CUPS_ATTR_EXISTS(rawMap, "landscape", bool)) {
         map.insert("landscape", rawMap.value("landscape"));
     } else {
@@ -535,6 +545,12 @@
         map.insert("Size", QVariant(0));
     }
 
+    // If there is a state then get it, as there could have been a signal
+    // flood. Which then means a forceJobRefresh is able to update the state
+    if (__CUPS_ATTR_EXISTS(rawMap, "job-state", int)) {
+        map.insert("State", rawMap.value("job-state").toInt());
+    }
+
     if (__CUPS_ATTR_EXISTS(rawMap, "job-originating-user-name", QString)) {
         map.insert("User", rawMap.value("job-originating-user-name"));
     } else {

=== modified file 'modules/Ubuntu/Components/Extras/Printers/models/jobmodel.cpp'
--- modules/Ubuntu/Components/Extras/Printers/models/jobmodel.cpp	2017-03-15 17:52:16 +0000
+++ modules/Ubuntu/Components/Extras/Printers/models/jobmodel.cpp	2017-03-15 17:52:16 +0000
@@ -41,6 +41,13 @@
     connect(m_backend, SIGNAL(jobLoaded(QString, int, QMap<QString, QVariant>)),
             this, SLOT(updateJob(QString, int, QMap<QString, QVariant>)));
 
+    // Impressions completed happens via printer state changed
+    QObject::connect(m_backend, &PrinterBackend::printerStateChanged,
+                     &m_signalHandler, &SignalRateLimiter::onPrinterStateChanged);
+
+    QObject::connect(&m_signalHandler, SIGNAL(printerModified(const QString&)),
+                     this, SLOT(jobSignalPrinterModified(const QString&)));
+
     // Add already existing jobs
     // TODO: even this should probably be in a background thread?
     // so that it doesn't block startup?
@@ -134,6 +141,20 @@
     }
 }
 
+void JobModel::jobSignalPrinterModified(const QString &printerName)
+{
+    // Find the active or pending job and force a refresh
+    // We force refresh pending jobs incase there is a flood of signals
+    // meaning that the jobStateChanged signal might not have happened yet
+    Q_FOREACH(auto job, m_jobs) {
+        if (job->printerName() == printerName
+                && (job->state() == PrinterEnum::JobState::Processing
+                        || job->state() == PrinterEnum::JobState::Pending)) {
+            Q_EMIT forceJobRefresh(printerName, job->jobId());
+        }
+    }
+}
+
 void JobModel::addJob(QSharedPointer<PrinterJob> job)
 {
     int i = m_jobs.size();

=== modified file 'modules/Ubuntu/Components/Extras/Printers/models/jobmodel.h'
--- modules/Ubuntu/Components/Extras/Printers/models/jobmodel.h	2017-03-15 17:52:16 +0000
+++ modules/Ubuntu/Components/Extras/Printers/models/jobmodel.h	2017-03-15 17:52:16 +0000
@@ -20,6 +20,7 @@
 #include "printers_global.h"
 #include "backend/backend.h"
 #include "printer/printerjob.h"
+#include "printer/signalratelimiter.h"
 
 #include <QAbstractListModel>
 #include <QByteArray>
@@ -89,6 +90,7 @@
     PrinterBackend *m_backend;
 
     QList<QSharedPointer<PrinterJob>> m_jobs;
+    SignalRateLimiter m_signalHandler;
 private Q_SLOTS:
     void jobCreated(const QString &text, const QString &printer_uri,
                     const QString &printer_name, uint printer_state,
@@ -111,10 +113,12 @@
                       uint job_state, const QString &job_state_reasons,
                       const QString &job_name,
                       uint job_impressions_completed);
+    void jobSignalPrinterModified(const QString &printerName);
     void updateJob(QString printerName, int jobId, QMap<QString, QVariant> attributes);
 
 Q_SIGNALS:
     void countChanged();
+    void forceJobRefresh(const QString &printerName, const int jobId);
 };
 
 class PRINTERS_DECL_EXPORT JobFilter : public QSortFilterProxyModel

=== modified file 'modules/Ubuntu/Components/Extras/Printers/models/printermodel.cpp'
--- modules/Ubuntu/Components/Extras/Printers/models/printermodel.cpp	2017-03-15 17:52:16 +0000
+++ modules/Ubuntu/Components/Extras/Printers/models/printermodel.cpp	2017-03-15 17:52:16 +0000
@@ -32,9 +32,9 @@
     QObject::connect(m_backend, &PrinterBackend::printerAdded,
                      this, &PrinterModel::printerAdded);
     QObject::connect(m_backend, &PrinterBackend::printerModified,
-                     &m_signalHandler, &PrinterSignalHandler::onPrinterModified);
+                     &m_signalHandler, &SignalRateLimiter::onPrinterModified);
     QObject::connect(m_backend, &PrinterBackend::printerStateChanged,
-                     &m_signalHandler, &PrinterSignalHandler::onPrinterModified);
+                     &m_signalHandler, &SignalRateLimiter::onPrinterModified);
     QObject::connect(m_backend, &PrinterBackend::printerDeleted,
                      this, &PrinterModel::printerDeleted);
 

=== modified file 'modules/Ubuntu/Components/Extras/Printers/models/printermodel.h'
--- modules/Ubuntu/Components/Extras/Printers/models/printermodel.h	2017-03-15 17:52:16 +0000
+++ modules/Ubuntu/Components/Extras/Printers/models/printermodel.h	2017-03-15 17:52:16 +0000
@@ -21,7 +21,7 @@
 
 #include "models/jobmodel.h"
 #include "printer/printer.h"
-#include "printer/printersignalhandler.h"
+#include "printer/signalratelimiter.h"
 
 #include <QAbstractListModel>
 #include <QByteArray>
@@ -104,7 +104,7 @@
     PrinterBackend *m_backend;
 
     QList<QSharedPointer<Printer>> m_printers;
-    PrinterSignalHandler m_signalHandler;
+    SignalRateLimiter m_signalHandler;
 
 private Q_SLOTS:
     void printerLoaded(QSharedPointer<Printer> printer);

=== modified file 'modules/Ubuntu/Components/Extras/Printers/printer/printerjob.cpp'
--- modules/Ubuntu/Components/Extras/Printers/printer/printerjob.cpp	2017-03-15 17:52:16 +0000
+++ modules/Ubuntu/Components/Extras/Printers/printer/printerjob.cpp	2017-03-15 17:52:16 +0000
@@ -178,6 +178,7 @@
         }
     }
 
+    setImpressionsCompleted(attributes.value("impressionsCompleted").toInt());
     setLandscape(attributes.value("landscape").toBool());
     setMessages(attributes.value("messages").toStringList());
 
@@ -204,6 +205,12 @@
     }
 
     setReverse(attributes.value("OutputOrder").toString() == "Reverse");
+
+    // If there was a state then set it
+    if (attributes.contains("State")) {
+        setState(static_cast<PrinterEnum::JobState>(attributes.value("State").toInt()));
+    }
+
     setSize(attributes.value("Size").toInt());
     setUser(attributes.value("User").toString());
 }

=== renamed file 'modules/Ubuntu/Components/Extras/Printers/printer/printersignalhandler.cpp' => 'modules/Ubuntu/Components/Extras/Printers/printer/signalratelimiter.cpp'
--- modules/Ubuntu/Components/Extras/Printers/printer/printersignalhandler.cpp	2017-02-21 10:46:29 +0000
+++ modules/Ubuntu/Components/Extras/Printers/printer/signalratelimiter.cpp	2017-03-15 17:52:16 +0000
@@ -14,9 +14,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "printersignalhandler.h"
+#include "signalratelimiter.h"
 
-PrinterSignalHandler::PrinterSignalHandler(int triggerEventDelay,
+SignalRateLimiter::SignalRateLimiter(int triggerEventDelay,
                                            QObject *parent)
     : QObject(parent)
 {
@@ -24,11 +24,11 @@
     connect(&m_timer, SIGNAL(timeout()), this, SLOT(process()));
 }
 
-PrinterSignalHandler::~PrinterSignalHandler()
+SignalRateLimiter::~SignalRateLimiter()
 {
 }
 
-void PrinterSignalHandler::process()
+void SignalRateLimiter::process()
 {
     Q_FOREACH(auto printer, m_unprocessed) {
         Q_EMIT printerModified(printer);
@@ -37,7 +37,7 @@
     m_timer.stop();
 }
 
-void PrinterSignalHandler::onPrinterModified(
+void SignalRateLimiter::onPrinterModified(
     const QString &text, const QString &printerUri,
     const QString &printerName, uint printerState,
     const QString &printerStateReason, bool acceptingJobs)
@@ -49,11 +49,22 @@
     Q_UNUSED(printerStateReason);
     Q_UNUSED(acceptingJobs);
 
+    // Track when the first item was added to the unprocessed queue
+    if (m_unprocessed.count() == 0) {
+        m_unprocessed_time = QDateTime::currentDateTime();
+    }
+
     m_unprocessed << printerName;
     m_timer.start();
+
+    // Ensure that process is fired if we have reached four times
+    // longer than the timer, this is due to many signals coming in rapidly
+    if (m_unprocessed_time.msecsTo(QDateTime::currentDateTime()) > m_timer.interval() * 4) {
+        process();
+    }
 }
 
-void PrinterSignalHandler::onPrinterStateChanged(
+void SignalRateLimiter::onPrinterStateChanged(
     const QString &text, const QString &printerUri,
     const QString &printerName, uint printerState,
     const QString &printerStateReason, bool acceptingJobs)
@@ -64,6 +75,17 @@
     Q_UNUSED(printerStateReason);
     Q_UNUSED(acceptingJobs);
 
+    // Track when the first item was added to the unprocessed queue
+    if (m_unprocessed.count() == 0) {
+        m_unprocessed_time = QDateTime::currentDateTime();
+    }
+
     m_unprocessed << printerName;
     m_timer.start();
+
+    // Ensure that process is fired if we have reached four times
+    // longer than the timer, this is due to many signals coming in rapidly
+    if (m_unprocessed_time.msecsTo(QDateTime::currentDateTime()) > m_timer.interval() * 4) {
+        process();
+    }
 }

=== renamed file 'modules/Ubuntu/Components/Extras/Printers/printer/printersignalhandler.h' => 'modules/Ubuntu/Components/Extras/Printers/printer/signalratelimiter.h'
--- modules/Ubuntu/Components/Extras/Printers/printer/printersignalhandler.h	2017-02-21 10:46:29 +0000
+++ modules/Ubuntu/Components/Extras/Printers/printer/signalratelimiter.h	2017-03-15 17:52:16 +0000
@@ -14,24 +14,26 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef USC_PRINTER_SIGNAL_HANDLER_H
-#define USC_PRINTER_SIGNAL_HANDLER_H
+#ifndef USC_SIGNAL_RATE_LIMITER_H
+#define USC_SIGNAL_RATE_LIMITER_H
 
 #include "printers_global.h"
 
+#include <QDateTime>
 #include <QObject>
 #include <QSet>
 #include <QTimer>
 
-class PRINTERS_DECL_EXPORT PrinterSignalHandler : public QObject
+class PRINTERS_DECL_EXPORT SignalRateLimiter : public QObject
 {
     Q_OBJECT
     QTimer m_timer;
     QSet<QString> m_unprocessed;
+    QDateTime m_unprocessed_time;
 public:
-    explicit PrinterSignalHandler(int triggerEventDelay = 500,
+    explicit SignalRateLimiter(int triggerEventDelay = 500,
                                   QObject *parent = Q_NULLPTR);
-    ~PrinterSignalHandler();
+    ~SignalRateLimiter();
 
 public Q_SLOTS:
     void onPrinterModified(
@@ -52,4 +54,4 @@
     void printerModified(const QString &printerName);
 };
 
-#endif // USC_PRINTER_SIGNAL_HANDLER_H
+#endif // USC_SIGNAL_RATE_LIMITERR_H

=== modified file 'modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp'
--- modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp	2017-03-15 17:52:16 +0000
+++ modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp	2017-03-15 17:52:16 +0000
@@ -65,6 +65,13 @@
 
         jobAdded(m_jobs.getJob(printerName, jobId));
     });
+
+    // If the jobModel forces a refresh, load extended attributes for the job
+    connect(&m_jobs, &JobModel::forceJobRefresh, [this](
+            const QString &printerName, const int jobId) {
+       jobAdded(m_jobs.getJob(printerName, jobId));
+    });
+
     connect(&m_model, &QAbstractItemModel::rowsInserted, [this](
             const QModelIndex &parent, int first, int) {
         auto printer = m_model.data(

=== modified file 'po/ubuntu-ui-extras.pot'
--- po/ubuntu-ui-extras.pot	2017-03-10 13:15:27 +0000
+++ po/ubuntu-ui-extras.pot	2017-03-15 17:52:16 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-ui-extras\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-10 14:13+0100\n"
+"POT-Creation-Date: 2017-03-15 17:39+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -99,7 +99,7 @@
 msgid "Stopped"
 msgstr ""
 
-#: modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp:332
+#: modules/Ubuntu/Components/Extras/Printers/printers/printers.cpp:367
 msgid "Test page"
 msgstr ""
 

=== modified file 'tests/unittests/Printers/CMakeLists.txt'
--- tests/unittests/Printers/CMakeLists.txt	2017-03-08 16:13:02 +0000
+++ tests/unittests/Printers/CMakeLists.txt	2017-03-15 17:52:16 +0000
@@ -45,9 +45,9 @@
 target_link_libraries(testPrintersJobFilter UbuntuComponentsExtrasPrintersQml Qt5::Test Qt5::Gui)
 add_test(tst_jobfilter testPrintersJobFilter)
 
-add_executable(testPrintersSignalHandler tst_signalhandler.cpp ${MOCK_SOURCES})
-target_link_libraries(testPrintersSignalHandler UbuntuComponentsExtrasPrintersQml Qt5::Test Qt5::Gui)
-add_test(tst_signalhandler testPrintersSignalHandler)
+add_executable(testPrintersSignalRateLimiter tst_signalratelimiter.cpp ${MOCK_SOURCES})
+target_link_libraries(testPrintersSignalRateLimiter UbuntuComponentsExtrasPrintersQml Qt5::Test Qt5::Gui)
+add_test(tst_signalratelimiter testPrintersSignalRateLimiter)
 
 add_executable(testPrintersDevice tst_printerdevice.cpp ${MOCK_SOURCES})
 target_link_libraries(testPrintersDevice UbuntuComponentsExtrasPrintersQml Qt5::Test Qt5::Gui)

=== modified file 'tests/unittests/Printers/mockbackend.h'
--- tests/unittests/Printers/mockbackend.h	2017-03-15 17:52:16 +0000
+++ tests/unittests/Printers/mockbackend.h	2017-03-15 17:52:16 +0000
@@ -236,6 +236,7 @@
                 attributes.insert("CompletedTime", job->completedTime());
                 attributes.insert("CreationTime", job->creationTime());
                 attributes.insert("Duplex", Utils::duplexModeToPpdChoice(job->getDuplexMode()));
+                attributes.insert("impressionsCompleted", job->impressionsCompleted());
                 attributes.insert("landscape", job->landscape());
                 attributes.insert("messages", job->messages());
                 if (job->printRangeMode() == PrinterEnum::PrintRange::AllPages) {
@@ -246,6 +247,7 @@
                 attributes.insert("ProcessingTime", job->processingTime());
                 attributes.insert("Quality", job->getPrintQuality().name);
                 attributes.insert("OutputOrder", job->reverse() ? "Reverse" : "Normal");
+                attributes.insert("State", static_cast<int>(job->state()));
                 attributes.insert("Size", job->size());
                 attributes.insert("User", job->user());
 

=== renamed file 'tests/unittests/Printers/tst_signalhandler.cpp' => 'tests/unittests/Printers/tst_signalratelimiter.cpp'
--- tests/unittests/Printers/tst_signalhandler.cpp	2017-02-21 10:46:29 +0000
+++ tests/unittests/Printers/tst_signalratelimiter.cpp	2017-03-15 17:52:16 +0000
@@ -14,31 +14,51 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "printer/printersignalhandler.h"
+#include "printer/signalratelimiter.h"
 
+#include <QDateTime>
 #include <QDebug>
 #include <QObject>
 #include <QSignalSpy>
 #include <QTest>
 
-class TestSignalHandler : public QObject
+class TestSignalRateLimiter : public QObject
 {
     Q_OBJECT
 private Q_SLOTS:
     void testEmptyCount()
     {
-        PrinterSignalHandler handler(500);
+        SignalRateLimiter handler(500);
         QSignalSpy modifiedSpy(&handler, SIGNAL(printerModified(const QString&)));
 
-        for (int i = 0; i < 500; i++) {
+        for (int i = 0; i < 20; i++) {
             handler.onPrinterStateChanged("spam!", "ipp://bar/baz", "printer-a", 0, "none", true);
         }
 
         modifiedSpy.wait(1000);
         QCOMPARE(modifiedSpy.count(), 1);
     }
+    void testUnprocessedTime()
+    {
+        // Keep sending jobs with no gap for longer than four times the
+        // event delay. Check that two signals are emitted.
+        // One from the forcing of the signal and one as the timer finishes
+
+        int eventDelay = 200;
+        SignalRateLimiter handler(eventDelay);
+        QSignalSpy modifiedSpy(&handler, SIGNAL(printerModified(const QString&)));
+
+        QDateTime start = QDateTime::currentDateTime();
+
+        while (start.msecsTo(QDateTime::currentDateTime()) < eventDelay * 5) {
+            handler.onPrinterStateChanged("spam!", "ipp://foo/bar", "printer-a", 0, "none", true);
+        }
+
+        modifiedSpy.wait(eventDelay * 2);
+        QCOMPARE(modifiedSpy.count(), 2);
+    }
 };
 
-QTEST_GUILESS_MAIN(TestSignalHandler)
-#include "tst_signalhandler.moc"
+QTEST_GUILESS_MAIN(TestSignalRateLimiter)
+#include "tst_signalratelimiter.moc"