diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2012-04-10 18:11:30 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 13:15:01 +0200 |
commit | 6f3bda0dce945a5fc75d8ebad302820fe9979d9b (patch) | |
tree | 6581aad8a7fb21ccbebe09d23c30af0e3236e266 /tests/auto | |
parent | 44f9412bf789d73dd462292038686f5b07026132 (diff) |
Initial bundle support
Change-Id: I095249f64ecf4ef1e3fbfb164e3d50edffab61e8
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'tests/auto')
22 files changed, 429 insertions, 0 deletions
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro index 6f226a8e34..d99d18c152 100644 --- a/tests/auto/qml/qml.pro +++ b/tests/auto/qml/qml.pro @@ -47,6 +47,7 @@ PRIVATETESTS += \ qquicklistmodel \ qquicklistmodelworkerscript \ qquickworkerscript \ + qqmlbundle \ v4 SUBDIRS += $$PUBLICTESTS diff --git a/tests/auto/qml/qqmlbundle/data/bundleImport/bundleImport.1.qml b/tests/auto/qml/qqmlbundle/data/bundleImport/bundleImport.1.qml new file mode 100644 index 0000000000..b87ba9c808 --- /dev/null +++ b/tests/auto/qml/qqmlbundle/data/bundleImport/bundleImport.1.qml @@ -0,0 +1,4 @@ +import "bundle://mybundle" + +MyType { +} diff --git a/tests/auto/qml/qqmlbundle/data/bundleImport/bundleImport.2.qml b/tests/auto/qml/qqmlbundle/data/bundleImport/bundleImport.2.qml new file mode 100644 index 0000000000..0c0622e95d --- /dev/null +++ b/tests/auto/qml/qqmlbundle/data/bundleImport/bundleImport.2.qml @@ -0,0 +1,4 @@ +import "bundle://mybundle/subdir" + +MySubType { +} diff --git a/tests/auto/qml/qqmlbundle/data/bundleImport/bundledata/MyType.qml b/tests/auto/qml/qqmlbundle/data/bundleImport/bundledata/MyType.qml new file mode 100644 index 0000000000..c473560849 --- /dev/null +++ b/tests/auto/qml/qqmlbundle/data/bundleImport/bundledata/MyType.qml @@ -0,0 +1,6 @@ +import QtQuick 2.0 + +QtObject { + property real test1: 1918 + property string test2: "Hello world!" +} diff --git a/tests/auto/qml/qqmlbundle/data/bundleImport/bundledata/subdir/MySubType.qml b/tests/auto/qml/qqmlbundle/data/bundleImport/bundledata/subdir/MySubType.qml new file mode 100644 index 0000000000..ce136f213b --- /dev/null +++ b/tests/auto/qml/qqmlbundle/data/bundleImport/bundledata/subdir/MySubType.qml @@ -0,0 +1,7 @@ +import QtQuick 2.0 + +QtObject { + property real test1: 1432 + property string test2: "Jeronimo" +} + diff --git a/tests/auto/qml/qqmlbundle/data/componentFromBundle/bundledata/test.qml b/tests/auto/qml/qqmlbundle/data/componentFromBundle/bundledata/test.qml new file mode 100644 index 0000000000..ce81efe86b --- /dev/null +++ b/tests/auto/qml/qqmlbundle/data/componentFromBundle/bundledata/test.qml @@ -0,0 +1,6 @@ +import QtQuick 2.0 + +QtObject { + property int test1: 11 + property bool test2: true +} diff --git a/tests/auto/qml/qqmlbundle/data/import.qml b/tests/auto/qml/qqmlbundle/data/import.qml new file mode 100644 index 0000000000..af527199a7 --- /dev/null +++ b/tests/auto/qml/qqmlbundle/data/import.qml @@ -0,0 +1,4 @@ +import bundletest 2.0 + +MyPluginType { +} diff --git a/tests/auto/qml/qqmlbundle/data/imports/bundletest/bundledata/qmldir b/tests/auto/qml/qqmlbundle/data/imports/bundletest/bundledata/qmldir new file mode 100644 index 0000000000..db8aabfefd --- /dev/null +++ b/tests/auto/qml/qqmlbundle/data/imports/bundletest/bundledata/qmldir @@ -0,0 +1 @@ +plugin plugin1 diff --git a/tests/auto/qml/qqmlbundle/data/imports/bundletest/bundledata/subdir/qmldir b/tests/auto/qml/qqmlbundle/data/imports/bundletest/bundledata/subdir/qmldir new file mode 100644 index 0000000000..305d075dc7 --- /dev/null +++ b/tests/auto/qml/qqmlbundle/data/imports/bundletest/bundledata/subdir/qmldir @@ -0,0 +1 @@ +plugin plugin2 diff --git a/tests/auto/qml/qqmlbundle/data/imports/bundletest/empty.json b/tests/auto/qml/qqmlbundle/data/imports/bundletest/empty.json new file mode 100644 index 0000000000..0967ef424b --- /dev/null +++ b/tests/auto/qml/qqmlbundle/data/imports/bundletest/empty.json @@ -0,0 +1 @@ +{} diff --git a/tests/auto/qml/qqmlbundle/data/imports/bundletest/plugin.cpp b/tests/auto/qml/qqmlbundle/data/imports/bundletest/plugin.cpp new file mode 100644 index 0000000000..8f94e7e393 --- /dev/null +++ b/tests/auto/qml/qqmlbundle/data/imports/bundletest/plugin.cpp @@ -0,0 +1,81 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 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 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include <QStringList> +#include <QtQml/qqmlextensionplugin.h> +#include <QtQml/qqml.h> +#include <QDebug> + +class MyPluginType : public QObject +{ + Q_OBJECT + Q_PROPERTY(int value READ value WRITE setValue) + +public: + MyPluginType(QObject *parent=0) : QObject(parent), v(32) + { + } + + int value() const { return v; } + void setValue(int i) { v = i; } + +private: + int v; +}; + + +class MyPlugin : public QQmlExtensionPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "empty.json") + +public: + MyPlugin() + { + } + + void registerTypes(const char *uri) + { + qmlRegisterType<MyPluginType>(uri, 2, 0, "MyPluginType"); + } +}; + +#include "plugin.moc" + diff --git a/tests/auto/qml/qqmlbundle/data/imports/bundletest/plugin1.pro b/tests/auto/qml/qqmlbundle/data/imports/bundletest/plugin1.pro new file mode 100644 index 0000000000..d91cc245d4 --- /dev/null +++ b/tests/auto/qml/qqmlbundle/data/imports/bundletest/plugin1.pro @@ -0,0 +1,5 @@ +TEMPLATE = lib +CONFIG += plugin +SOURCES += plugin.cpp +QT = core qml + diff --git a/tests/auto/qml/qqmlbundle/data/relativeQmldir/bundledata/subdir/qmldir b/tests/auto/qml/qqmlbundle/data/relativeQmldir/bundledata/subdir/qmldir new file mode 100644 index 0000000000..628edcbfa3 --- /dev/null +++ b/tests/auto/qml/qqmlbundle/data/relativeQmldir/bundledata/subdir/qmldir @@ -0,0 +1 @@ +MySubdirType 1.0 st.qml diff --git a/tests/auto/qml/qqmlbundle/data/relativeQmldir/bundledata/subdir/st.qml b/tests/auto/qml/qqmlbundle/data/relativeQmldir/bundledata/subdir/st.qml new file mode 100644 index 0000000000..496eda83d1 --- /dev/null +++ b/tests/auto/qml/qqmlbundle/data/relativeQmldir/bundledata/subdir/st.qml @@ -0,0 +1,6 @@ +import QtQuick 2.0 + +QtObject { + property int test1: 67 + property real test2: 88 +} diff --git a/tests/auto/qml/qqmlbundle/data/relativeQmldir/bundledata/test.qml b/tests/auto/qml/qqmlbundle/data/relativeQmldir/bundledata/test.qml new file mode 100644 index 0000000000..1046b8859f --- /dev/null +++ b/tests/auto/qml/qqmlbundle/data/relativeQmldir/bundledata/test.qml @@ -0,0 +1,4 @@ +import "subdir" + +MySubdirType { +} diff --git a/tests/auto/qml/qqmlbundle/data/relativeResolution.1/bundledata/MyType.qml b/tests/auto/qml/qqmlbundle/data/relativeResolution.1/bundledata/MyType.qml new file mode 100644 index 0000000000..ce81efe86b --- /dev/null +++ b/tests/auto/qml/qqmlbundle/data/relativeResolution.1/bundledata/MyType.qml @@ -0,0 +1,6 @@ +import QtQuick 2.0 + +QtObject { + property int test1: 11 + property bool test2: true +} diff --git a/tests/auto/qml/qqmlbundle/data/relativeResolution.1/bundledata/test.qml b/tests/auto/qml/qqmlbundle/data/relativeResolution.1/bundledata/test.qml new file mode 100644 index 0000000000..2e753d2dbc --- /dev/null +++ b/tests/auto/qml/qqmlbundle/data/relativeResolution.1/bundledata/test.qml @@ -0,0 +1,4 @@ +import QtQuick 2.0 + +MyType { +} diff --git a/tests/auto/qml/qqmlbundle/data/relativeResolution.2/bundledata/subdir/MyType.qml b/tests/auto/qml/qqmlbundle/data/relativeResolution.2/bundledata/subdir/MyType.qml new file mode 100644 index 0000000000..ce81efe86b --- /dev/null +++ b/tests/auto/qml/qqmlbundle/data/relativeResolution.2/bundledata/subdir/MyType.qml @@ -0,0 +1,6 @@ +import QtQuick 2.0 + +QtObject { + property int test1: 11 + property bool test2: true +} diff --git a/tests/auto/qml/qqmlbundle/data/relativeResolution.2/bundledata/subdir/test.qml b/tests/auto/qml/qqmlbundle/data/relativeResolution.2/bundledata/subdir/test.qml new file mode 100644 index 0000000000..2e753d2dbc --- /dev/null +++ b/tests/auto/qml/qqmlbundle/data/relativeResolution.2/bundledata/subdir/test.qml @@ -0,0 +1,4 @@ +import QtQuick 2.0 + +MyType { +} diff --git a/tests/auto/qml/qqmlbundle/qqmlbundle.pro b/tests/auto/qml/qqmlbundle/qqmlbundle.pro new file mode 100644 index 0000000000..ec81e3f234 --- /dev/null +++ b/tests/auto/qml/qqmlbundle/qqmlbundle.pro @@ -0,0 +1,2 @@ +TEMPLATE = subdirs +SUBDIRS += tst_qqmlbundle.pro data/imports/bundletest/plugin1.pro diff --git a/tests/auto/qml/qqmlbundle/tst_qqmlbundle.cpp b/tests/auto/qml/qqmlbundle/tst_qqmlbundle.cpp new file mode 100644 index 0000000000..fee01c2bf3 --- /dev/null +++ b/tests/auto/qml/qqmlbundle/tst_qqmlbundle.cpp @@ -0,0 +1,260 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 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 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +// Lookup of libraries +// Test bundle as a qmldir + +#include <qtest.h> +#include <QDebug> +#include <QQmlEngine> +#include <QQmlComponent> +#include "../../shared/util.h" +#include <private/qqmlbundle_p.h> + +class tst_qqmlbundle : public QQmlDataTest +{ + Q_OBJECT +public: + tst_qqmlbundle() {} + +private slots: + void initTestCase(); + + void componentFromBundle(); + void relativeResolution(); + void bundleImport(); + void relativeQmldir(); + + void import(); + +private: + QStringList findFiles(const QDir &d); + bool makeBundle(const QString &path, const QString &name); +}; + +void tst_qqmlbundle::initTestCase() +{ + QQmlDataTest::initTestCase(); +} + +// Test we create a QQmlComponent for a file inside a bundle +void tst_qqmlbundle::componentFromBundle() +{ + QVERIFY(makeBundle(testFile("componentFromBundle"), "my.bundle")); + + QQmlEngine engine; + engine.addNamedBundle("mybundle", testFile("componentFromBundle/my.bundle")); + + QQmlComponent component(&engine, QUrl("bundle://mybundle/test.qml")); + QVERIFY(component.isReady()); + + QObject *o = component.create(); + QVERIFY(o != 0); + + QCOMPARE(o->property("test1").toInt(), 11); + QCOMPARE(o->property("test2").toBool(), true); + + delete o; +} + +// Tests that relative QML components are resolved without a qmldir +void tst_qqmlbundle::relativeResolution() +{ + // Root of the bundle + { + QVERIFY(makeBundle(testFile("relativeResolution.1"), "my.bundle")); + + QQmlEngine engine; + engine.addNamedBundle("mybundle", testFile("relativeResolution.1/my.bundle")); + + QQmlComponent component(&engine, QUrl("bundle://mybundle/test.qml")); + QVERIFY(component.isReady()); + + QObject *o = component.create(); + QVERIFY(o != 0); + + QCOMPARE(o->property("test1").toInt(), 11); + QCOMPARE(o->property("test2").toBool(), true); + + delete o; + } + + // Non-root of the bundle + { + QVERIFY(makeBundle(testFile("relativeResolution.2"), "my.bundle")); + + QQmlEngine engine; + engine.addNamedBundle("mybundle", testFile("relativeResolution.2/my.bundle")); + + QQmlComponent component(&engine, QUrl("bundle://mybundle/subdir/test.qml")); + QVERIFY(component.isReady()); + + QObject *o = component.create(); + QVERIFY(o != 0); + + QCOMPARE(o->property("test1").toInt(), 11); + QCOMPARE(o->property("test2").toBool(), true); + + delete o; + } +} + +// Test that a bundle can be imported explicitly from outside a bundle +void tst_qqmlbundle::bundleImport() +{ + QVERIFY(makeBundle(testFile("bundleImport"), "my.bundle")); + + QQmlEngine engine; + engine.addNamedBundle("mybundle", testFile("bundleImport/my.bundle")); + + { + QQmlComponent component(&engine, testFileUrl("bundleImport/bundleImport.1.qml")); + QVERIFY(component.isReady()); + + QObject *o = component.create(); + QVERIFY(o != 0); + + QCOMPARE(o->property("test1").toReal(), qreal(1918)); + QCOMPARE(o->property("test2").toString(), QString("Hello world!")); + + delete o; + } + + { + QQmlComponent component(&engine, testFileUrl("bundleImport/bundleImport.2.qml")); + QVERIFY(component.isReady()); + + QObject *o = component.create(); + QVERIFY(o != 0); + + QCOMPARE(o->property("test1").toReal(), qreal(1432)); + QCOMPARE(o->property("test2").toString(), QString("Jeronimo")); + + delete o; + } +} + +// Test a relative import inside a bundle uses qmldir +void tst_qqmlbundle::relativeQmldir() +{ + QVERIFY(makeBundle(testFile("relativeQmldir"), "my.bundle")); + + QQmlEngine engine; + engine.addNamedBundle("mybundle", testFile("relativeQmldir/my.bundle")); + + QQmlComponent component(&engine, QUrl("bundle://mybundle/test.qml")); + QVERIFY(component.isReady()); + + QObject *o = component.create(); + QVERIFY(o != 0); + + QCOMPARE(o->property("test1").toReal(), qreal(67)); + QCOMPARE(o->property("test2").toReal(), qreal(88)); + + delete o; +} + +// Test C++ plugins are resolved relative to the bundle container file +void tst_qqmlbundle::import() +{ + QVERIFY(makeBundle(testFile("imports/bundletest"), "qmldir")); + + QQmlEngine engine; + engine.addImportPath(testFile("imports")); + + QQmlComponent component(&engine, testFileUrl("import.qml")); + QVERIFY(component.isReady()); + + QObject *o = component.create(); + QVERIFY(o != 0); + + QCOMPARE(o->property("value").toInt(), 32); + + delete o; +} + +// Transform the data available under <path>/bundledata to a bundle named <path>/<name> +bool tst_qqmlbundle::makeBundle(const QString &path, const QString &name) +{ + QDir dir(path); + dir.remove(name); + + QDir bundleDir = dir; + if (!bundleDir.cd("bundledata")) + return false; + + QStringList fileNames = findFiles(bundleDir); + + QString bundleFile = dir.absolutePath() + QDir::separator() + name; + + QQmlBundle bundle(bundleFile); + if (!bundle.open(QFile::WriteOnly)) + return false; + + foreach (const QString &fileName, fileNames) { + QString shortFileName = fileName.mid(bundleDir.absolutePath().length() + 1); + bundle.add(shortFileName, fileName); + } + + return true; +} + +QStringList tst_qqmlbundle::findFiles(const QDir &d) +{ + QStringList rv; + + QStringList files = d.entryList(QDir::Files); + foreach (const QString &file, files) + rv << d.absoluteFilePath(file); + + QStringList dirs = d.entryList(QDir::Dirs | QDir::NoDotAndDotDot | QDir::NoSymLinks); + foreach (const QString &dir, dirs) { + QDir sub = d; + sub.cd(dir); + rv << findFiles(sub); + } + + return rv; +} + +QTEST_MAIN(tst_qqmlbundle) + +#include "tst_qqmlbundle.moc" diff --git a/tests/auto/qml/qqmlbundle/tst_qqmlbundle.pro b/tests/auto/qml/qqmlbundle/tst_qqmlbundle.pro new file mode 100644 index 0000000000..4e9c627135 --- /dev/null +++ b/tests/auto/qml/qqmlbundle/tst_qqmlbundle.pro @@ -0,0 +1,15 @@ +CONFIG += testcase +TARGET = tst_qqmlbundle +macx:CONFIG -= app_bundle + +SOURCES += tst_qqmlbundle.cpp +HEADERS += + +include (../../shared/util.pri) + +TESTDATA = data/* + +CONFIG += parallel_test + +QT += qml-private testlib + |