diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-05-06 14:16:48 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-18 11:04:38 +1000 |
| commit | 54784b0453c1c6cfad62883a5db6d1afdf95bf90 (patch) | |
| tree | 2e0a8a5cc8fe2550a3d4c3b190c92a564fbcb3c7 /tests/auto/qabstractxmlnodemodel | |
| parent | 8a8db4426809fed7b47460003eca98e65603e9e4 (diff) | |
| download | qtxmlpatterns-54784b0453c1c6cfad62883a5db6d1afdf95bf90.tar.gz | |
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
(cherry picked from commit f859ab10715a3cb69aa3f03574a046c886d34b44)
Diffstat (limited to 'tests/auto/qabstractxmlnodemodel')
| -rw-r--r-- | tests/auto/qabstractxmlnodemodel/LoadingModel.cpp | 6 |
1 files 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<int>(axis)); + return QXmlNodeModelIndex(); } - - Q_ASSERT(false); - return QXmlNodeModelIndex(); } QVector<QXmlNodeModelIndex> LoadingModel::attributes(const QXmlNodeModelIndex &ni) const |