From de02b0f6ba4c422ff617308617b32804b15d1f7e Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Fri, 24 Feb 2012 16:14:12 +1000 Subject: [PATCH] Ensure importing module API in js import works This commit adds a unit test to ensure that a property of a module api can be accessed in a JavaScript import. Change-Id: Iecba76a9db0400ece1777256f19803d4bad53438 Reviewed-by: Alan Alpert --- .../data/jsimport/importModuleApi.js | 5 +++++ .../data/jsimport/testImportModuleApi.qml | 10 ++++++++++ .../tst_qdeclarativeecmascript.cpp | 7 +++++++ 3 files changed, 22 insertions(+), 0 deletions(-) create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importModuleApi.js create mode 100644 tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImportModuleApi.qml diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importModuleApi.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importModuleApi.js new file mode 100644 index 0000000..7a4f434 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/importModuleApi.js @@ -0,0 +1,5 @@ +.import Qt.test 1.0 as QObjectModuleApi + +function testFunc() { + return QObjectModuleApi.qobjectTestProperty +} diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImportModuleApi.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImportModuleApi.qml new file mode 100644 index 0000000..b3e545d --- /dev/null +++ b/tests/auto/declarative/qdeclarativeecmascript/data/jsimport/testImportModuleApi.qml @@ -0,0 +1,10 @@ +import QtQuick 2.0 +import "importModuleApi.js" as Script + +Item { + property variant testValue: 5 + + Component.onCompleted: { + testValue = Script.testFunc(); + } +} diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp index 7fc137e..6905252 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp @@ -3267,6 +3267,13 @@ void tst_qdeclarativeecmascript::importScripts_data() << QStringList() << (QStringList() << QLatin1String("testValue")) << (QVariantList() << QVariant(18)); + + QTest::newRow("import module api into js import") + << testFileUrl("jsimport/testImportModuleApi.qml") + << QString() + << QStringList() + << (QStringList() << QLatin1String("testValue")) + << (QVariantList() << QVariant(20)); } void tst_qdeclarativeecmascript::importScripts() -- 1.7.2.5