AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Autotest: Check where global event filters get run

Browse Source 
Global (application-level) event filters are supposed to be run only in
the main thread, so ensure that it is the case.

Change-Id: I27eaacb532114dd188c4ffff13d5a17d991b8bd2
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
Thiago Macieira 2015-04-16 16:13:37 -07:00
parent e70d4b9899
commit 54589f2932
2 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp
View File

@ -1,6 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Copyright (C) 2015 Intel Corporation.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the test suite of the Qt Toolkit.
@ -60,6 +61,23 @@ public:
}
};
class ThreadedEventReceiver : public QObject
{
Q_OBJECT
public:
QList<int> recordedEvents;
bool event(QEvent *event) Q_DECL_OVERRIDE
{
if (event->type() != QEvent::Type(QEvent::User + 1))
return QObject::event(event);
recordedEvents.append(event->type());
QThread::currentThread()->quit();
QCoreApplication::quit();
moveToThread(0);
return true;
}
};
void tst_QCoreApplication::sendEventsOnProcessEvents()
{
int argc = 1;
@ -797,6 +815,43 @@ void tst_QCoreApplication::QTBUG31606_QEventDestructorDeadLock()
QVERIFY(spy.recordedEvents.contains(QEvent::User + 2));
}
// this is almost identical to sendEventsOnProcessEvents
void tst_QCoreApplication::applicationEventFilters_mainThread()
{
int argc = 1;
char *argv[] = { const_cast<char*>(QTest::currentAppName()) };
TestApplication app(argc, argv);
EventSpy spy;
app.installEventFilter(&spy);
QCoreApplication::postEvent(&app, new QEvent(QEvent::Type(QEvent::User + 1)));
QTimer::singleShot(10, &app, SLOT(quit()));
app.exec();
QVERIFY(spy.recordedEvents.contains(QEvent::User + 1));
}
void tst_QCoreApplication::applicationEventFilters_auxThread()
{
int argc = 1;
char *argv[] = { const_cast<char*>(QTest::currentAppName()) };
TestApplication app(argc, argv);
QThread thread;
ThreadedEventReceiver receiver;
receiver.moveToThread(&thread);
EventSpy spy;
app.installEventFilter(&spy);
// this is very similar to sendEventsOnProcessEvents
QCoreApplication::postEvent(&receiver, new QEvent(QEvent::Type(QEvent::User + 1)));
QTimer::singleShot(1000, &app, SLOT(quit()));
thread.start();
app.exec();
QVERIFY(thread.wait(1000));
QVERIFY(receiver.recordedEvents.contains(QEvent::User + 1));
QVERIFY(!spy.recordedEvents.contains(QEvent::User + 1));
}
static void createQObjectOnDestruction()
{

3
tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.h
View File

@ -1,6 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Copyright (C) 2015 Intel Corporation.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the test suite of the Qt Toolkit.
@ -58,6 +59,8 @@ private slots:
void customEventDispatcher();
void testQuitLock();
void QTBUG31606_QEventDestructorDeadLock();
void applicationEventFilters_mainThread();
void applicationEventFilters_auxThread();
};
#endif // TST_QCOREAPPLICATION_H