aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail')
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failFive.qml11
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failFour.qml7
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failOne.qml7
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failThree.qml8
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failTwo.qml7
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/importOne.js7
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/importPragmaLibrary.js11
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/importWithImports.js13
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/testImportPragmaLibrary.qml8
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/testModuleImport.js8
-rw-r--r--tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/testScriptImport.js11
11 files changed, 0 insertions, 98 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failFive.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failFive.qml
deleted file mode 100644
index 73193a35a5..0000000000
--- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failFive.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import QtQuick 2.0
-
-// This should fail, since if the script does have imports
-// of its own, it should run in its own context.
-
-import "importWithImports.js" as TestImportScoping
-
-QtObject {
- id: testQtObject
- property int componentError: TestImportScoping.componentError()
-}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failFour.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failFour.qml
deleted file mode 100644
index ef2fc591b3..0000000000
--- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failFour.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick 2.0
-
-import "testModuleImport.js" as TestModuleImport
-
-QtObject {
- property int importedModuleEnumValue: JsQtTest.MyQmlObject.EnumValue3 // should fail - the typenames available in TestModuleImport should not be available in this scope
-}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failOne.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failOne.qml
deleted file mode 100644
index d0c37ad9ba..0000000000
--- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failOne.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick 2.0
-
-import "testScriptImport.js" as TestScriptImport
-
-QtObject {
- property string importScriptFunctionValue: TestScriptImport.ImportOneJs.greetingString() // should fail - the context of TestScriptImport is private to TestScriptImport.
-}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failThree.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failThree.qml
deleted file mode 100644
index edd103bd82..0000000000
--- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failThree.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import QtQuick 2.0
-
-import "testModuleImport.js" as TestModuleImport
-
-QtObject {
- id: testQtObject
- property int importedModuleAttachedPropertyValue: testQtObject.TestModuleImport.JsQtTest.MyQmlObject.value // should fail - the context of TestScriptImport is private to TestScriptImport.
-}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failTwo.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failTwo.qml
deleted file mode 100644
index 28e2026f8d..0000000000
--- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/failTwo.qml
+++ /dev/null
@@ -1,7 +0,0 @@
-import QtQuick 2.0
-
-import "testScriptImport.js" as TestScriptImport
-
-QtObject {
- property string importScriptFunctionValue: ImportOneJs.greetingString() // should fail - the typenames in TestScriptImport should not be visible from this scope
-}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/importOne.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/importOne.js
deleted file mode 100644
index 45fd9c75dd..0000000000
--- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/importOne.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function greetingString() {
- return 'Hello, World!';
-}
-
-function importOneFunction() {
- return '1';
-}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/importPragmaLibrary.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/importPragmaLibrary.js
deleted file mode 100644
index ad0e6946a2..0000000000
--- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/importPragmaLibrary.js
+++ /dev/null
@@ -1,11 +0,0 @@
-.pragma library
-
-// .pragma library, so shouldn't inherit imports from any .qml file.
-function importValue() {
- var i = 3;
- var errorIsOne = Component.error == 1; // this line should fail.
- if (errorIsOne == true) {
- i = i + 4;
- }
- return i;
-}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/importWithImports.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/importWithImports.js
deleted file mode 100644
index 6d77ceccb1..0000000000
--- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/importWithImports.js
+++ /dev/null
@@ -1,13 +0,0 @@
-.import "importOne.js" as ImportOne
-
-// This js file has imports, so should not inherit
-// scope from the QML file which includes it.
-
-function componentError() {
- var i = 3;
- var errorIsOne = Component.error == 1; // this line should fail.
- if (errorIsOne == true) {
- i = i + 4;
- }
- return i;
-}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/testImportPragmaLibrary.qml b/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/testImportPragmaLibrary.qml
deleted file mode 100644
index f04ce007d8..0000000000
--- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/testImportPragmaLibrary.qml
+++ /dev/null
@@ -1,8 +0,0 @@
-import QtQuick 2.0
-
-import "importPragmaLibrary.js" as ImportPragmaLibrary
-
-QtObject {
- id: testQtObject
- property int testValue: ImportPragmaLibrary.importValue()
-}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/testModuleImport.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/testModuleImport.js
deleted file mode 100644
index 69bc1c9887..0000000000
--- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/testModuleImport.js
+++ /dev/null
@@ -1,8 +0,0 @@
-.import Qt.test 1.0 as JsQtTest // test that we can import elements from .js files
-
-function importedAttachedPropertyValue(obj) {
- return obj.JsQtTest.MyQmlObject.value; // attached property, value = 19.
-}
-
-var importedEnumValue = JsQtTest.MyQmlObject.EnumValue3 // the actual value of this enum value is "2"
-
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/testScriptImport.js b/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/testScriptImport.js
deleted file mode 100644
index 2ecccd8816..0000000000
--- a/tests/auto/declarative/qdeclarativeecmascript/data/jsimportfail/testScriptImport.js
+++ /dev/null
@@ -1,11 +0,0 @@
-.import "importOne.js" as ImportOneJs // test that we can import scripts from .js files
-
-var greetingText = ImportOneJs.greetingString()
-
-function randomInteger(min, max) {
- if (max > min) {
- if (min > 10) return min;
- return max;
- }
- return min;
-}