diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2011-11-30 16:27:01 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-01 17:30:45 +0100 |
| commit | 32115087589939225a4516ed15196a4f6632c13b (patch) | |
| tree | a39a358228e434aa3c342c194f39f65b1d3f285e /tests | |
| parent | 362dfc3fcb6336dca53ac1717ac7957a359a4905 (diff) | |
Take multi-line expressions into account when rewriting expressions
Take into account the newlines expressions might have when
combining multiple expressions into one.
Change-Id: Ib7170f624b6b6dee522e2d376a513ac08a8baa46
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.qml | 3 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.qml index f601f497ee..4998f63929 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/scriptErrors.qml @@ -4,6 +4,9 @@ import "scriptErrors.js" as Script MyQmlObject { property int t: a.value property int w: Script.getValue(); + property int d: undefined + ? 0 // multi-line binding + : 1 property int x: undefined property int y: (a.value, undefinedObject) diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp index c4b9c74cdb..96383680b6 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp @@ -1368,11 +1368,11 @@ void tst_qdeclarativeecmascript::scriptErrors() QString warning1 = url.left(url.length() - 3) + "js:2: Error: Invalid write to global property \"a\""; QString warning2 = url + ":5: ReferenceError: Can't find variable: a"; QString warning3 = url.left(url.length() - 3) + "js:4: Error: Invalid write to global property \"a\""; - QString warning4 = url + ":10: ReferenceError: Can't find variable: a"; - QString warning5 = url + ":8: ReferenceError: Can't find variable: a"; - QString warning6 = url + ":7: Unable to assign [undefined] to int"; - QString warning7 = url + ":12: Error: Cannot assign to read-only property \"trueProperty\""; - QString warning8 = url + ":13: Error: Cannot assign to non-existent property \"fakeProperty\""; + QString warning4 = url + ":13: ReferenceError: Can't find variable: a"; + QString warning5 = url + ":11: ReferenceError: Can't find variable: a"; + QString warning6 = url + ":10: Unable to assign [undefined] to int"; + QString warning7 = url + ":15: Error: Cannot assign to read-only property \"trueProperty\""; + QString warning8 = url + ":16: Error: Cannot assign to non-existent property \"fakeProperty\""; QTest::ignoreMessage(QtWarningMsg, warning1.toLatin1().constData()); QTest::ignoreMessage(QtWarningMsg, warning2.toLatin1().constData()); |