From a80ecc34565d6efc474bca2322046f4200ad51db Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 6 May 2011 14:00:00 +1000 Subject: 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 --- tests/auto/qabstractxmlnodemodel/LoadingModel.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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()); } -- cgit v0.12