diff options
author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-07-05 15:00:24 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-06 05:31:13 +0200 |
commit | d65b660d5d7f30058efc74c7cab074641923038f (patch) | |
tree | 0cffbdd29139988ffcd4a7631267ee6766e9dacc /tests/auto/qml/qrcqml | |
parent | aeac9840e4c46786e84ab7eb16a89db22d4ff81a (diff) |
Expand test case for qrc:/ URLs
Change-Id: Ibf8a04efbcb9d39938201f65c1fc0f236243a287
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/qml/qrcqml')
-rw-r--r-- | tests/auto/qml/qrcqml/data/SameDir.qml | 2 | ||||
-rw-r--r-- | tests/auto/qml/qrcqml/data/SameDir2.qml | 5 | ||||
-rw-r--r-- | tests/auto/qml/qrcqml/data/SameDir3.qml | 5 | ||||
-rw-r--r-- | tests/auto/qml/qrcqml/data/main.qml | 4 | ||||
-rw-r--r-- | tests/auto/qml/qrcqml/data/main2.qml | 6 | ||||
-rw-r--r-- | tests/auto/qml/qrcqml/data/main3.qml | 6 | ||||
-rw-r--r-- | tests/auto/qml/qrcqml/qrcqml.qrc | 16 | ||||
-rw-r--r-- | tests/auto/qml/qrcqml/tst_qrcqml.cpp | 33 |
8 files changed, 70 insertions, 7 deletions
diff --git a/tests/auto/qml/qrcqml/data/SameDir.qml b/tests/auto/qml/qrcqml/data/SameDir.qml index b4950b901e..1ee9b7630f 100644 --- a/tests/auto/qml/qrcqml/data/SameDir.qml +++ b/tests/auto/qml/qrcqml/data/SameDir.qml @@ -1,5 +1,5 @@ import QtQuick 2.0 QtObject { - property string tokenProperty: "hello" + property string tokenProperty: "foo" } diff --git a/tests/auto/qml/qrcqml/data/SameDir2.qml b/tests/auto/qml/qrcqml/data/SameDir2.qml new file mode 100644 index 0000000000..83d0673d64 --- /dev/null +++ b/tests/auto/qml/qrcqml/data/SameDir2.qml @@ -0,0 +1,5 @@ +import QtQuick 2.0 + +QtObject { + property string tokenProperty: "bar" +} diff --git a/tests/auto/qml/qrcqml/data/SameDir3.qml b/tests/auto/qml/qrcqml/data/SameDir3.qml new file mode 100644 index 0000000000..b1d08f4225 --- /dev/null +++ b/tests/auto/qml/qrcqml/data/SameDir3.qml @@ -0,0 +1,5 @@ +import QtQuick 2.0 + +QtObject { + property string tokenProperty: "baz" +} diff --git a/tests/auto/qml/qrcqml/data/main.qml b/tests/auto/qml/qrcqml/data/main.qml index e9069b5bd2..339c6dedf7 100644 --- a/tests/auto/qml/qrcqml/data/main.qml +++ b/tests/auto/qml/qrcqml/data/main.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 -import "data" as Subdirectory +import "../data" as Subdirectory SameDir { - property QtObject other: Subdirectory.SubDir{} + property QtObject other: Subdirectory.SubDir {} } diff --git a/tests/auto/qml/qrcqml/data/main2.qml b/tests/auto/qml/qrcqml/data/main2.qml new file mode 100644 index 0000000000..b1eb73c31f --- /dev/null +++ b/tests/auto/qml/qrcqml/data/main2.qml @@ -0,0 +1,6 @@ +import QtQuick 2.0 +import "data" as Subdirectory + +SameDir { + property QtObject other: Subdirectory.SubDir {} +} diff --git a/tests/auto/qml/qrcqml/data/main3.qml b/tests/auto/qml/qrcqml/data/main3.qml new file mode 100644 index 0000000000..b1eb73c31f --- /dev/null +++ b/tests/auto/qml/qrcqml/data/main3.qml @@ -0,0 +1,6 @@ +import QtQuick 2.0 +import "data" as Subdirectory + +SameDir { + property QtObject other: Subdirectory.SubDir {} +} diff --git a/tests/auto/qml/qrcqml/qrcqml.qrc b/tests/auto/qml/qrcqml/qrcqml.qrc index 47b88ab78f..4ee303a1ee 100644 --- a/tests/auto/qml/qrcqml/qrcqml.qrc +++ b/tests/auto/qml/qrcqml/qrcqml.qrc @@ -1,7 +1,19 @@ <!DOCTYPE RCC><RCC version="1.0"> <qresource> + <file>data/main.qml</file> + <file>data/SameDir.qml</file> <file>data/SubDir.qml</file> - <file alias="main.qml">data/main.qml</file> - <file alias="SameDir.qml">data/SameDir.qml</file> +</qresource> +<qresource> + <!-- unspecified prefix seems to mean '/' --> + <file alias="main.qml">data/main2.qml</file> + <file alias="SameDir.qml">data/SameDir2.qml</file> +</qresource> +<qresource prefix="/search"> + <file alias="main.qml">data/main3.qml</file> + <file alias="SameDir.qml">data/SameDir3.qml</file> +</qresource> +<qresource prefix="/search/data"> + <file alias="SubDir.qml">data/SubDir.qml</file> </qresource> </RCC> diff --git a/tests/auto/qml/qrcqml/tst_qrcqml.cpp b/tests/auto/qml/qrcqml/tst_qrcqml.cpp index b81fff0f08..a09c908069 100644 --- a/tests/auto/qml/qrcqml/tst_qrcqml.cpp +++ b/tests/auto/qml/qrcqml/tst_qrcqml.cpp @@ -55,6 +55,7 @@ public: tst_qrcqml(); private slots: + void basicLoad_data(); void basicLoad(); }; @@ -62,16 +63,44 @@ tst_qrcqml::tst_qrcqml() { } +void tst_qrcqml::basicLoad_data() +{ + QTest::addColumn<QString>("url"); + QTest::addColumn<QString>("token"); + + QTest::newRow("simple") + << "qrc:/data/main.qml" + << "foo"; + + QTest::newRow("aliased") + << "qrc:/main.qml" + << "bar"; + + QTest::newRow("prefixed") + << "qrc:/search/main.qml" + << "baz"; + + /* This is not supported: + QTest::newRow("without qrc scheme") + << ":/data/main.qml" + << "hello"; + */ +} + void tst_qrcqml::basicLoad() { + QFETCH(QString, url); + QFETCH(QString, token); + QQmlEngine e; - QQmlComponent c(&e, QUrl("qrc:/main.qml")); + QQmlComponent c(&e, QUrl(url)); QVERIFY(c.isReady()); QObject* o = c.create(); QVERIFY(o); - QCOMPARE(o->property("tokenProperty").toString(), QLatin1String("hello")); + QCOMPARE(o->property("tokenProperty").toString(), token); delete o; } + QTEST_MAIN(tst_qrcqml) #include "tst_qrcqml.moc" |