diff options
Diffstat (limited to 'tests/auto/qquickmaterialstyleconf')
7 files changed, 0 insertions, 284 deletions
diff --git a/tests/auto/qquickmaterialstyleconf/CMakeLists.txt b/tests/auto/qquickmaterialstyleconf/CMakeLists.txt deleted file mode 100644 index 670d1bb6..00000000 --- a/tests/auto/qquickmaterialstyleconf/CMakeLists.txt +++ /dev/null @@ -1,64 +0,0 @@ -# Generated from qquickmaterialstyleconf.pro. - -##################################################################### -## tst_qquickmaterialstyleconf Test: -##################################################################### - -# Collect test data -file(GLOB_RECURSE test_data_glob - RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - data/*) -list(APPEND test_data ${test_data_glob}) - -qt_internal_add_test(tst_qquickmaterialstyleconf - SOURCES - ../shared/qtest_quickcontrols.h - ../shared/util.cpp ../shared/util.h - ../shared/visualtestutil.cpp ../shared/visualtestutil.h - tst_qquickmaterialstyleconf.cpp - DEFINES - QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../src/imports\\\" - PUBLIC_LIBRARIES - Qt::CorePrivate - Qt::Gui - Qt::GuiPrivate - Qt::QmlPrivate - Qt::QuickControls2 - Qt::QuickControls2Private - Qt::QuickPrivate - Qt::QuickTemplates2Private - Qt::QuickTest - Qt::TestPrivate - TESTDATA ${test_data} -) - -# Resources: -set(qquickmaterialstyleconf_resource_files - "qtquickcontrols2.conf" - "variant-dense.conf" - "variant-normal.conf" -) - -qt_internal_add_resource(tst_qquickmaterialstyleconf "qquickmaterialstyleconf" - PREFIX - "/" - FILES - ${qquickmaterialstyleconf_resource_files} -) - - -#### Keys ignored in scope 1:.:.:qquickmaterialstyleconf.pro:<TRUE>: -# OTHER_FILES = "data/*.qml" - -## Scopes: -##################################################################### - -qt_internal_extend_target(tst_qquickmaterialstyleconf CONDITION ANDROID OR IOS - DEFINES - QT_QMLTEST_DATADIR=\\\":/data\\\" -) - -qt_internal_extend_target(tst_qquickmaterialstyleconf CONDITION NOT ANDROID AND NOT IOS - DEFINES - QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" -) diff --git a/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml b/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml deleted file mode 100644 index 1ce4598d..00000000 --- a/tests/auto/qquickmaterialstyleconf/data/applicationwindow.qml +++ /dev/null @@ -1,69 +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:BSD$ -** 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. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick -import QtQuick.Controls -import QtQuick.Controls.Material - -ApplicationWindow { - width: 400 - height: 400 - - property alias label: label - property alias button: button - - Label { - id: label - } - - Button { - id: button - } -} diff --git a/tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc b/tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc deleted file mode 100644 index 49219139..00000000 --- a/tests/auto/qquickmaterialstyleconf/qquickmaterialstyleconf.qrc +++ /dev/null @@ -1,7 +0,0 @@ -<RCC> - <qresource prefix="/"> - <file>qtquickcontrols2.conf</file> - <file>variant-dense.conf</file> - <file>variant-normal.conf</file> - </qresource> -</RCC> diff --git a/tests/auto/qquickmaterialstyleconf/qtquickcontrols2.conf b/tests/auto/qquickmaterialstyleconf/qtquickcontrols2.conf deleted file mode 100644 index 30cee878..00000000 --- a/tests/auto/qquickmaterialstyleconf/qtquickcontrols2.conf +++ /dev/null @@ -1,10 +0,0 @@ -[Controls] -Style=Material - -[Material] -Background=#444444 -Foreground=Red -Font\PixelSize=22 - -[Material\Font] -Family=Courier diff --git a/tests/auto/qquickmaterialstyleconf/tst_qquickmaterialstyleconf.cpp b/tests/auto/qquickmaterialstyleconf/tst_qquickmaterialstyleconf.cpp deleted file mode 100644 index e0fd8fef..00000000 --- a/tests/auto/qquickmaterialstyleconf/tst_qquickmaterialstyleconf.cpp +++ /dev/null @@ -1,122 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <qtest.h> -#include <QtQuick/private/qquickitem_p.h> -#include <QtQuickControls2/private/qquickstyle_p.h> -#include "../shared/util.h" -#include "../shared/visualtestutil.h" - -using namespace QQuickVisualTestUtil; - -class tst_qquickmaterialstyleconf : public QQmlDataTest -{ - Q_OBJECT - -public: - -private slots: - void conf(); - void variants_data(); - void variants(); -}; - -void tst_qquickmaterialstyleconf::conf() -{ - QQuickApplicationHelper helper(this, QLatin1String("applicationwindow.qml")); - QVERIFY2(helper.ready, helper.failureMessage()); - - QFont customFont; - customFont.setFamilies(QStringList{QLatin1String("Courier")}); - customFont.setPixelSize(22); - - QQuickApplicationWindow *window = helper.appWindow; - window->show(); - QVERIFY(QTest::qWaitForWindowExposed(window)); - // We specified a custom background color and font, so the window should have them. - QCOMPARE(window->property("color").value<QColor>(), QColor("#444444")); - QCOMPARE(window->property("font").value<QFont>(), customFont); - - // We specified a custom foreground color and font, so the label should have them. - QQuickItem *label = window->property("label").value<QQuickItem*>(); - QVERIFY(label); - QCOMPARE(label->property("color").value<QColor>(), QColor("#F44336")); - QCOMPARE(label->property("font").value<QFont>(), customFont); -} - -void tst_qquickmaterialstyleconf::variants_data() -{ - QTest::addColumn<QByteArray>("confPath"); - QTest::addColumn<int>("expectedButtonHeight"); - // Just to ensure that the correct conf is loaded. - QTest::addColumn<QColor>("expectedColor"); - - // (36 button height + 12 touchable area) - QTest::newRow("normal") << QByteArray(":/variant-normal.conf") << 48 << QColor::fromRgb(0x123456); - // We specified a custom variant (dense), so the button should be small. - // (32 button height + 12 touchable area) - QTest::newRow("dense") << QByteArray(":/variant-dense.conf") << 44 << QColor::fromRgb(0x789abc); -} - -void tst_qquickmaterialstyleconf::variants() -{ - QFETCH(QByteArray, confPath); - QFETCH(int, expectedButtonHeight); - QFETCH(QColor, expectedColor); - - qmlClearTypeRegistrations(); - QQuickStylePrivate::reset(); - qputenv("QT_QUICK_CONTROLS_CONF", confPath); - - QQuickApplicationHelper helper(this, QLatin1String("applicationwindow.qml")); - QVERIFY2(helper.ready, helper.failureMessage()); - - QQuickApplicationWindow *window = helper.appWindow; - window->show(); - QVERIFY(QTest::qWaitForWindowExposed(window)); - - QQuickItem *label = window->property("label").value<QQuickItem*>(); - QVERIFY(label); - QCOMPARE(label->property("color").value<QColor>(), expectedColor); - - QQuickItem *button = window->property("button").value<QQuickItem*>(); - QVERIFY(button); - QCOMPARE(button->height(), expectedButtonHeight); -} - -QTEST_MAIN(tst_qquickmaterialstyleconf) - -#include "tst_qquickmaterialstyleconf.moc" diff --git a/tests/auto/qquickmaterialstyleconf/variant-dense.conf b/tests/auto/qquickmaterialstyleconf/variant-dense.conf deleted file mode 100644 index 6636894e..00000000 --- a/tests/auto/qquickmaterialstyleconf/variant-dense.conf +++ /dev/null @@ -1,6 +0,0 @@ -[Controls] -Style=Material - -[Material] -Variant=Dense -Foreground=#789abc diff --git a/tests/auto/qquickmaterialstyleconf/variant-normal.conf b/tests/auto/qquickmaterialstyleconf/variant-normal.conf deleted file mode 100644 index 08778e92..00000000 --- a/tests/auto/qquickmaterialstyleconf/variant-normal.conf +++ /dev/null @@ -1,6 +0,0 @@ -[Controls] -Style=Material - -[Material] -Variant=Normal -Foreground=#123456 |