1 files changed, 18 insertions, 6 deletions
diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp
index 36d93361dd..a0dce3d997 100644
--- a/src/qt/test/wallettests.cpp
+++ b/src/qt/test/wallettests.cpp
@@ -1,6 +1,7 @@
 #include "wallettests.h"
 
 #include "qt/bitcoinamountfield.h"
+#include "qt/callback.h"
 #include "qt/optionsmodel.h"
 #include "qt/platformstyle.h"
 #include "qt/qvalidatedlineedit.h"
@@ -22,9 +23,7 @@ namespace
 //! Press "Yes" button in modal send confirmation dialog.
 void ConfirmSend()
 {
-    QTimer* timer = new QTimer;
-    timer->setSingleShot(true);
-    QObject::connect(timer, &QTimer::timeout, []() {
+    QTimer::singleShot(0, makeCallback([](Callback* callback) {
         for (QWidget* widget : QApplication::topLevelWidgets()) {
             if (widget->inherits("SendConfirmationDialog")) {
                 SendConfirmationDialog* dialog = qobject_cast<SendConfirmationDialog*>(widget);
@@ -33,8 +32,8 @@ void ConfirmSend()
                 button->click();
             }
         }
-    });
-    timer->start(0);
+        delete callback;
+    }), SLOT(call()));
 }
 
 //! Send coins to address and return txid.
@@ -69,13 +68,26 @@ QModelIndex FindTx(const QAbstractItemModel& model, const uint256& txid)
 }
 
 //! Simple qt wallet tests.
+//
+// Test widgets can be debugged interactively calling show() on them and
+// manually running the event loop, e.g.:
+//
+//     sendCoinsDialog.show();
+//     QEventLoop().exec();
+//
+// This also requires overriding the default minimal Qt platform:
+//
+//     src/qt/test/test_bitcoin-qt -platform xcb      # Linux
+//     src/qt/test/test_bitcoin-qt -platform windows  # Windows
+//     src/qt/test/test_bitcoin-qt -platform cocoa    # macOS
 void WalletTests::walletTests()
 {
     // Set up wallet and chain with 101 blocks (1 mature block for spending).
     TestChain100Setup test;
     test.CreateAndProcessBlock({}, GetScriptForRawPubKey(test.coinbaseKey.GetPubKey()));
     bitdb.MakeMock();
-    CWallet wallet("wallet_test.dat");
+    std::unique_ptr<CWalletDBWrapper> dbw(new CWalletDBWrapper(&bitdb, "wallet_test.dat"));
+    CWallet wallet(std::move(dbw));
     bool firstRun;
     wallet.LoadWallet(firstRun);
     {