1 files changed, 98 insertions, 1 deletions

diff --git a/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp b/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp
index 3221587300..15a39b62c0 100644
--- a/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp
+++ b/tests/auto/corelib/kernel/qwineventnotifier/tst_qwineventnotifier.cpp
@@ -31,6 +31,8 @@
 #include <qtimer.h>
 #include <qt_windows.h>
 
+#include <memory>
+
 class tst_QWinEventNotifier : public QObject
 {
     Q_OBJECT
@@ -39,7 +41,9 @@ protected slots:
     void simple_activated();
     void simple_timerSet();
 private slots:
+    void simple_data();
     void simple();
+    void manyNotifiers();
 
 private:
     HANDLE simpleHEvent;
@@ -58,9 +62,17 @@ void tst_QWinEventNotifier::simple_timerSet()
     SetEvent((HANDLE)simpleHEvent);
 }
 
+void tst_QWinEventNotifier::simple_data()
+{
+    QTest::addColumn<bool>("resetManually");
+    QTest::newRow("manual_reset") << true;
+    QTest::newRow("auto_reset") << false;
+}
+
 void tst_QWinEventNotifier::simple()
 {
-    simpleHEvent = CreateEvent(0, true, false, 0);
+    QFETCH(bool, resetManually);
+    simpleHEvent = CreateEvent(0, resetManually, false, 0);
     QVERIFY(simpleHEvent);
 
     QWinEventNotifier n(simpleHEvent);
@@ -87,6 +99,91 @@ void tst_QWinEventNotifier::simple()
     QVERIFY(simpleActivated);
 }
 
+class EventWithNotifier : public QObject
+{
+    Q_OBJECT
+public:
+    EventWithNotifier()
+    {
+        connect(&notifier, &QWinEventNotifier::activated,
+                this, &EventWithNotifier::onNotifierActivated);
+        notifier.setHandle(CreateEvent(0, TRUE, FALSE, 0));
+        notifier.setEnabled(true);
+
+        static int nextIndex = 0;
+        idx = nextIndex++;
+    }
+
+    ~EventWithNotifier()
+    {
+        notifier.setEnabled(false);
+        CloseHandle(notifier.handle());
+    }
+
+    HANDLE eventHandle() const { return notifier.handle(); }
+    int numberOfTimesActivated() const { return activatedCount; }
+
+signals:
+    void activated();
+
+public slots:
+    void onNotifierActivated()
+    {
+        ResetEvent(notifier.handle());
+        activatedCount++;
+        emit activated();
+    }
+
+private:
+    QWinEventNotifier notifier;
+    int activatedCount = 0;
+    int idx = 0;
+};
+
+void tst_QWinEventNotifier::manyNotifiers()
+{
+    const size_t maxEvents = 100;
+    const size_t middleEvenEvent = maxEvents / 2;
+    Q_ASSERT(middleEvenEvent % 2 == 0);
+    using EventWithNotifierPtr = std::unique_ptr<EventWithNotifier>;
+    std::vector<EventWithNotifierPtr> events(maxEvents);
+    std::generate(events.begin(), events.end(), [] () {
+        return EventWithNotifierPtr(new EventWithNotifier);
+    });
+
+    QTestEventLoop loop;
+    auto connection = connect(events.at(8).get(), &EventWithNotifier::activated, &loop, &QTestEventLoop::exitLoop);
+    for (const auto &ewn : events) {
+        connect(ewn.get(), &EventWithNotifier::activated, [&events, &loop] () {
+            if (std::all_of(events.cbegin(), events.cend(),
+                    [] (const EventWithNotifierPtr &ewn) {
+                            return ewn->numberOfTimesActivated() > 0; })) {
+                loop.exitLoop();
+            }
+        });
+    }
+
+    // Activate all even events before running the event loop.
+    for (size_t i = 0; i < events.size(); i += 2)
+        SetEvent(events.at(i)->eventHandle());
+
+    // Wait until event notifier with index 8 has been activated.
+    loop.enterLoop(30);
+    QObject::disconnect(connection);
+
+    // Activate all odd events after the event loop has run for a bit.
+    for (size_t i = 1; i < events.size(); i += 2)
+        SetEvent(events.at(i)->eventHandle());
+
+    // Wait until all event notifiers have fired.
+    loop.enterLoop(30);
+
+    // All notifiers must have been activated exactly once.
+    QVERIFY(std::all_of(events.cbegin(), events.cend(), [] (const EventWithNotifierPtr &ewn) {
+        return ewn->numberOfTimesActivated() == 1;
+    }));
+}
+
 QTEST_MAIN(tst_QWinEventNotifier)
 
 #include "tst_qwineventnotifier.moc"