qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtdeclarative/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp

134 lines
5.1 KiB
C++
Raw Normal View History

Use SPDX license identifiers Replace the current license disclaimer in files by a SPDX-License-Identifier. Files that have to be modified by hand are modified. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: I63563bbeb6f60f89d2c99660400dca7fab78a294 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2022-05-13 13:12:05 +00:00
// Copyright (C) 2021 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Add basic QML application to test CMake API for QML modules An application with two modules which allows us to check that all the files end up in the right places. Pick-to: 6.2 Change-Id: I58557d453e644e13f2eb646ec3195bba2654f569 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-06-21 12:30:47 +00:00
#include <QQmlEngine>
#include <QQmlComponent>
#include <QObject>
#include <qtest.h>
class tst_basicapp : public QObject
{
Q_OBJECT
private slots:
void loadComponent();
void resourceFiles();
void fileSystemFiles();
CMake: Add qmldir classname entry only if there is a plugin A class name without a plugin is pointless. Pick-to: 6.2 Change-Id: I3cfd95bc7d9dd9e80d7f23fbd6e2c2b2b855763d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-06-22 08:56:26 +00:00
void qmldirContents();
Add basic QML application to test CMake API for QML modules An application with two modules which allows us to check that all the files end up in the right places. Pick-to: 6.2 Change-Id: I58557d453e644e13f2eb646ec3195bba2654f569 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-06-21 12:30:47 +00:00
};
void tst_basicapp::loadComponent()
{
QQmlEngine engine;
Android: various test fixes 2nd round of test failures fixes for Android. Mostly resource bundling related issues still. Pick-to: 6.2 6.3 Task-number: QTBUG-97056 Change-Id: I2fac0710a7b5528fcef4480babd0cbf749e488b3 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-02-16 11:08:49 +00:00
#ifdef Q_OS_ANDROID
engine.addImportPath(":/");
#endif
Add basic QML application to test CMake API for QML modules An application with two modules which allows us to check that all the files end up in the right places. Pick-to: 6.2 Change-Id: I58557d453e644e13f2eb646ec3195bba2654f569 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-06-21 12:30:47 +00:00
QQmlComponent c(&engine, QStringLiteral("qrc:/BasicApp/main.qml"));
QVERIFY2(c.isReady(), qPrintable(c.errorString()));
QScopedPointer o(c.create());
QVERIFY(!o.isNull());
const QTime time = QTime::currentTime();
const int hour = o->property("hours").toInt();
QVERIFY(hour >= time.hour() - 1);
QVERIFY(hour <= time.hour() + 1);
const int minute = o->property("minutes").toInt();
QVERIFY(minute >= time.minute() - 1);
QVERIFY(minute <= time.minute() + 1);
Fix generation of names in qmldir files Dots in QML module names are useless because you cannot instantiate a component with a dot in its name. We might as well strip all the extensions when adding components to a qmldir file. This takes care of .ui.qml as well. Furthermore, JavaScript files must not be listed because they cannot be instantiated as QML components. Change-Id: I9782420ea79fef1d5eedef97cf7a748b96ddbe2b Pick-to: 6.2 6.2.0 Fixes: QTBUG-96301 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Tapani Mattila <tapani.mattila@qt.io>
2021-09-08 14:03:12 +00:00
QObject *more = qvariant_cast<QObject*>(o->property("more"));
QVERIFY(more);
QCOMPARE(more->objectName(), QStringLiteral("ui.qml"));
CMake: Include upper case .js and .mjs files in qmldir You can use them as singletons. Pick-to: 6.2 6.3 Fixes: QTBUG-100326 Change-Id: I8e07600657bd43ba8376279ffe39cfa5d3213c38 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-02-01 10:01:50 +00:00
QCOMPARE(o->property("fromESModule").toString(), QStringLiteral("eee"));
QCOMPARE(o->property("fromJSFile").toString(), QStringLiteral("bar"));
Add basic QML application to test CMake API for QML modules An application with two modules which allows us to check that all the files end up in the right places. Pick-to: 6.2 Change-Id: I58557d453e644e13f2eb646ec3195bba2654f569 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-06-21 12:30:47 +00:00
}
void tst_basicapp::resourceFiles()
{
QVERIFY(QFile::exists(QStringLiteral(":/BasicApp/main.qml")));
CMake: Always add the qmldir to the resource file system We want to be able to load modules directly from the resource file system, no matter if we build statically or dynamically. It's limited by the need to load plugins, of course, but as most plugins are optional an application can easily go this way and never include any plain QML files in an application bundle. Pick-to: 6.2 Change-Id: I94657a43b47e442722a83e1fb306680aa50b1bc3 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2021-06-22 17:48:02 +00:00
QVERIFY(QFile::exists(QStringLiteral(":/BasicApp/qmldir")));
Avoid target name conflict The qmlqtimeexampleplugin exists as a target name both in examples and in a test; rename the one from the test. Change-Id: I21b68f7d6228ceaee49ba28e55516b5b10ffce3a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-07-14 13:42:05 +00:00
QVERIFY(QFile::exists(QStringLiteral(":/TimeExample2/Clock.qml")));
QVERIFY(QFile::exists(QStringLiteral(":/TimeExample2/center.png")));
QVERIFY(QFile::exists(QStringLiteral(":/TimeExample2/clock.png")));
QVERIFY(QFile::exists(QStringLiteral(":/TimeExample2/hour.png")));
QVERIFY(QFile::exists(QStringLiteral(":/TimeExample2/minute.png")));
QVERIFY(QFile::exists(QStringLiteral(":/TimeExample2/qmldir")));
CMake: Always add the qmldir to the resource file system We want to be able to load modules directly from the resource file system, no matter if we build statically or dynamically. It's limited by the need to load plugins, of course, but as most plugins are optional an application can easily go this way and never include any plain QML files in an application bundle. Pick-to: 6.2 Change-Id: I94657a43b47e442722a83e1fb306680aa50b1bc3 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2021-06-22 17:48:02 +00:00
QVERIFY(!QFile::exists(QStringLiteral(":/BasicApp/tst_qmlbasicapp.qmltypes")));
Avoid target name conflict The qmlqtimeexampleplugin exists as a target name both in examples and in a test; rename the one from the test. Change-Id: I21b68f7d6228ceaee49ba28e55516b5b10ffce3a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-07-14 13:42:05 +00:00
QVERIFY(!QFile::exists(QStringLiteral(":/TimeExample2/qmlqtimeexample2.qmltypes")));
Add basic QML application to test CMake API for QML modules An application with two modules which allows us to check that all the files end up in the right places. Pick-to: 6.2 Change-Id: I58557d453e644e13f2eb646ec3195bba2654f569 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-06-21 12:30:47 +00:00
}
void tst_basicapp::fileSystemFiles()
{
Android: various test fixes 2nd round of test failures fixes for Android. Mostly resource bundling related issues still. Pick-to: 6.2 6.3 Task-number: QTBUG-97056 Change-Id: I2fac0710a7b5528fcef4480babd0cbf749e488b3 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-02-16 11:08:49 +00:00
#ifdef Q_OS_ANDROID
QSKIP("This test is not valid for Android, because the files can exist only as resources.");
#endif
Add basic QML application to test CMake API for QML modules An application with two modules which allows us to check that all the files end up in the right places. Pick-to: 6.2 Change-Id: I58557d453e644e13f2eb646ec3195bba2654f569 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-06-21 12:30:47 +00:00
const QString basedir = QCoreApplication::applicationDirPath();
Add NO_RESOURCE_TARGET_PATH option for executable backing targets For tooling to work when a QML module is associated with an executable rather than a library, it still needs the standard QML directory structure in the build directory. But the source tree is often not structured that way for the .qml files that are part of the executable's QML module. The NO_RESOURCE_TARGET_PATH option allows the project to essentially keep the structure from the source tree in the resources, but use the standard QML structure in the build directory for tooling. Task-number: QTBUG-95598 Pick-to: 6.2 Change-Id: I53145ced0e57d7ea4795bb5260dd464f6458f444 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-08-13 08:26:12 +00:00
QVERIFY(QFile::exists(basedir + QStringLiteral("/BasicApp/main.qml")));
QVERIFY(QFile::exists(basedir + QStringLiteral("/BasicApp/qmldir")));
QVERIFY(QFile::exists(basedir + QStringLiteral("/BasicApp/tst_qmlbasicapp.qmltypes")));
Avoid target name conflict The qmlqtimeexampleplugin exists as a target name both in examples and in a test; rename the one from the test. Change-Id: I21b68f7d6228ceaee49ba28e55516b5b10ffce3a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-07-14 13:42:05 +00:00
QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample2/Clock.qml")));
QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample2/center.png")));
QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample2/clock.png")));
QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample2/hour.png")));
QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample2/minute.png")));
QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample2/qmldir")));
QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample2/qmlqtimeexample2.qmltypes")));
Add basic QML application to test CMake API for QML modules An application with two modules which allows us to check that all the files end up in the right places. Pick-to: 6.2 Change-Id: I58557d453e644e13f2eb646ec3195bba2654f569 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-06-21 12:30:47 +00:00
}
CMake: Add qmldir classname entry only if there is a plugin A class name without a plugin is pointless. Pick-to: 6.2 Change-Id: I3cfd95bc7d9dd9e80d7f23fbd6e2c2b2b855763d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-06-22 08:56:26 +00:00
void tst_basicapp::qmldirContents()
{
Android: various test fixes 2nd round of test failures fixes for Android. Mostly resource bundling related issues still. Pick-to: 6.2 6.3 Task-number: QTBUG-97056 Change-Id: I2fac0710a7b5528fcef4480babd0cbf749e488b3 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-02-16 11:08:49 +00:00
#ifdef Q_OS_ANDROID
const QString basedir = QStringLiteral(":"); // Use qrc resource path on Android
#else
const QString basedir = QCoreApplication::applicationDirPath();
#endif
CMake: Add qmldir classname entry only if there is a plugin A class name without a plugin is pointless. Pick-to: 6.2 Change-Id: I3cfd95bc7d9dd9e80d7f23fbd6e2c2b2b855763d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-06-22 08:56:26 +00:00
{
Android: various test fixes 2nd round of test failures fixes for Android. Mostly resource bundling related issues still. Pick-to: 6.2 6.3 Task-number: QTBUG-97056 Change-Id: I2fac0710a7b5528fcef4480babd0cbf749e488b3 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-02-16 11:08:49 +00:00
QFile qmldir(basedir + "/BasicApp/qmldir");
CMake: Add qmldir classname entry only if there is a plugin A class name without a plugin is pointless. Pick-to: 6.2 Change-Id: I3cfd95bc7d9dd9e80d7f23fbd6e2c2b2b855763d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-06-22 08:56:26 +00:00
QVERIFY(qmldir.open(QIODevice::ReadOnly));
const QByteArray contents = qmldir.readAll();
QVERIFY(contents.contains("module BasicApp"));
QVERIFY(contents.contains("typeinfo"));
QVERIFY(contents.contains("prefer :/BasicApp/"));
QVERIFY(!contents.contains("classname"));
QVERIFY(!contents.contains("plugin"));
CMake: Always add the qmldir to the resource file system We want to be able to load modules directly from the resource file system, no matter if we build statically or dynamically. It's limited by the need to load plugins, of course, but as most plugins are optional an application can easily go this way and never include any plain QML files in an application bundle. Pick-to: 6.2 Change-Id: I94657a43b47e442722a83e1fb306680aa50b1bc3 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2021-06-22 17:48:02 +00:00
QFile qmldirInResources(":/BasicApp/qmldir");
QVERIFY(qmldirInResources.open(QIODevice::ReadOnly));
QCOMPARE(qmldirInResources.readAll(), contents);
CMake: Add qmldir classname entry only if there is a plugin A class name without a plugin is pointless. Pick-to: 6.2 Change-Id: I3cfd95bc7d9dd9e80d7f23fbd6e2c2b2b855763d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-06-22 08:56:26 +00:00
}
{
Avoid target name conflict The qmlqtimeexampleplugin exists as a target name both in examples and in a test; rename the one from the test. Change-Id: I21b68f7d6228ceaee49ba28e55516b5b10ffce3a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-07-14 13:42:05 +00:00
QFile qmldir(basedir + "/TimeExample2/qmldir");
CMake: Add qmldir classname entry only if there is a plugin A class name without a plugin is pointless. Pick-to: 6.2 Change-Id: I3cfd95bc7d9dd9e80d7f23fbd6e2c2b2b855763d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-06-22 08:56:26 +00:00
QVERIFY(qmldir.open(QIODevice::ReadOnly));
const QByteArray contents = qmldir.readAll();
Avoid target name conflict The qmlqtimeexampleplugin exists as a target name both in examples and in a test; rename the one from the test. Change-Id: I21b68f7d6228ceaee49ba28e55516b5b10ffce3a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-07-14 13:42:05 +00:00
QVERIFY(contents.contains("module TimeExample2"));
CMake: Add qmldir classname entry only if there is a plugin A class name without a plugin is pointless. Pick-to: 6.2 Change-Id: I3cfd95bc7d9dd9e80d7f23fbd6e2c2b2b855763d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-06-22 08:56:26 +00:00
QVERIFY(contents.contains("optional plugin"));
QVERIFY(contents.contains("classname"));
QVERIFY(contents.contains("typeinfo"));
QVERIFY(contents.contains("depends QtQml"));
Avoid target name conflict The qmlqtimeexampleplugin exists as a target name both in examples and in a test; rename the one from the test. Change-Id: I21b68f7d6228ceaee49ba28e55516b5b10ffce3a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-07-14 13:42:05 +00:00
QVERIFY(contents.contains("prefer :/TimeExample2/"));
CMake: Add qmldir classname entry only if there is a plugin A class name without a plugin is pointless. Pick-to: 6.2 Change-Id: I3cfd95bc7d9dd9e80d7f23fbd6e2c2b2b855763d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-06-22 08:56:26 +00:00
QVERIFY(contents.contains("Clock 1.0 Clock.qml"));
CMake: Always add the qmldir to the resource file system We want to be able to load modules directly from the resource file system, no matter if we build statically or dynamically. It's limited by the need to load plugins, of course, but as most plugins are optional an application can easily go this way and never include any plain QML files in an application bundle. Pick-to: 6.2 Change-Id: I94657a43b47e442722a83e1fb306680aa50b1bc3 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2021-06-22 17:48:02 +00:00
Avoid target name conflict The qmlqtimeexampleplugin exists as a target name both in examples and in a test; rename the one from the test. Change-Id: I21b68f7d6228ceaee49ba28e55516b5b10ffce3a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-07-14 13:42:05 +00:00
QFile qmldirInResources(":/TimeExample2/qmldir");
CMake: Always add the qmldir to the resource file system We want to be able to load modules directly from the resource file system, no matter if we build statically or dynamically. It's limited by the need to load plugins, of course, but as most plugins are optional an application can easily go this way and never include any plain QML files in an application bundle. Pick-to: 6.2 Change-Id: I94657a43b47e442722a83e1fb306680aa50b1bc3 Reviewed-by: Maximilian Goldstein <max.goldstein@qt.io>
2021-06-22 17:48:02 +00:00
QVERIFY(qmldirInResources.open(QIODevice::ReadOnly));
QCOMPARE(qmldirInResources.readAll(), contents);
CMake: Add qmldir classname entry only if there is a plugin A class name without a plugin is pointless. Pick-to: 6.2 Change-Id: I3cfd95bc7d9dd9e80d7f23fbd6e2c2b2b855763d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-06-22 08:56:26 +00:00
}
Fix generation of names in qmldir files Dots in QML module names are useless because you cannot instantiate a component with a dot in its name. We might as well strip all the extensions when adding components to a qmldir file. This takes care of .ui.qml as well. Furthermore, JavaScript files must not be listed because they cannot be instantiated as QML components. Change-Id: I9782420ea79fef1d5eedef97cf7a748b96ddbe2b Pick-to: 6.2 6.2.0 Fixes: QTBUG-96301 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Tapani Mattila <tapani.mattila@qt.io>
2021-09-08 14:03:12 +00:00
{
Android: various test fixes 2nd round of test failures fixes for Android. Mostly resource bundling related issues still. Pick-to: 6.2 6.3 Task-number: QTBUG-97056 Change-Id: I2fac0710a7b5528fcef4480babd0cbf749e488b3 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-02-16 11:08:49 +00:00
QFile qmldir(basedir + "/BasicExtension/qmldir");
Fix generation of names in qmldir files Dots in QML module names are useless because you cannot instantiate a component with a dot in its name. We might as well strip all the extensions when adding components to a qmldir file. This takes care of .ui.qml as well. Furthermore, JavaScript files must not be listed because they cannot be instantiated as QML components. Change-Id: I9782420ea79fef1d5eedef97cf7a748b96ddbe2b Pick-to: 6.2 6.2.0 Fixes: QTBUG-96301 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Tapani Mattila <tapani.mattila@qt.io>
2021-09-08 14:03:12 +00:00
QVERIFY(qmldir.open(QIODevice::ReadOnly));
const QByteArray contents = qmldir.readAll();
QVERIFY(contents.contains("More 1.0 More.ui.qml"));
CMake: Include upper case .js and .mjs files in qmldir You can use them as singletons. Pick-to: 6.2 6.3 Fixes: QTBUG-100326 Change-Id: I8e07600657bd43ba8376279ffe39cfa5d3213c38 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-02-01 10:01:50 +00:00
QVERIFY(contents.contains("Less.js"));
QVERIFY(contents.contains("ESModule.mjs"));
QVERIFY(!contents.contains("lowerCase.js"));
QVERIFY(!contents.contains("lowerCaseModule.mjs"));
Fix generation of names in qmldir files Dots in QML module names are useless because you cannot instantiate a component with a dot in its name. We might as well strip all the extensions when adding components to a qmldir file. This takes care of .ui.qml as well. Furthermore, JavaScript files must not be listed because they cannot be instantiated as QML components. Change-Id: I9782420ea79fef1d5eedef97cf7a748b96ddbe2b Pick-to: 6.2 6.2.0 Fixes: QTBUG-96301 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Tapani Mattila <tapani.mattila@qt.io>
2021-09-08 14:03:12 +00:00
}
CMake: Add qmldir classname entry only if there is a plugin A class name without a plugin is pointless. Pick-to: 6.2 Change-Id: I3cfd95bc7d9dd9e80d7f23fbd6e2c2b2b855763d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-06-22 08:56:26 +00:00
}
Add basic QML application to test CMake API for QML modules An application with two modules which allows us to check that all the files end up in the right places. Pick-to: 6.2 Change-Id: I58557d453e644e13f2eb646ec3195bba2654f569 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-06-21 12:30:47 +00:00
QTEST_MAIN(tst_basicapp)
#include "tst_qmlbasicapp.moc"