2 files changed, 116 insertions, 0 deletions

diff --git a/tests/test_mainwindow.cpp b/tests/test_mainwindow.cpp
index 6e300bf..8b60e37 100644
--- a/tests/test_mainwindow.cpp
+++ b/tests/test_mainwindow.cpp
@@ -88,6 +88,9 @@ private slots:
     void markReadTimerIsNotArmedForAReadThread();
     void aConfirmedEditArmsTheAutoSync();
     void autoSyncDebouncesABurstOfEdits();
+    void aSearchFromThePaneReplacesTheQuery();
+    void aSearchFromThePaneCanNarrowTheQuery();
+    void narrowingAnEmptyQueryBarIsAPlainSearch();
     void autoSyncIsNotArmedWhenDisabledOrWithNothingPending();
     void autoSyncSkipsWhileABackgroundSyncIsRunning();
     void aSuccessfulSyncRefreshesRatherThanRerunningTheQuery();
@@ -3725,6 +3728,66 @@ void TestMainWindow::autoSyncDebouncesABurstOfEdits()
              1);
 }
 
+void TestMainWindow::aSearchFromThePaneReplacesTheQuery()
+{
+    const Config config;
+    MainWindow window(config);
+
+    QLineEdit *queryEdit =
+        window.findChild<QLineEdit *>(QStringLiteral("queryEdit"));
+    QVERIFY2(queryEdit, "no query bar: the window was never built");
+
+    MessageView *view = window.findChild<MessageView *>();
+    QVERIFY2(view, "no message view");
+
+    queryEdit->setText(QStringLiteral("tag:inbox"));
+    emit view->searchRequested(QStringLiteral("from:\"foo@example.org\""), false);
+
+    QCOMPARE(queryEdit->text(), QStringLiteral("from:\"foo@example.org\""));
+}
+
+void TestMainWindow::aSearchFromThePaneCanNarrowTheQuery()
+{
+    // The case the feature exists for: a query returning a thousand threads is
+    // narrowed by adding a condition. BOTH sides are parenthesised, because
+    // 'a or b AND c' binds as 'a or (b AND c)', which WIDENS a search the user
+    // asked to narrow, and notmuch reports no error for it.
+    const Config config;
+    MainWindow window(config);
+
+    QLineEdit *queryEdit =
+        window.findChild<QLineEdit *>(QStringLiteral("queryEdit"));
+    QVERIFY2(queryEdit, "no query bar: the window was never built");
+
+    MessageView *view = window.findChild<MessageView *>();
+    QVERIFY2(view, "no message view");
+
+    queryEdit->setText(QStringLiteral("tag:inbox or tag:flagged"));
+    emit view->searchRequested(QStringLiteral("from:\"foo@example.org\""), true);
+
+    QCOMPARE(queryEdit->text(),
+             QStringLiteral("(tag:inbox or tag:flagged) AND (from:\"foo@example.org\")"));
+}
+
+void TestMainWindow::narrowingAnEmptyQueryBarIsAPlainSearch()
+{
+    // Rather than "() AND (x)", which matches nothing.
+    const Config config;
+    MainWindow window(config);
+
+    QLineEdit *queryEdit =
+        window.findChild<QLineEdit *>(QStringLiteral("queryEdit"));
+    QVERIFY2(queryEdit, "no query bar: the window was never built");
+
+    MessageView *view = window.findChild<MessageView *>();
+    QVERIFY2(view, "no message view");
+
+    queryEdit->clear();
+    emit view->searchRequested(QStringLiteral("tag:inbox"), true);
+
+    QCOMPARE(queryEdit->text(), QStringLiteral("tag:inbox"));
+}
+
 void TestMainWindow::autoSyncIsNotArmedWhenDisabledOrWithNothingPending()
 {
     // A negative delay is the switch that restores the pre-0.16.0 behaviour, so
diff --git a/tests/test_messageview.cpp b/tests/test_messageview.cpp
index f83a377..edcba03 100644
--- a/tests/test_messageview.cpp
+++ b/tests/test_messageview.cpp
@@ -24,6 +24,7 @@
 #include <QtTest>
 
 #include "htmlbuilder.h"
+#include "messagedetailsdialog.h"
 #include "messageview.h"
 #include "mimeparser.h"
 
@@ -53,6 +54,7 @@ private slots:
     void headerOffersNoSenderForARealThread();
     void headerOffersNothingForAnAbsentField();
     void bodySelectionBecomesAQuotedSearch();
+    void aSearchFromTheDetailsDialogClosesIt();
 
 private:
     QWebEngineView *webViewOf(MessageView *view) const
@@ -697,5 +699,56 @@ void TestMessageView::bodySelectionBecomesAQuotedSearch()
                  .label.isEmpty());
 }
 
+void TestMessageView::aSearchFromTheDetailsDialogClosesIt()
+{
+    // The dialog is modal. Without closing it, the query runs and the thread
+    // list repaints BEHIND a window the user still has to dismiss, so the
+    // search looks like it did nothing. The dialog also describes m_items,
+    // which the new query is about to replace.
+    MessageView view;
+    view.showThread({ oneMessage() });
+
+    QSignalSpy spy(&view, &MessageView::searchRequested);
+    QVERIFY(spy.isValid());
+
+    // showDetailsDialog() blocks in exec(), so the dialog has to be driven
+    // from a timer once it is up.
+    bool foundTheDialog = false;
+    QTimer::singleShot(0, &view, [&view, &foundTheDialog]() {
+        auto *dialog = view.findChild<MessageDetailsDialog *>();
+        if (!dialog) {
+            // Never leave exec() spinning: a missing dialog must fail the test,
+            // not hang the suite.
+            QApplication::exit(1);
+            return;
+        }
+        foundTheDialog = true;
+
+        const QList<HeaderRow> rows = dialog->rows();
+        const auto from = std::find_if(
+            rows.cbegin(), rows.cend(), [](const HeaderRow &row) {
+                return row.field == QStringLiteral("from");
+            });
+        if (from == rows.cend()) {
+            dialog->reject();
+            return;
+        }
+
+        dialog->requestSearch(*from, false);
+    });
+
+    view.showDetailsDialog();
+
+    QVERIFY2(foundTheDialog, "the details dialog never appeared");
+    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.at(0).at(0).toString(),
+             QStringLiteral("from:\"Sender <sender@example.org>\""));
+
+    // exec() returned, which is the assertion: the dialog closed on its own
+    // rather than waiting for the user to dismiss it.
+    QVERIFY(!view.findChild<MessageDetailsDialog *>()
+            || !view.findChild<MessageDetailsDialog *>()->isVisible());
+}
+
 QTEST_MAIN(TestMessageView)
 #include "test_messageview.moc"