filenamesearch:/ define a title for the query

[dolphin.git] / src / tests / kitemlistkeyboardsearchmanagertest.cpp

diff --git a/src/tests/kitemlistkeyboardsearchmanagertest.cpp b/src/tests/kitemlistkeyboardsearchmanagertest.cpp
index cf15324e2789fa3e292c9c29a99aa46797c0158e..53ef9ec3cac349d1baba9d14ddae401b00adac5b 100644 (file)
--- a/src/tests/kitemlistkeyboardsearchmanagertest.cpp
+++ b/src/tests/kitemlistkeyboardsearchmanagertest.cpp
@@ -17,10 +17,11 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include <qtest_kde.h>
-
 #include "kitemviews/private/kitemlistkeyboardsearchmanager.h"
 
+#include <QTest>
+#include <QSignalSpy>
+
 class KItemListKeyboardSearchManagerTest : public QObject
 {
     Q_OBJECT
@@ -31,6 +32,7 @@ private slots:
     void testBasicKeyboardSearch();
     void testAbortedKeyboardSearch();
     void testRepeatedKeyPress();
+    void testPressShift();
 
 private:
     KItemListKeyboardSearchManager m_keyboardSearchManager;
@@ -39,16 +41,17 @@ private:
 void KItemListKeyboardSearchManagerTest::init()
 {
     // Make sure that the previous search string is cleared
-    m_keyboardSearchManager.addKeys("");
+    m_keyboardSearchManager.cancelSearch();
 }
 
 void KItemListKeyboardSearchManagerTest::testBasicKeyboardSearch()
 {
-    QSignalSpy spy(&m_keyboardSearchManager, SIGNAL(changeCurrentItem(QString,bool)));
+    QSignalSpy spy(&m_keyboardSearchManager, &KItemListKeyboardSearchManager::changeCurrentItem);
+    QVERIFY(spy.isValid());
 
     m_keyboardSearchManager.addKeys("f");
     QCOMPARE(spy.count(), 1);
-    QCOMPARE(spy.takeFirst(), QList<QVariant>() << "f" << true);
+    QCOMPARE(spy.takeFirst(), QList<QVariant>() << "f" << false);
 
     m_keyboardSearchManager.addKeys("i");
     QCOMPARE(spy.count(), 1);
@@ -69,11 +72,12 @@ void KItemListKeyboardSearchManagerTest::testAbortedKeyboardSearch()
     // to save time when running this test.
     m_keyboardSearchManager.setTimeout(100);
 
-    QSignalSpy spy(&m_keyboardSearchManager, SIGNAL(changeCurrentItem(QString,bool)));
+    QSignalSpy spy(&m_keyboardSearchManager, &KItemListKeyboardSearchManager::changeCurrentItem);
+    QVERIFY(spy.isValid());
 
     m_keyboardSearchManager.addKeys("f");
     QCOMPARE(spy.count(), 1);
-    QCOMPARE(spy.takeFirst(), QList<QVariant>() << "f" << true);
+    QCOMPARE(spy.takeFirst(), QList<QVariant>() << "f" << false);
 
     m_keyboardSearchManager.addKeys("i");
     QCOMPARE(spy.count(), 1);
@@ -90,6 +94,13 @@ void KItemListKeyboardSearchManagerTest::testAbortedKeyboardSearch()
     m_keyboardSearchManager.addKeys("e");
     QCOMPARE(spy.count(), 1);
     QCOMPARE(spy.takeFirst(), QList<QVariant>() << "le" << false);
+
+    // the selection was deselected, for instance with Esc or a click outside the selection
+    m_keyboardSearchManager.slotSelectionChanged(KItemSet(), KItemSet() << 1);
+
+    m_keyboardSearchManager.addKeys("a");
+    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.takeFirst(), QList<QVariant>() << "a" << false);
 }
 
 void KItemListKeyboardSearchManagerTest::testRepeatedKeyPress()
@@ -100,11 +111,12 @@ void KItemListKeyboardSearchManagerTest::testRepeatedKeyPress()
     // 1. the string contains the repeated key only once, and
     // 2. the bool searchFromNextItem is true.
 
-    QSignalSpy spy(&m_keyboardSearchManager, SIGNAL(changeCurrentItem(QString,bool)));
+    QSignalSpy spy(&m_keyboardSearchManager, &KItemListKeyboardSearchManager::changeCurrentItem);
+    QVERIFY(spy.isValid());
 
     m_keyboardSearchManager.addKeys("p");
     QCOMPARE(spy.count(), 1);
-    QCOMPARE(spy.takeFirst(), QList<QVariant>() << "p" << true);
+    QCOMPARE(spy.takeFirst(), QList<QVariant>() << "p" << false);
 
     m_keyboardSearchManager.addKeys("p");
     QCOMPARE(spy.count(), 1);
@@ -120,6 +132,33 @@ void KItemListKeyboardSearchManagerTest::testRepeatedKeyPress()
     QCOMPARE(spy.takeFirst(), QList<QVariant>() << "pppq" << false);
 }
 
-QTEST_KDEMAIN(KItemListKeyboardSearchManagerTest, NoGUI)
+void KItemListKeyboardSearchManagerTest::testPressShift()
+{
+    // If the user presses Shift, i.e., to get a character like '_',
+    // KItemListController calls the addKeys(QString) method with an empty
+    // string. Make sure that this does not reset the current search. See
+    // https://bugs.kde.org/show_bug.cgi?id=321286
+
+    QSignalSpy spy(&m_keyboardSearchManager, &KItemListKeyboardSearchManager::changeCurrentItem);
+    QVERIFY(spy.isValid());
+
+    // Simulate that the user enters "a_b".
+    m_keyboardSearchManager.addKeys("a");
+    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.takeFirst(), QList<QVariant>() << "a" << false);
+
+    m_keyboardSearchManager.addKeys("");
+    QCOMPARE(spy.count(), 0);
+
+    m_keyboardSearchManager.addKeys("_");
+    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.takeFirst(), QList<QVariant>() << "a_" << false);
+
+    m_keyboardSearchManager.addKeys("b");
+    QCOMPARE(spy.count(), 1);
+    QCOMPARE(spy.takeFirst(), QList<QVariant>() << "a_b" << false);
+}
+
+QTEST_GUILESS_MAIN(KItemListKeyboardSearchManagerTest)
 
 #include "kitemlistkeyboardsearchmanagertest.moc"