diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-03-31 02:08:03 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-03-31 02:34:42 (GMT) |
| commit | 63f7da63891f07202453759d29a9657c3f9681a4 (patch) | |
| tree | a66dd3922f1b73673a89dfd92428c735252edd83 /tests/auto/declarative/qdeclarativeecmascript | |
| parent | 75e9dc39dda515847961a04d402754d93d0b3326 (diff) | |
| download | Qt-63f7da63891f07202453759d29a9657c3f9681a4.zip Qt-63f7da63891f07202453759d29a9657c3f9681a4.tar.gz Qt-63f7da63891f07202453759d29a9657c3f9681a4.tar.bz2 | |
More testing.
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/data/compiled.qml | 6 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/compiled.qml b/tests/auto/declarative/qdeclarativeecmascript/data/compiled.qml index 4207a1f..2fec9da 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/compiled.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/compiled.qml @@ -1,6 +1,7 @@ import Qt 4.6 QtObject { + //real property real test1: a + b property real test2: a - b property bool test3: (a < b) @@ -8,6 +9,7 @@ QtObject { property bool test5: (a == b) property bool test6: (a != b) + //int property int test7: c + d property int test8: d - c property bool test9: (c < d) @@ -15,17 +17,20 @@ QtObject { property bool test11: (c == d) property bool test12: (c != d) + //string property string test13: e + f property string test14: e + " " + f property bool test15: (e == f) property bool test16: (e != f) + //type conversion property int test17: a property real test18: d property int test19: g property real test20: g property string test21: g property string test22: h + property bool test23: i property real a: 4.5 property real b: 11.2 @@ -35,4 +40,5 @@ QtObject { property string f: "World" property var g: 6.7 property var h: "!" + property var i: true } diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp index 09e77a3..77dd4b8 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp +++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp @@ -2055,10 +2055,12 @@ void tst_qdeclarativeecmascript::compiled() QCOMPARE(object->property("test17").toInt(), 4); QCOMPARE(object->property("test18").toReal(), qreal(176)); - //QCOMPARE(object->property("test19").toInt(), 6); + QEXPECT_FAIL("", "QTBUG-9538", Continue); + QCOMPARE(object->property("test19").toInt(), 6); QCOMPARE(object->property("test20").toReal(), qreal(6.7)); QCOMPARE(object->property("test21").toString(), QLatin1String("6.7")); QCOMPARE(object->property("test22").toString(), QLatin1String("!")); + QCOMPARE(object->property("test23").toBool(), true); delete object; } |