Skip to content

Commit f2dc66a

Browse files
hebastoknst
authored andcommitted
Merge bitcoin-core/gui#335: test: Use QSignalSpy instead of QEventLoop
7eea659 qt, test: use qsignalspy instead of qeventloop (Jarol Rodriguez) Pull request description: This PR refactors our GUI `apptests` to use [QSignalSpy](https://doc.qt.io/qt-5/qsignalspy.html) instead of [QEventLoop](https://doc.qt.io/qt-5/qeventloop.html). `QSignalSpy` is more appropriate for our GUI test's as it is purpose-built for testing emission of signals and sets up its own `QEventLoop` when the `wait` function is called. ACKs for top commit: hebasto: ACK 7eea659, tested on Linux Mint 20.1 (Qt 5.12.8). promag: Code review ACK 7eea659. Tree-SHA512: 3adddbcc5efd726302b606980c9923025c44bb8ee16cb8a183e633e423179c0822db66de9ccba20dc5124fff34af4151a379c9cd18130625c60789ce809ee6fd
1 parent 913f2fd commit f2dc66a

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/qt/test/apptests.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
#endif
2121

2222
#include <QAction>
23-
#include <QEventLoop>
2423
#include <QLineEdit>
2524
#include <QScopedPointer>
2625
#include <QSettings>
26+
#include <QSignalSpy>
2727
#include <QTest>
2828
#include <QTextEdit>
2929
#include <QtGlobal>
@@ -34,13 +34,14 @@ namespace {
3434
//! Call getblockchaininfo RPC and check first field of JSON output.
3535
void TestRpcCommand(RPCConsole* console)
3636
{
37-
QEventLoop loop;
3837
QTextEdit* messagesWidget = console->findChild<QTextEdit*>("messagesWidget");
39-
QObject::connect(messagesWidget, &QTextEdit::textChanged, &loop, &QEventLoop::quit);
4038
QLineEdit* lineEdit = console->findChild<QLineEdit*>("lineEdit");
39+
QSignalSpy mw_spy(messagesWidget, &QTextEdit::textChanged);
40+
QVERIFY(mw_spy.isValid());
4141
QTest::keyClicks(lineEdit, "getblockchaininfo");
4242
QTest::keyClick(lineEdit, Qt::Key_Return);
43-
loop.exec();
43+
QVERIFY(mw_spy.wait(1000));
44+
QCOMPARE(mw_spy.count(), 2);
4445
QString output = messagesWidget->toPlainText();
4546
UniValue value;
4647
value.read(output.right(output.size() - output.indexOf("{")).toStdString());

0 commit comments

Comments
 (0)