diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2021-07-20 13:30:11 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2021-07-22 09:56:47 +0200 |
commit | f865f4b76d9385077c9ba4ca91a91246554dd36e (patch) | |
tree | 40cae775fa3f116b09121427887114c30cd443aa /tests/auto/quickcontrols2/qquickstyle | |
parent | 2baab6ba9aeafb15b4dadb16d707c45ebb1c2e14 (diff) |
Restructure tests in preparation for merging into qtdeclarative
Task-number: QTBUG-95173
Change-Id: I541dc26cf2cdd6f2640824f693f7d059445367d9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto/quickcontrols2/qquickstyle')
20 files changed, 300 insertions, 0 deletions
diff --git a/tests/auto/quickcontrols2/qquickstyle/CMakeLists.txt b/tests/auto/quickcontrols2/qquickstyle/CMakeLists.txt new file mode 100644 index 0000000000..6295fb4e12 --- /dev/null +++ b/tests/auto/quickcontrols2/qquickstyle/CMakeLists.txt @@ -0,0 +1,67 @@ +# Generated from qquickstyle.pro. + +##################################################################### +## tst_qquickstyle Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/data/*) +list(APPEND test_data ${test_data_glob}) + +qt_internal_add_test(tst_qquickstyle + SOURCES + ../shared/qtest_quickcontrols.h + ../shared/util.cpp ../shared/util.h + ../shared/visualtestutil.cpp ../shared/visualtestutil.h + tst_qquickstyle.cpp + DEFINES + QQC2_IMPORT_PATH=\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../../src\\\" + LIBRARIES + Qt::CorePrivate + Qt::GuiPrivate + Qt::QuickControls2Private + 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(qmake_custom_resource_files + "data/Custom/Label.qml" + "data/Custom/qmldir" +) + +qt_internal_add_resource(tst_qquickstyle "qmake_custom" + PREFIX + "/" + FILES + ${qmake_custom_resource_files} +) + + +#### Keys ignored in scope 1:.:.:qquickstyle.pro:<TRUE>: +# OTHER_FILES = "data/CmdLineArgStyle/Control.qml" "data/CmdLineArgStyle/qmldir" "data/EnvVarStyle/Control.qml" "data/EnvVarStyle/qmldir" "data/EnvVarFallbackStyle/Control.qml" "data/EnvVarFallbackStyle/qmldir" + +## Scopes: +##################################################################### + +qt_internal_extend_target(tst_qquickstyle CONDITION ANDROID OR IOS + DEFINES + QT_QMLTEST_DATADIR=\\\":/data\\\" +) + +qt_internal_extend_target(tst_qquickstyle CONDITION NOT ANDROID AND NOT IOS + DEFINES + QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" +) diff --git a/tests/auto/quickcontrols2/qquickstyle/data/CmdLineArgStyle/Control.qml b/tests/auto/quickcontrols2/qquickstyle/data/CmdLineArgStyle/Control.qml new file mode 100644 index 0000000000..744dcd8f08 --- /dev/null +++ b/tests/auto/quickcontrols2/qquickstyle/data/CmdLineArgStyle/Control.qml @@ -0,0 +1,2 @@ +import QtQuick.Templates as T +T.Label {} diff --git a/tests/auto/quickcontrols2/qquickstyle/data/CmdLineArgStyle/qmldir b/tests/auto/quickcontrols2/qquickstyle/data/CmdLineArgStyle/qmldir new file mode 100644 index 0000000000..c2cc85c263 --- /dev/null +++ b/tests/auto/quickcontrols2/qquickstyle/data/CmdLineArgStyle/qmldir @@ -0,0 +1,2 @@ +module CmdLineArgStyle +Control 1.0 Control.qml diff --git a/tests/auto/quickcontrols2/qquickstyle/data/Custom/Label.qml b/tests/auto/quickcontrols2/qquickstyle/data/Custom/Label.qml new file mode 100644 index 0000000000..744dcd8f08 --- /dev/null +++ b/tests/auto/quickcontrols2/qquickstyle/data/Custom/Label.qml @@ -0,0 +1,2 @@ +import QtQuick.Templates as T +T.Label {} diff --git a/tests/auto/quickcontrols2/qquickstyle/data/Custom/qmldir b/tests/auto/quickcontrols2/qquickstyle/data/Custom/qmldir new file mode 100644 index 0000000000..08de6fa804 --- /dev/null +++ b/tests/auto/quickcontrols2/qquickstyle/data/Custom/qmldir @@ -0,0 +1,2 @@ +module Custom +Label 1.0 Label.qml diff --git a/tests/auto/quickcontrols2/qquickstyle/data/EnvVarFallbackStyle/Control.qml b/tests/auto/quickcontrols2/qquickstyle/data/EnvVarFallbackStyle/Control.qml new file mode 100644 index 0000000000..744dcd8f08 --- /dev/null +++ b/tests/auto/quickcontrols2/qquickstyle/data/EnvVarFallbackStyle/Control.qml @@ -0,0 +1,2 @@ +import QtQuick.Templates as T +T.Label {} diff --git a/tests/auto/quickcontrols2/qquickstyle/data/EnvVarFallbackStyle/qmldir b/tests/auto/quickcontrols2/qquickstyle/data/EnvVarFallbackStyle/qmldir new file mode 100644 index 0000000000..bebd8e07c6 --- /dev/null +++ b/tests/auto/quickcontrols2/qquickstyle/data/EnvVarFallbackStyle/qmldir @@ -0,0 +1,2 @@ +module EnvVarFallbackStyle +Control 1.0 Control.qml diff --git a/tests/auto/quickcontrols2/qquickstyle/data/EnvVarStyle/Control.qml b/tests/auto/quickcontrols2/qquickstyle/data/EnvVarStyle/Control.qml new file mode 100644 index 0000000000..744dcd8f08 --- /dev/null +++ b/tests/auto/quickcontrols2/qquickstyle/data/EnvVarStyle/Control.qml @@ -0,0 +1,2 @@ +import QtQuick.Templates as T +T.Label {} diff --git a/tests/auto/quickcontrols2/qquickstyle/data/EnvVarStyle/qmldir b/tests/auto/quickcontrols2/qquickstyle/data/EnvVarStyle/qmldir new file mode 100644 index 0000000000..42223a1930 --- /dev/null +++ b/tests/auto/quickcontrols2/qquickstyle/data/EnvVarStyle/qmldir @@ -0,0 +1,2 @@ +module EnvVarStyle +Control 1.0 Control.qml diff --git a/tests/auto/quickcontrols2/qquickstyle/data/basic.conf b/tests/auto/quickcontrols2/qquickstyle/data/basic.conf new file mode 100644 index 0000000000..17ef59ee02 --- /dev/null +++ b/tests/auto/quickcontrols2/qquickstyle/data/basic.conf @@ -0,0 +1,6 @@ +[Controls] +Style=Basic + +[Basic] +Font\PixelSize=3 +Palette\WindowText=#ff0000 diff --git a/tests/auto/quickcontrols2/qquickstyle/data/custom.conf b/tests/auto/quickcontrols2/qquickstyle/data/custom.conf new file mode 100644 index 0000000000..ac79338ce5 --- /dev/null +++ b/tests/auto/quickcontrols2/qquickstyle/data/custom.conf @@ -0,0 +1,6 @@ +[Controls] +Style=Custom + +[Custom] +Font\PixelSize=3 +Palette\WindowText=#ff0000 diff --git a/tests/auto/quickcontrols2/qquickstyle/data/dependencies.qml b/tests/auto/quickcontrols2/qquickstyle/data/dependencies.qml new file mode 100644 index 0000000000..280cfd2962 --- /dev/null +++ b/tests/auto/quickcontrols2/qquickstyle/data/dependencies.qml @@ -0,0 +1,4 @@ +import QtQuick +import QtQuick.Controls + +Control { } diff --git a/tests/auto/quickcontrols2/qquickstyle/data/designer/ButtonSpecifics.qml b/tests/auto/quickcontrols2/qquickstyle/data/designer/ButtonSpecifics.qml new file mode 100644 index 0000000000..21226ed2a7 --- /dev/null +++ b/tests/auto/quickcontrols2/qquickstyle/data/designer/ButtonSpecifics.qml @@ -0,0 +1,3 @@ +import HelperWidgets + +ButtonSection { } diff --git a/tests/auto/quickcontrols2/qquickstyle/data/dummy.dSYM/empty b/tests/auto/quickcontrols2/qquickstyle/data/dummy.dSYM/empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/auto/quickcontrols2/qquickstyle/data/dummy.dSYM/empty diff --git a/tests/auto/quickcontrols2/qquickstyle/data/dummyStyles/DummyStyle/Button.qml b/tests/auto/quickcontrols2/qquickstyle/data/dummyStyles/DummyStyle/Button.qml new file mode 100644 index 0000000000..dcacc01140 --- /dev/null +++ b/tests/auto/quickcontrols2/qquickstyle/data/dummyStyles/DummyStyle/Button.qml @@ -0,0 +1,2 @@ +import QtQuick.Templates as T +T.Button { } diff --git a/tests/auto/quickcontrols2/qquickstyle/data/fusion.conf b/tests/auto/quickcontrols2/qquickstyle/data/fusion.conf new file mode 100644 index 0000000000..1f343e656f --- /dev/null +++ b/tests/auto/quickcontrols2/qquickstyle/data/fusion.conf @@ -0,0 +1,6 @@ +[Controls] +Style=Fusion + +[Fusion] +Font\PixelSize=3 +Palette\WindowText=#ff0000 diff --git a/tests/auto/quickcontrols2/qquickstyle/data/imagine.conf b/tests/auto/quickcontrols2/qquickstyle/data/imagine.conf new file mode 100644 index 0000000000..919bbcf09e --- /dev/null +++ b/tests/auto/quickcontrols2/qquickstyle/data/imagine.conf @@ -0,0 +1,6 @@ +[Controls] +Style=Imagine + +[Imagine] +Font\PixelSize=3 +Palette\WindowText=#ff0000 diff --git a/tests/auto/quickcontrols2/qquickstyle/data/material.conf b/tests/auto/quickcontrols2/qquickstyle/data/material.conf new file mode 100644 index 0000000000..27c7931a92 --- /dev/null +++ b/tests/auto/quickcontrols2/qquickstyle/data/material.conf @@ -0,0 +1,6 @@ +[Controls] +Style=Material + +[Material] +Font\PixelSize=3 +Palette\WindowText=#ff0000 diff --git a/tests/auto/quickcontrols2/qquickstyle/data/universal.conf b/tests/auto/quickcontrols2/qquickstyle/data/universal.conf new file mode 100644 index 0000000000..a5ac3ca3f0 --- /dev/null +++ b/tests/auto/quickcontrols2/qquickstyle/data/universal.conf @@ -0,0 +1,6 @@ +[Controls] +Style=Universal + +[Universal] +Font\PixelSize=3 +Palette\WindowText=#ff0000 diff --git a/tests/auto/quickcontrols2/qquickstyle/tst_qquickstyle.cpp b/tests/auto/quickcontrols2/qquickstyle/tst_qquickstyle.cpp new file mode 100644 index 0000000000..9725905160 --- /dev/null +++ b/tests/auto/quickcontrols2/qquickstyle/tst_qquickstyle.cpp @@ -0,0 +1,172 @@ +/**************************************************************************** +** +** 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 <QtTest/qtest.h> +#include <QtQml/qqmlengine.h> +#include <QtQml/qqmlcomponent.h> +#include <QtQuickControls2/qquickstyle.h> +#include <QtQuickControls2/private/qquickstyle_p.h> +#include <QtQuickTemplates2/private/qquicklabel_p.h> +#include <QtQuickTemplates2/private/qquicklabel_p_p.h> +#include <QtQuickTemplates2/private/qquicktheme_p.h> +#include <QtGui/private/qguiapplication_p.h> + +#include "../shared/util.h" + +class tst_QQuickStyle : public QQmlDataTest +{ + Q_OBJECT + +private slots: + void cleanup(); + void lookup(); + void configurationFile_data(); + void configurationFile(); + void commandLineArgument(); + void environmentVariables(); + +private: + Q_REQUIRED_RESULT bool loadControls(); + void unloadControls(); +}; + +void tst_QQuickStyle::cleanup() +{ + unloadControls(); + + QGuiApplicationPrivate::styleOverride.clear(); + qunsetenv("QT_QUICK_CONTROLS_STYLE"); + qunsetenv("QT_QUICK_CONTROLS_FALLBACK_STYLE"); + qunsetenv("QT_QUICK_CONTROLS_CONF"); +} + +bool tst_QQuickStyle::loadControls() +{ + QQmlEngine engine; + engine.addImportPath(dataDirectory()); + QQmlComponent component(&engine); + component.setData("import QtQuick; import QtQuick.Controls; Control { }", QUrl()); + + QScopedPointer<QObject> object(component.create()); + if (object.isNull()) { + qWarning() << component.errorString(); + return false; + } + return true; +} + +void tst_QQuickStyle::unloadControls() +{ + qmlClearTypeRegistrations(); +} + +void tst_QQuickStyle::lookup() +{ + QQuickStyle::setStyle("Material"); + QCOMPARE(QQuickStyle::name(), QString("Material")); + + QVERIFY(loadControls()); + + // The font size for editors in the (default) Normal variant is 16. + // If this is wrong, the style plugin may not have been loaded. + QCOMPARE(QQuickTheme::instance()->font(QQuickTheme::TextArea).pixelSize(), 16); + + QCOMPARE(QQuickStyle::name(), QString("Material")); +} + +void tst_QQuickStyle::configurationFile_data() +{ + QTest::addColumn<QString>("fileName"); + QTest::addColumn<QString>("expectedStyle"); + + QTest::newRow("Basic") << "basic.conf" << "Basic"; + QTest::newRow("Fusion") << "fusion.conf" << "Fusion"; + QTest::newRow("Imagine") << "imagine.conf" << "Imagine"; + QTest::newRow("Material") << "material.conf" << "Material"; + QTest::newRow("Universal") << "universal.conf" << "Universal"; + QTest::newRow("Custom") << "custom.conf" << "Custom"; +} + +void tst_QQuickStyle::configurationFile() +{ + QFETCH(QString, fileName); + QFETCH(QString, expectedStyle); + + qputenv("QT_QUICK_CONTROLS_CONF", testFile(fileName).toLocal8Bit()); + + // Load a control. The import causes the configuration file to be read. + QQmlEngine engine; + engine.addImportPath(":/data"); + QQmlComponent labelComponent(&engine); + labelComponent.setData("import QtQuick; import QtQuick.Controls; Label {}", QUrl()); + + QScopedPointer<QObject> object(labelComponent.create()); + QVERIFY2(!object.isNull(), qPrintable(labelComponent.errorString())); + + QCOMPARE(QQuickStyle::name(), expectedStyle); + QVERIFY(!QQuickStylePrivate::isUsingDefaultStyle()); + + // Test that fonts and palettes specified in configuration files are respected. + QQuickLabel *label = qobject_cast<QQuickLabel *>(object.data()); + QVERIFY(label); + // Make it small so that there's less possibility for the default/system + // pixel size to match it and give us false positives. + QCOMPARE(label->font().pixelSize(), 3); + QCOMPARE(QQuickLabelPrivate::get(label)->palette()->windowText(), Qt::red); +} + +void tst_QQuickStyle::commandLineArgument() +{ + QGuiApplicationPrivate::styleOverride = "CmdLineArgStyle"; + + QVERIFY(loadControls()); + + QCOMPARE(QQuickStyle::name(), QString("CmdLineArgStyle")); +} + +void tst_QQuickStyle::environmentVariables() +{ + qputenv("QT_QUICK_CONTROLS_STYLE", "EnvVarStyle"); + qputenv("QT_QUICK_CONTROLS_FALLBACK_STYLE", "EnvVarFallbackStyle"); + QTest::ignoreMessage(QtWarningMsg, "QT_QUICK_CONTROLS_FALLBACK_STYLE: the specified fallback style" \ + " \"EnvVarFallbackStyle\" is not one of the built-in Qt Quick Controls 2 styles"); + QCOMPARE(QQuickStyle::name(), QString("EnvVarStyle")); + QCOMPARE(QQuickStylePrivate::fallbackStyle(), QString()); +} + +QTEST_MAIN(tst_QQuickStyle) + +#include "tst_qquickstyle.moc" |