diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-05-06 14:00:00 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-18 11:04:38 +1000 |
| commit | caac04babbfdca7a3ffa604b5bb89bddd60a0d5d (patch) | |
| tree | 9cbc3d49d3a619cbfd4f7c1ac0933a403640b717 /tests | |
| parent | e01dc7e1beb8e54980aa9b400ded95d6087e78c9 (diff) | |
| download | qtxmlpatterns-caac04babbfdca7a3ffa604b5bb89bddd60a0d5d.tar.gz | |
Remove Q_ASSERT from qabstractxmlnodemodel test
Rather than aborting in a debug build and failing silently in a release
build, report a warning and return a null model index if the first
(root) node of the model is not a document. The null return value will
cause initTestCase() to fail gracefully.
Change-Id: I15e9456929bbb3f0bd50d30333c49143b6f0aad7
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit a80ecc34565d6efc474bca2322046f4200ad51db)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qabstractxmlnodemodel/LoadingModel.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp b/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp index c68857b..01d3164 100644 --- a/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp +++ b/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp @@ -113,7 +113,10 @@ QXmlNodeModelIndex::DocumentOrder LoadingModel::compareOrder(const QXmlNodeModel QXmlNodeModelIndex LoadingModel::root(const QXmlNodeModelIndex &) const { - Q_ASSERT(kind(createIndex(m_nodes.first())) == QXmlNodeModelIndex::Document); + if (kind(createIndex(m_nodes.first())) != QXmlNodeModelIndex::Document) { + qWarning("%s: first node must be a Document node", Q_FUNC_INFO); + return QXmlNodeModelIndex(); + } return createIndex(m_nodes.first()); } |