diff options
Diffstat (limited to 'tests/auto/gui')
-rw-r--r-- | tests/auto/gui/kernel/kernel.pro | 1 | ||||
-rw-r--r-- | tests/auto/gui/kernel/qkeyevent/qkeyevent.pro | 4 | ||||
-rw-r--r-- | tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp | 189 | ||||
-rw-r--r-- | tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp | 1 | ||||
-rw-r--r-- | tests/auto/gui/text/qfontcache/tst_qfontcache.cpp | 51 |
5 files changed, 244 insertions, 2 deletions
diff --git a/tests/auto/gui/kernel/kernel.pro b/tests/auto/gui/kernel/kernel.pro index 5254e755d4..5000e1a926 100644 --- a/tests/auto/gui/kernel/kernel.pro +++ b/tests/auto/gui/kernel/kernel.pro @@ -11,6 +11,7 @@ SUBDIRS=\ qguitimer \ qguivariant \ qinputmethod \ + qkeyevent \ qkeysequence \ qmouseevent \ qmouseevent_modal \ diff --git a/tests/auto/gui/kernel/qkeyevent/qkeyevent.pro b/tests/auto/gui/kernel/qkeyevent/qkeyevent.pro new file mode 100644 index 0000000000..c0a5786e27 --- /dev/null +++ b/tests/auto/gui/kernel/qkeyevent/qkeyevent.pro @@ -0,0 +1,4 @@ +CONFIG += testcase +TARGET = tst_qkeyevent +SOURCES += tst_qkeyevent.cpp +QT = core gui testlib diff --git a/tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp b/tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp new file mode 100644 index 0000000000..bd68400047 --- /dev/null +++ b/tests/auto/gui/kernel/qkeyevent/tst_qkeyevent.cpp @@ -0,0 +1,189 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtTest/QtTest> + +#include <QtCore/qcoreapplication.h> +#include <QtGui/qevent.h> +#include <QtGui/qwindow.h> + +class Window : public QWindow +{ +public: + ~Window() { reset(); } + + void keyPressEvent(QKeyEvent *event) { recordEvent(event); } + void keyReleaseEvent(QKeyEvent *event) { recordEvent(event); } + + void reset() { + qDeleteAll(keyEvents.begin(), keyEvents.end()); + keyEvents.clear(); + } +private: + void recordEvent(QKeyEvent *event) { + keyEvents.append(new QKeyEvent(event->type(), event->key(), event->modifiers(), event->nativeScanCode(), + event->nativeVirtualKey(), event->nativeModifiers(), event->text(), + event->isAutoRepeat(), event->count())); + } + +public: + QVector<QKeyEvent*> keyEvents; +}; + +class tst_QKeyEvent : public QObject +{ + Q_OBJECT +public: + tst_QKeyEvent(); + ~tst_QKeyEvent(); + +private slots: + void basicEventDelivery(); + void modifiers_data(); + void modifiers(); +}; + +tst_QKeyEvent::tst_QKeyEvent() +{ +} + +tst_QKeyEvent::~tst_QKeyEvent() +{ +} + +void tst_QKeyEvent::basicEventDelivery() +{ + Window window; + window.showNormal(); + QVERIFY(QTest::qWaitForWindowExposed(&window)); + + const Qt::Key key = Qt::Key_A; + const Qt::KeyboardModifier modifiers = Qt::NoModifier; + + QTest::keyClick(&window, key, modifiers); + + QCOMPARE(window.keyEvents.size(), 2); + QCOMPARE(window.keyEvents.first()->type(), QKeyEvent::KeyPress); + QCOMPARE(window.keyEvents.last()->type(), QKeyEvent::KeyRelease); + foreach (const QKeyEvent *event, window.keyEvents) { + QCOMPARE(Qt::Key(event->key()), key); + QCOMPARE(Qt::KeyboardModifiers(event->modifiers()), modifiers); + } +} + +static bool orderByModifier(const QVector<int> &v1, const QVector<int> &v2) +{ + if (v1.size() != v2.size()) + return v1.size() < v2.size(); + + for (int i = 0; i < qMin(v1.size(), v2.size()); ++i) { + if (v1.at(i) == v2.at(i)) + continue; + + return v1.at(i) < v2.at(i); + } + + return true; +} + +void tst_QKeyEvent::modifiers_data() +{ + struct Modifier + { + Qt::Key key; + Qt::KeyboardModifier modifier; + }; + static const Modifier modifiers[] = { + { Qt::Key_Shift, Qt::ShiftModifier }, + { Qt::Key_Control, Qt::ControlModifier }, + { Qt::Key_Alt, Qt::AltModifier }, + { Qt::Key_Meta, Qt::MetaModifier }, + }; + + QVector<QVector<int>> modifierCombinations; + + // Generate powerset (minus the empty set) of possible modifier combinations + static const int kNumModifiers = sizeof(modifiers) / sizeof(Modifier); + for (quint64 bitmask = 1; bitmask < (1 << kNumModifiers) ; ++bitmask) { + QVector<int> modifierCombination; + for (quint64 modifier = 0; modifier < kNumModifiers; ++modifier) { + if (bitmask & (1 << modifier)) + modifierCombination.append(modifier); + } + modifierCombinations.append(modifierCombination); + } + + qSort(modifierCombinations.begin(), modifierCombinations.end(), orderByModifier); + + QTest::addColumn<Qt::KeyboardModifiers>("modifiers"); + foreach (const QVector<int> combination, modifierCombinations) { + int keys[4] = {}; + Qt::KeyboardModifiers mods; + for (int i = 0; i < combination.size(); ++i) { + Modifier modifier = modifiers[combination.at(i)]; + keys[i] = modifier.key; + mods |= modifier.modifier; + } + QKeySequence keySequence(keys[0], keys[1], keys[2], keys[3]); + QTest::newRow(keySequence.toString(QKeySequence::NativeText).toUtf8().constData()) << mods; + } +} + +void tst_QKeyEvent::modifiers() +{ + Window window; + window.showNormal(); + QVERIFY(QTest::qWaitForWindowExposed(&window)); + + const Qt::Key key = Qt::Key_A; + QFETCH(Qt::KeyboardModifiers, modifiers); + + QTest::keyClick(&window, key, modifiers); + + int numKeys = qPopulationCount(quint64(modifiers)) + 1; + QCOMPARE(window.keyEvents.size(), numKeys * 2); + + for (int i = 0; i < window.keyEvents.size(); ++i) { + const QKeyEvent *event = window.keyEvents.at(i); + QCOMPARE(event->type(), i < numKeys ? QKeyEvent::KeyPress : QKeyEvent::KeyRelease); + if (i == numKeys - 1 || i == numKeys) { + QCOMPARE(Qt::Key(event->key()), key); + QCOMPARE(event->modifiers(), modifiers); + } else { + QVERIFY(Qt::Key(event->key()) != key); + } + } +} + +QTEST_MAIN(tst_QKeyEvent) +#include "tst_qkeyevent.moc" diff --git a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp index 3fcbd0a16f..1793dc5ff5 100644 --- a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp +++ b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp @@ -36,7 +36,6 @@ #include <qkeysequence.h> #include <qpa/qplatformtheme.h> #include <qpa/qplatformtheme_p.h> -#include <private/qkeysequence_p.h> #include <private/qguiapplication_p.h> #include <QTranslator> #include <QLibraryInfo> diff --git a/tests/auto/gui/text/qfontcache/tst_qfontcache.cpp b/tests/auto/gui/text/qfontcache/tst_qfontcache.cpp index 272827e57b..4d5ddfd523 100644 --- a/tests/auto/gui/text/qfontcache/tst_qfontcache.cpp +++ b/tests/auto/gui/text/qfontcache/tst_qfontcache.cpp @@ -48,6 +48,9 @@ public: virtual ~tst_QFontCache(); private slots: + void engineData_data(); + void engineData(); + void clear(); }; @@ -69,6 +72,52 @@ tst_QFontCache::~tst_QFontCache() { } +void tst_QFontCache::engineData_data() +{ + QTest::addColumn<QString>("family"); + QTest::addColumn<QString>("cacheKey"); + + QTest::newRow("unquoted-family-name") << QString("Times New Roman") << QString("Times New Roman"); + QTest::newRow("quoted-family-name") << QString("'Times New Roman'") << QString("Times New Roman"); + QTest::newRow("invalid") << QString("invalid") << QString("invalid"); + QTest::newRow("multiple") << QString("invalid, Times New Roman") << QString("invalid,Times New Roman"); + QTest::newRow("multiple spaces") << QString("invalid, Times New Roman ") << QString("invalid,Times New Roman"); + QTest::newRow("multiple spaces quotes") << QString("'invalid', Times New Roman ") << QString("invalid,Times New Roman"); + QTest::newRow("multiple2") << QString("invalid, Times New Roman , foobar, 'baz'") << QString("invalid,Times New Roman,foobar,baz"); + QTest::newRow("invalid spaces") << QString("invalid spaces, Times New Roman ") << QString("invalid spaces,Times New Roman"); + QTest::newRow("invalid spaces quotes") << QString("'invalid spaces', 'Times New Roman' ") << QString("invalid spaces,Times New Roman"); +} + +void tst_QFontCache::engineData() +{ + QFETCH(QString, family); + QFETCH(QString, cacheKey); + + QFont f(family); + f.exactMatch(); // loads engine + + QFontPrivate *d = QFontPrivate::get(f); + + QFontDef req = d->request; + // copy-pasted from QFontDatabase::load(), to engineer the cache key + if (req.pixelSize == -1) { + req.pixelSize = std::floor(((req.pointSize * d->dpi) / 72) * 100 + 0.5) / 100; + req.pixelSize = qRound(req.pixelSize); + } + if (req.pointSize < 0) + req.pointSize = req.pixelSize*72.0/d->dpi; + if (req.weight == 0) + req.weight = QFont::Normal; + if (req.stretch == 0) + req.stretch = 100; + + req.family = cacheKey; + + QFontEngineData *engineData = QFontCache::instance()->findEngineData(req); + + QCOMPARE(engineData, QFontPrivate::get(f)->engineData); +} + void tst_QFontCache::clear() { #ifdef QT_BUILD_INTERNAL @@ -110,7 +159,7 @@ void tst_QFontCache::clear() fontEngine->ref.ref(); // cache the engine once again; there is a special case when the engine is cached more than once - QFontCache::instance()->insertEngine(QFontCache::Key(QFontDef(), 0, 0), fontEngine); + QFontCache::instance()->insertEngine(QFontCache::Key(QFontDef(), 0, 1), fontEngine); } // use it: |