From dd565d2d4c7e9b766bc9f575d803ebaad71b33b7 Mon Sep 17 00:00:00 2001
From: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
Date: Fri, 20 Jan 2012 17:57:21 +0200
Subject: QGuiApplication::focusObject() to replace QInputPanel::inputItem()

* Deprecated QInputPanel::inputWindow() which is already
  just returning QGuiApplication::activeWindow()
* Deprecated QInputPanel::inputItem() and introduced
  QGuiApplication::focusObject(). Input methods can check
  input method support by Qt::ImEnabled query.

Change-Id: I70a9c1c3f79aadb75c839d0489a9428f7a221df5
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
---
 tests/auto/gui/kernel/kernel.pro                   |   1 +
 .../gui/kernel/qguiapplication/qguiapplication.pro |   4 +
 .../kernel/qguiapplication/tst_qguiapplication.cpp | 120 +++++++++++++++++++++
 3 files changed, 125 insertions(+)
 create mode 100644 tests/auto/gui/kernel/qguiapplication/qguiapplication.pro
 create mode 100644 tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp

(limited to 'tests')

diff --git a/tests/auto/gui/kernel/kernel.pro b/tests/auto/gui/kernel/kernel.pro
index e473463828..9465b0ae3b 100644
--- a/tests/auto/gui/kernel/kernel.pro
+++ b/tests/auto/gui/kernel/kernel.pro
@@ -15,3 +15,4 @@ SUBDIRS=\
    qshortcut \
    qtouchevent \
    qwindow \
+   qguiapplication \
diff --git a/tests/auto/gui/kernel/qguiapplication/qguiapplication.pro b/tests/auto/gui/kernel/qguiapplication/qguiapplication.pro
new file mode 100644
index 0000000000..fffa097d73
--- /dev/null
+++ b/tests/auto/gui/kernel/qguiapplication/qguiapplication.pro
@@ -0,0 +1,4 @@
+CONFIG += testcase
+TARGET = tst_qguiapplication
+QT += core gui testlib
+SOURCES = tst_qguiapplication.cpp
diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
new file mode 100644
index 0000000000..0bc0142e6d
--- /dev/null
+++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
@@ -0,0 +1,120 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtTest/QtTest>
+#include <QtGui/QGuiApplication>
+#include <QDebug>
+
+class tst_QGuiApplication: public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void focusObject();
+};
+
+class DummyWindow : public QWindow
+{
+public:
+    DummyWindow() : m_focusObject(0) {}
+
+    virtual QObject *focusObject() const
+    {
+        return m_focusObject;
+    }
+
+    void setFocusObject(QObject *object)
+    {
+        m_focusObject = object;
+        emit focusObjectChanged(object);
+    }
+
+    QObject *m_focusObject;
+};
+
+
+void tst_QGuiApplication::focusObject()
+{
+    int argc = 0;
+    QGuiApplication app(argc, 0);
+
+    QObject obj1, obj2, obj3;
+    DummyWindow window1;
+    DummyWindow window2;
+    window1.show();
+
+    QSignalSpy spy(&app, SIGNAL(focusObjectChanged(QObject *)));
+
+
+    // verify active window focus propagates to qguiapplication
+    QTest::qWaitForWindowShown(&window1);
+    window1.requestActivateWindow();
+    QTRY_COMPARE(app.focusWindow(), &window1);
+
+    window1.setFocusObject(&obj1);
+    QCOMPARE(app.focusObject(), &obj1);
+    QCOMPARE(spy.count(), 1);
+
+    spy.clear();
+    window1.setFocusObject(&obj2);
+    QCOMPARE(app.focusObject(), &obj2);
+    QCOMPARE(spy.count(), 1);
+
+    spy.clear();
+    window2.setFocusObject(&obj3);
+    QCOMPARE(app.focusObject(), &obj2); // not yet changed
+    window2.show();
+    QTest::qWaitForWindowShown(&window2);
+    QTRY_COMPARE(app.focusWindow(), &window2);
+    QCOMPARE(app.focusObject(), &obj3);
+    QCOMPARE(spy.count(), 1);
+
+    // focus change on unfocused window does not show
+    spy.clear();
+    window1.setFocusObject(&obj1);
+    QCOMPARE(spy.count(), 0);
+    QCOMPARE(app.focusObject(), &obj3);
+}
+
+
+QTEST_APPLESS_MAIN(tst_QGuiApplication)
+#include "tst_qguiapplication.moc"
-- 
cgit v1.2.3