diff options
| author | Charles Yin <charles.yin@nokia.com> | 2011-07-27 12:07:42 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-29 02:47:11 +0200 |
| commit | ea0cb11dc547c3b8a03618d31e4f7a85304f8fe3 (patch) | |
| tree | c6986bb75cbea530f0afe3678eb5a729234c00e8 /tests | |
| parent | 84af3721034d303eb427e9e815d9ec40ba625465 (diff) | |
XmlListModel.status is Ready right after creation (should be Null)
And whenever both the source the xml properties are empty, the status
should be Null as well.
Change-Id: I62936d9389b524833422a871b596b99cc93cc734
Task-number:QTBUG-18724
Reviewed-by:Michael Brasser
Reviewed-on: http://codereview.qt.nokia.com/2231
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp index 37bafebdc4..2a1d71623e 100644 --- a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp +++ b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp @@ -390,7 +390,10 @@ void tst_qdeclarativexmllistmodel::xml() QTRY_COMPARE(spy.count(), 1); spy.clear(); QCOMPARE(model->status(), QDeclarativeXmlListModel::Loading); QTRY_COMPARE(spy.count(), 1); spy.clear(); - QCOMPARE(model->status(), QDeclarativeXmlListModel::Ready); + if (xml.isEmpty()) + QCOMPARE(model->status(), QDeclarativeXmlListModel::Null); + else + QCOMPARE(model->status(), QDeclarativeXmlListModel::Ready); QVERIFY(model->errorString().isEmpty()); QCOMPARE(model->count(), count); @@ -452,6 +455,8 @@ void tst_qdeclarativexmllistmodel::source() QCOMPARE(model->count(), 9); model->setSource(source); + if (model->source().isEmpty()) + QCOMPARE(model->status(), QDeclarativeXmlListModel::Null); QCOMPARE(model->progress(), qreal(0.0)); QTRY_COMPARE(spy.count(), 1); spy.clear(); QCOMPARE(model->status(), QDeclarativeXmlListModel::Loading); @@ -521,7 +526,8 @@ void tst_qdeclarativexmllistmodel::data() void tst_qdeclarativexmllistmodel::get() { QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/get.qml")); - QDeclarativeXmlListModel *model = qobject_cast<QDeclarativeXmlListModel*>(component.create()); + QDeclarativeXmlListModel *model = qobject_cast<QDeclarativeXmlListModel*>(component.create()); + QVERIFY(model != 0); QVERIFY(QMetaObject::invokeMethod(model, "runPreTest")); |