aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/v4/tst_v4.cpp
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2012-03-02 11:33:46 +1000
committerQt by Nokia <qt-info@nokia.com>2012-03-09 11:03:23 +0100
commit9ba6a3b21cf012c3223ed848d102f8fa9ce00779 (patch)
tree441bda281cd5aad3fcf58634d3d1cd017ea46f4e /tests/auto/qml/v4/tst_v4.cpp
parent4eab1984cebe9972283e88e7b91f763636e17c47 (diff)
Add autotest for v4 nested object bug.
Task-number: QTBUG-24606 Change-Id: I0909d60316f7213b21fc315e8a3d0a6124e84409 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'tests/auto/qml/v4/tst_v4.cpp')
-rw-r--r--tests/auto/qml/v4/tst_v4.cpp31
1 files changed, 24 insertions, 7 deletions
diff --git a/tests/auto/qml/v4/tst_v4.cpp b/tests/auto/qml/v4/tst_v4.cpp
index 4e3e71f717..041d9ab8e6 100644
--- a/tests/auto/qml/v4/tst_v4.cpp
+++ b/tests/auto/qml/v4/tst_v4.cpp
@@ -225,17 +225,34 @@ void tst_v4::conditionalExpr()
// NestedObject::result.
void tst_v4::nestedObjectAccess()
{
- QQmlComponent component(&engine, testFileUrl("nestedObjectAccess.qml"));
+ {
+ QQmlComponent component(&engine, testFileUrl("nestedObjectAccess.qml"));
- QObject *o = component.create();
- QVERIFY(o != 0);
+ QObject *o = component.create();
+ QVERIFY(o != 0);
- ResultObject *ro = qobject_cast<ResultObject *>(o);
- QVERIFY(ro != 0);
+ ResultObject *ro = qobject_cast<ResultObject *>(o);
+ QVERIFY(ro != 0);
- QCOMPARE(ro->result(), 37);
+ QCOMPARE(ro->result(), 37);
- delete o;
+ delete o;
+ }
+
+ {
+ QQmlComponent component(&engine, testFileUrl("nestedObjectAccess2.qml"));
+
+ QObject *o = component.create();
+ QVERIFY(o != 0);
+
+ ResultObject *ro = qobject_cast<ResultObject *>(o);
+ QVERIFY(ro != 0);
+
+ QEXPECT_FAIL("","QTBUG-24606", Continue);
+ QCOMPARE(ro->result(), 37);
+
+ delete o;
+ }
}
void tst_v4::subscriptionsInConditionalExpressions()