Correct searchbox, split view transitions between tabs

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

diff --git a/src/tests/kitemlistcontrollertest.cpp b/src/tests/kitemlistcontrollertest.cpp
index 7dd37bf0a3d60f78e5e56ec888d43ffe0db59073..92d05c4d452d3d68ebf1b4fcf1f2d929db8bca08 100644 (file)
--- a/src/tests/kitemlistcontrollertest.cpp
+++ b/src/tests/kitemlistcontrollertest.cpp
@@ -17,10 +17,6 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 

-#include <qtest_kde.h>
-#include <qtestmouse.h>
-#include <qtestkeyboard.h>
-

 #include "kitemviews/kitemlistcontainer.h"
 #include "kitemviews/kfileitemlistview.h"
 #include "kitemviews/kfileitemmodel.h"
 #include "kitemviews/kitemlistcontainer.h"
 #include "kitemviews/kfileitemlistview.h"
 #include "kitemviews/kfileitemmodel.h"


@@ -29,19 +25,57 @@
 #include "kitemviews/private/kitemlistviewlayouter.h"
 #include "testdir.h"
 
 #include "kitemviews/private/kitemlistviewlayouter.h"
 #include "testdir.h"
 

-#include <KConfigGroup>
-#include <KGlobalSettings>
-
+#include <QTest>

 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsSceneMouseEvent>

+#include <QSignalSpy>
+#include <QProxyStyle>
+
+/**
+ * \class KItemListControllerTestStyle is a proxy style for testing the
+ * KItemListController with different style hint options, e.g. single/double
+ * click activation.
+ */
+class KItemListControllerTestStyle : public QProxyStyle
+{
+    Q_OBJECT
+public:
+    KItemListControllerTestStyle(QStyle* style) :
+        QProxyStyle(style),
+        m_activateItemOnSingleClick((bool)style->styleHint(SH_ItemView_ActivateItemOnSingleClick))
+    {
+    }

 
 

-namespace {
-    const int DefaultTimeout = 2000;
+    void setActivateItemOnSingleClick(bool activateItemOnSingleClick)
+    {
+        m_activateItemOnSingleClick = activateItemOnSingleClick;
+    }
+
+    bool activateItemOnSingleClick() const
+    {
+        return m_activateItemOnSingleClick;
+    }
+
+    int styleHint(StyleHint hint,
+                  const QStyleOption* option = nullptr,
+                  const QWidget* widget = nullptr,
+                  QStyleHintReturn* returnData = nullptr) const Q_DECL_OVERRIDE
+    {
+        switch (hint) {
+        case QStyle::SH_ItemView_ActivateItemOnSingleClick:
+            return (int)activateItemOnSingleClick();
+        default:
+            return QProxyStyle::styleHint(hint, option, widget, returnData);
+        }
+    }
+
+private:
+    bool m_activateItemOnSingleClick;

 };
 
 };
 

-Q_DECLARE_METATYPE(KFileItemListView::ItemLayout);
-Q_DECLARE_METATYPE(Qt::Orientation);
-Q_DECLARE_METATYPE(KItemListController::SelectionBehavior);
-Q_DECLARE_METATYPE(KItemSet);
+Q_DECLARE_METATYPE(KFileItemListView::ItemLayout)
+Q_DECLARE_METATYPE(Qt::Orientation)
+Q_DECLARE_METATYPE(KItemListController::SelectionBehavior)
+Q_DECLARE_METATYPE(KItemSet)

 
 class KItemListControllerTest : public QObject
 {
 
 class KItemListControllerTest : public QObject
 {


@@ -72,6 +106,7 @@ private:
     KFileItemModel* m_model;
     TestDir* m_testDir;
     KItemListContainer* m_container;
     KFileItemModel* m_model;
     TestDir* m_testDir;
     KItemListContainer* m_container;

+    KItemListControllerTestStyle* m_testStyle;

 };
 
 /**
 };
 
 /**


@@ -91,6 +126,8 @@ void KItemListControllerTest::initTestCase()
     m_controller = m_container->controller();
     m_controller->setSelectionBehavior(KItemListController::MultiSelection);
     m_selectionManager = m_controller->selectionManager();
     m_controller = m_container->controller();
     m_controller->setSelectionBehavior(KItemListController::MultiSelection);
     m_selectionManager = m_controller->selectionManager();

+    m_testStyle = new KItemListControllerTestStyle(m_view->style());
+    m_view->setStyle(m_testStyle);

 
     QStringList files;
     files
 
     QStringList files;
     files


@@ -102,10 +139,11 @@ void KItemListControllerTest::initTestCase()
 
     m_testDir->createFiles(files);
     m_model->loadDirectory(m_testDir->url());
 
     m_testDir->createFiles(files);
     m_model->loadDirectory(m_testDir->url());

-    QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(directoryLoadingCompleted()), DefaultTimeout));
+    QSignalSpy spyDirectoryLoadingCompleted(m_model, SIGNAL(directoryLoadingCompleted()));
+    QVERIFY(spyDirectoryLoadingCompleted.wait());

 
     m_container->show();
 
     m_container->show();

-    QTest::qWaitForWindowShown(m_container);
+    QTest::qWaitForWindowExposed(m_container);

 }
 
 void KItemListControllerTest::cleanupTestCase()
 }
 
 void KItemListControllerTest::cleanupTestCase()


@@ -172,7 +210,7 @@ struct ViewState {
 
 // We have to define a typedef for the pair in order to make the test compile.
 typedef QPair<KeyPress, ViewState> keyPressViewStatePair;
 
 // We have to define a typedef for the pair in order to make the test compile.
 typedef QPair<KeyPress, ViewState> keyPressViewStatePair;

-Q_DECLARE_METATYPE(QList<keyPressViewStatePair>);
+Q_DECLARE_METATYPE(QList<keyPressViewStatePair>)

 
 /**
  * This function provides the data for the actual test function
 
 /**
  * This function provides the data for the actual test function


@@ -423,7 +461,7 @@ void KItemListControllerTest::testKeyboardNavigation_data()
                         selectionBehaviorNames[selectionBehavior] + ", " +
                         groupingEnabledNames[groupingEnabled];
 
                         selectionBehaviorNames[selectionBehavior] + ", " +
                         groupingEnabledNames[groupingEnabled];
 

-                    const QByteArray testNameAscii = testName.toAscii();
+                    const QByteArray testNameAscii = testName.toLatin1();

 
                     QTest::newRow(testNameAscii.data())
                         << layout
 
                     QTest::newRow(testNameAscii.data())
                         << layout


@@ -534,10 +572,7 @@ void KItemListControllerTest::testMouseClickActivation()
     const QPointF pos = m_view->itemContextRect(0).center();
 
     // Save the "single click" setting.
     const QPointF pos = m_view->itemContextRect(0).center();
 
     // Save the "single click" setting.

-    const bool restoreKGlobalSettingsSingleClick = KGlobalSettings::singleClick();
-
-    KConfig config("kcminputrc");
-    KConfigGroup group = config.group("KDE");
+    const bool restoreSettingsSingleClick = m_testStyle->activateItemOnSingleClick();

 
     QGraphicsSceneMouseEvent mousePressEvent(QEvent::GraphicsSceneMousePress);
     mousePressEvent.setPos(pos);
 
     QGraphicsSceneMouseEvent mousePressEvent(QEvent::GraphicsSceneMousePress);
     mousePressEvent.setPos(pos);


@@ -552,43 +587,14 @@ void KItemListControllerTest::testMouseClickActivation()
     QSignalSpy spyItemActivated(m_controller, SIGNAL(itemActivated(int)));
 
     // Default setting: single click activation.
     QSignalSpy spyItemActivated(m_controller, SIGNAL(itemActivated(int)));
 
     // Default setting: single click activation.

-    group.writeEntry("SingleClick", true, KConfig::Persistent|KConfig::Global);
-    config.sync();
-    KGlobalSettings::self()->emitChange(KGlobalSettings::SettingsChanged, KGlobalSettings::SETTINGS_MOUSE);
-
-    int iterations = 0;
-    const int maxIterations = 20;
-    while (!KGlobalSettings::singleClick() && iterations < maxIterations) {
-        QTest::qWait(50);
-        ++iterations;
-    }
-
-    if (!KGlobalSettings::singleClick()) {
-        // TODO: Try to find a way to make sure that changing the global setting works.
-        QSKIP("Failed to change the KGlobalSettings::singleClick() setting!", SkipSingle);
-    }
-
+    m_testStyle->setActivateItemOnSingleClick(true);

     m_view->event(&mousePressEvent);
     m_view->event(&mouseReleaseEvent);
     QCOMPARE(spyItemActivated.count(), 1);
     spyItemActivated.clear();
 
     // Set the global setting to "double click activation".
     m_view->event(&mousePressEvent);
     m_view->event(&mouseReleaseEvent);
     QCOMPARE(spyItemActivated.count(), 1);
     spyItemActivated.clear();
 
     // Set the global setting to "double click activation".

-    group.writeEntry("SingleClick", false, KConfig::Persistent|KConfig::Global);
-    config.sync();
-    KGlobalSettings::self()->emitChange(KGlobalSettings::SettingsChanged, KGlobalSettings::SETTINGS_MOUSE);
-
-    iterations = 0;
-    while (KGlobalSettings::singleClick() && iterations < maxIterations) {
-        QTest::qWait(50);
-        ++iterations;
-    }
-
-    if (KGlobalSettings::singleClick()) {
-        // TODO: Try to find a way to make sure that changing the global setting works.
-        QSKIP("Failed to change the KGlobalSettings::singleClick() setting!", SkipSingle);
-    }
-
+    m_testStyle->setActivateItemOnSingleClick(false);

     m_view->event(&mousePressEvent);
     m_view->event(&mouseReleaseEvent);
     QCOMPARE(spyItemActivated.count(), 0);
     m_view->event(&mousePressEvent);
     m_view->event(&mouseReleaseEvent);
     QCOMPARE(spyItemActivated.count(), 0);


@@ -609,21 +615,7 @@ void KItemListControllerTest::testMouseClickActivation()
     spyItemActivated.clear();
 
     // Set the global setting back to "single click activation".
     spyItemActivated.clear();
 
     // Set the global setting back to "single click activation".

-    group.writeEntry("SingleClick", true, KConfig::Persistent|KConfig::Global);
-    config.sync();
-    KGlobalSettings::self()->emitChange(KGlobalSettings::SettingsChanged, KGlobalSettings::SETTINGS_MOUSE);
-
-    iterations = 0;
-    while (!KGlobalSettings::singleClick() && iterations < maxIterations) {
-        QTest::qWait(50);
-        ++iterations;
-    }
-
-    if (!KGlobalSettings::singleClick()) {
-        // TODO: Try to find a way to make sure that changing the global setting works.
-        QSKIP("Failed to change the KGlobalSettings::singleClick() setting!", SkipSingle);
-    }
-
+    m_testStyle->setActivateItemOnSingleClick(true);

     m_view->event(&mousePressEvent);
     m_view->event(&mouseReleaseEvent);
     QCOMPARE(spyItemActivated.count(), 1);
     m_view->event(&mousePressEvent);
     m_view->event(&mouseReleaseEvent);
     QCOMPARE(spyItemActivated.count(), 1);


@@ -638,20 +630,7 @@ void KItemListControllerTest::testMouseClickActivation()
 
     // Restore previous settings.
     m_controller->setSingleClickActivationEnforced(true);
 
     // Restore previous settings.
     m_controller->setSingleClickActivationEnforced(true);

-    group.writeEntry("SingleClick", restoreKGlobalSettingsSingleClick, KConfig::Persistent|KConfig::Global);
-    config.sync();
-    KGlobalSettings::self()->emitChange(KGlobalSettings::SettingsChanged, KGlobalSettings::SETTINGS_MOUSE);
-
-    iterations = 0;
-    while (KGlobalSettings::singleClick() != restoreKGlobalSettingsSingleClick && iterations < maxIterations) {
-        QTest::qWait(50);
-        ++iterations;
-    }
-
-    if (KGlobalSettings::singleClick() != restoreKGlobalSettingsSingleClick) {
-        // TODO: Try to find a way to make sure that changing the global setting works.
-        QSKIP("Failed to change the KGlobalSettings::singleClick() setting!", SkipSingle);
-    }
+    m_testStyle->setActivateItemOnSingleClick(restoreSettingsSingleClick);

 }
 
 void KItemListControllerTest::adjustGeometryForColumnCount(int count)
 }
 
 void KItemListControllerTest::adjustGeometryForColumnCount(int count)


@@ -670,6 +649,6 @@ void KItemListControllerTest::adjustGeometryForColumnCount(int count)
     }
 }
 
     }
 }
 

-QTEST_KDEMAIN(KItemListControllerTest, GUI)
+QTEST_MAIN(KItemListControllerTest)

 
 #include "kitemlistcontrollertest.moc"
 
 #include "kitemlistcontrollertest.moc"