From 967797002f80665dac8b41509c44b6467229f02c Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 1 Dec 2017 13:24:14 +0100 Subject: Blacklist qmltest ShortCut::test_shortcut() Task-number: QTBUG-64914 Change-Id: Iafced31ed5ce61247f7514d86155860925cb434c Reviewed-by: Lars Knoll --- tests/auto/qmltest-blacklist/shortcut/shortcut.pro | 1 + .../qmltest-blacklist/shortcut/tst_shortcut.qml | 58 ++++++++++++++++++++++ tests/auto/qmltest/qmltest.pro | 1 - tests/auto/qmltest/shortcut/shortcut.pro | 1 - tests/auto/qmltest/shortcut/tst_shortcut.qml | 58 ---------------------- 5 files changed, 59 insertions(+), 60 deletions(-) create mode 100644 tests/auto/qmltest-blacklist/shortcut/shortcut.pro create mode 100644 tests/auto/qmltest-blacklist/shortcut/tst_shortcut.qml delete mode 100644 tests/auto/qmltest/shortcut/shortcut.pro delete mode 100644 tests/auto/qmltest/shortcut/tst_shortcut.qml (limited to 'tests') diff --git a/tests/auto/qmltest-blacklist/shortcut/shortcut.pro b/tests/auto/qmltest-blacklist/shortcut/shortcut.pro new file mode 100644 index 0000000000..a7938e7003 --- /dev/null +++ b/tests/auto/qmltest-blacklist/shortcut/shortcut.pro @@ -0,0 +1 @@ +CONFIG += qmltestcase diff --git a/tests/auto/qmltest-blacklist/shortcut/tst_shortcut.qml b/tests/auto/qmltest-blacklist/shortcut/tst_shortcut.qml new file mode 100644 index 0000000000..bc433761e2 --- /dev/null +++ b/tests/auto/qmltest-blacklist/shortcut/tst_shortcut.qml @@ -0,0 +1,58 @@ +/**************************************************************************** +** +** Copyright (C) 2017 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:GPL-EXCEPT$ +** 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 https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.8 +import QtQuick.Window 2.2 +import QtTest 1.2 + +TestCase { + name: "ShortCut" + when: windowShown + + Shortcut { + id: shortcut + property bool everActivated: false + sequence: StandardKey.NextChild + onActivated: everActivated = true + } + + Shortcut { + id: shortcut2 + property bool everActivated: false + sequence: "Ctrl+E,Ctrl+W" + onActivated: everActivated = true + } + + function test_shortcut() { + keySequence(StandardKey.NextChild) + verify(shortcut.everActivated); + + keySequence("Ctrl+E,Ctrl+W") + verify(shortcut2.everActivated); + } +} diff --git a/tests/auto/qmltest/qmltest.pro b/tests/auto/qmltest/qmltest.pro index 45f240e1d1..8ad1541cbc 100644 --- a/tests/auto/qmltest/qmltest.pro +++ b/tests/auto/qmltest/qmltest.pro @@ -22,7 +22,6 @@ SUBDIRS += \ rectangle \ selftests \ shadersource \ - shortcut \ stability \ statemachine \ text \ diff --git a/tests/auto/qmltest/shortcut/shortcut.pro b/tests/auto/qmltest/shortcut/shortcut.pro deleted file mode 100644 index a7938e7003..0000000000 --- a/tests/auto/qmltest/shortcut/shortcut.pro +++ /dev/null @@ -1 +0,0 @@ -CONFIG += qmltestcase diff --git a/tests/auto/qmltest/shortcut/tst_shortcut.qml b/tests/auto/qmltest/shortcut/tst_shortcut.qml deleted file mode 100644 index bc433761e2..0000000000 --- a/tests/auto/qmltest/shortcut/tst_shortcut.qml +++ /dev/null @@ -1,58 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 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:GPL-EXCEPT$ -** 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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.8 -import QtQuick.Window 2.2 -import QtTest 1.2 - -TestCase { - name: "ShortCut" - when: windowShown - - Shortcut { - id: shortcut - property bool everActivated: false - sequence: StandardKey.NextChild - onActivated: everActivated = true - } - - Shortcut { - id: shortcut2 - property bool everActivated: false - sequence: "Ctrl+E,Ctrl+W" - onActivated: everActivated = true - } - - function test_shortcut() { - keySequence(StandardKey.NextChild) - verify(shortcut.everActivated); - - keySequence("Ctrl+E,Ctrl+W") - verify(shortcut2.everActivated); - } -} -- cgit v1.2.3