diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-05-11 11:39:54 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-05-14 20:09:22 +0000 |
| commit | 9f20a3155c9c3378d0cd4a712808c94d02d4561c (patch) | |
| tree | fb2dc4c0a7fb2c46e075fc6a4981a7194b238177 /tests/auto/qml/qqmlecmascript/data | |
| parent | d57a7c775f685e7e46b5d76e1f715dd59fc39e3b (diff) | |
Isolate the different tests from each other
Those tests used a shared QQmlEngine so far, leading in some cases
to side effects that last across tests. Fix this by always creating
a new QQmlEngine for each test case.
Also renamed some paths still containing 'nokia' in them.
Change-Id: I4edbae66ac7a7930be66df8294ffbaf98636fb1c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmlecmascript/data')
10 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/qml/qqmlecmascript/data/jsimport/importPragmaLibraryWithPragmaLibraryImports.js b/tests/auto/qml/qqmlecmascript/data/jsimport/importPragmaLibraryWithPragmaLibraryImports.js index fa6497d99b..66e18ac2a9 100644 --- a/tests/auto/qml/qqmlecmascript/data/jsimport/importPragmaLibraryWithPragmaLibraryImports.js +++ b/tests/auto/qml/qqmlecmascript/data/jsimport/importPragmaLibraryWithPragmaLibraryImports.js @@ -7,5 +7,5 @@ function importIncrementedValue() { i = i + 1; // because LibraryImport is shared, and used in previous tests, // the value will be large (already incremented a bunch of times). - return (i + LibraryImport.importIncrementedValue()); + return (i + LibraryImport.importIncrementedValue()); // 11 + 5 } diff --git a/tests/auto/qml/qqmlecmascript/data/jsimport/testImportPragmaLibraryWithPragmaLibraryImports.qml b/tests/auto/qml/qqmlecmascript/data/jsimport/testImportPragmaLibraryWithPragmaLibraryImports.qml index 01f08dbdc3..8264b7229d 100644 --- a/tests/auto/qml/qqmlecmascript/data/jsimport/testImportPragmaLibraryWithPragmaLibraryImports.qml +++ b/tests/auto/qml/qqmlecmascript/data/jsimport/testImportPragmaLibraryWithPragmaLibraryImports.qml @@ -3,5 +3,5 @@ import "importPragmaLibraryWithPragmaLibraryImports.js" as LibraryImport QtObject { id: root - property int testValue: LibraryImport.importIncrementedValue(); // 10 + 1 + (7 due to previous tests) = 18 + property int testValue: LibraryImport.importIncrementedValue(); // 16 } diff --git a/tests/auto/qml/qqmlecmascript/data/jsimport/testJsImport.qml b/tests/auto/qml/qqmlecmascript/data/jsimport/testJsImport.qml index ae43e90210..0e314b20ea 100644 --- a/tests/auto/qml/qqmlecmascript/data/jsimport/testJsImport.qml +++ b/tests/auto/qml/qqmlecmascript/data/jsimport/testJsImport.qml @@ -1,7 +1,7 @@ import QtQuick 2.0 -import com.nokia.JsModule 1.0 -import com.nokia.JsModule 1.0 as RenamedModule +import com.qt.JsModule 1.0 +import com.qt.JsModule 1.0 as RenamedModule import "testJsModuleImport.js" as TestJsModuleImport QtObject { diff --git a/tests/auto/qml/qqmlecmascript/data/jsimport/testJsModuleImport.js b/tests/auto/qml/qqmlecmascript/data/jsimport/testJsModuleImport.js index 2d21953d2c..7440f610c1 100644 --- a/tests/auto/qml/qqmlecmascript/data/jsimport/testJsModuleImport.js +++ b/tests/auto/qml/qqmlecmascript/data/jsimport/testJsModuleImport.js @@ -1,4 +1,4 @@ -.import com.nokia.JsModule 1.0 as JsModule +.import com.qt.JsModule 1.0 as JsModule function importedValue() { return JsModule.ScriptAPI.greeting(); diff --git a/tests/auto/qml/qqmlecmascript/data/jsimport/testJsModuleRemoteImport.js b/tests/auto/qml/qqmlecmascript/data/jsimport/testJsModuleRemoteImport.js index e6e41bc6b2..6826f09da2 100644 --- a/tests/auto/qml/qqmlecmascript/data/jsimport/testJsModuleRemoteImport.js +++ b/tests/auto/qml/qqmlecmascript/data/jsimport/testJsModuleRemoteImport.js @@ -1,4 +1,4 @@ -.import com.nokia.JsRemoteModule 1.0 as JsModule +.import com.qt.JsRemoteModule 1.0 as JsModule function importedValue() { return JsModule.ScriptAPI.greeting(); diff --git a/tests/auto/qml/qqmlecmascript/data/jsimport/testJsRemoteImport.qml b/tests/auto/qml/qqmlecmascript/data/jsimport/testJsRemoteImport.qml index 4199bb022d..f49b38df23 100644 --- a/tests/auto/qml/qqmlecmascript/data/jsimport/testJsRemoteImport.qml +++ b/tests/auto/qml/qqmlecmascript/data/jsimport/testJsRemoteImport.qml @@ -1,7 +1,7 @@ import QtQuick 2.0 -import com.nokia.JsModule 1.0 -import com.nokia.JsModule 1.0 as RenamedModule +import com.qt.JsModule 1.0 +import com.qt.JsModule 1.0 as RenamedModule import "testJsModuleRemoteImport.js" as TestJsModuleImport QtObject { diff --git a/tests/auto/qml/qqmlecmascript/data/lib/com/nokia/JsModule/ScriptAPI.js b/tests/auto/qml/qqmlecmascript/data/lib/com/qt/JsModule/ScriptAPI.js index b90033eeb4..b90033eeb4 100644 --- a/tests/auto/qml/qqmlecmascript/data/lib/com/nokia/JsModule/ScriptAPI.js +++ b/tests/auto/qml/qqmlecmascript/data/lib/com/qt/JsModule/ScriptAPI.js diff --git a/tests/auto/qml/qqmlecmascript/data/lib/com/nokia/JsModule/qmldir b/tests/auto/qml/qqmlecmascript/data/lib/com/qt/JsModule/qmldir index c33d1e7a0d..c33d1e7a0d 100644 --- a/tests/auto/qml/qqmlecmascript/data/lib/com/nokia/JsModule/qmldir +++ b/tests/auto/qml/qqmlecmascript/data/lib/com/qt/JsModule/qmldir diff --git a/tests/auto/qml/qqmlecmascript/data/remote/com/nokia/JsRemoteModule/ScriptAPI.js b/tests/auto/qml/qqmlecmascript/data/remote/com/qt/JsRemoteModule/ScriptAPI.js index b90033eeb4..b90033eeb4 100644 --- a/tests/auto/qml/qqmlecmascript/data/remote/com/nokia/JsRemoteModule/ScriptAPI.js +++ b/tests/auto/qml/qqmlecmascript/data/remote/com/qt/JsRemoteModule/ScriptAPI.js diff --git a/tests/auto/qml/qqmlecmascript/data/remote/com/nokia/JsRemoteModule/qmldir b/tests/auto/qml/qqmlecmascript/data/remote/com/qt/JsRemoteModule/qmldir index c33d1e7a0d..c33d1e7a0d 100644 --- a/tests/auto/qml/qqmlecmascript/data/remote/com/nokia/JsRemoteModule/qmldir +++ b/tests/auto/qml/qqmlecmascript/data/remote/com/qt/JsRemoteModule/qmldir |