From f859ab10715a3cb69aa3f03574a046c886d34b44 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 6 May 2011 14:16:48 +1000 Subject: Remove Q_ASSERT from qabstractxmlnodemodel test If new "axis" enum values are added in the future, the test should report a meaningful warning in the test output rather than aborting with a meaningless message in debug builds and failing silently in release builds. Change-Id: Ifdc7a9492c3ee196d7f0e6958eec34693efd244f Task-number: QTBUG-17582 Reviewed-by: Rohan McGovern --- tests/auto/qabstractxmlnodemodel/LoadingModel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp b/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp index 2ce9466..052c781 100644 --- a/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp +++ b/tests/auto/qabstractxmlnodemodel/LoadingModel.cpp @@ -173,10 +173,10 @@ QXmlNodeModelIndex LoadingModel::nextFromSimpleAxis(QAbstractXmlNodeModel::Simpl return internal->precedingSibling ? createIndex(internal->precedingSibling) : QXmlNodeModelIndex(); case NextSibling: return internal->followingSibling ? createIndex(internal->followingSibling) : QXmlNodeModelIndex(); + default: + qWarning("%s: unknown axis enum value %d", Q_FUNC_INFO, static_cast(axis)); + return QXmlNodeModelIndex(); } - - Q_ASSERT(false); - return QXmlNodeModelIndex(); } QVector LoadingModel::attributes(const QXmlNodeModelIndex &ni) const -- cgit v0.12