From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Tue, 10 May 2011 03:19:25 +0000 (+1000)
Subject: Remove Q_ASSERT from QXmlStream autotest
X-Git-Tag: qt-v5.0.0-alpha1~4297^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f88d1fd0879aa9b16262dc99c8091ef947b4b09;p=profile%2Fivi%2Fqtbase.git

Remove Q_ASSERT from QXmlStream autotest

Report a meaningful fatal error if an unknown token type is encountered
rather than ignoring the error in non-debug builds and reporting an
uninformative message in debug builds.

Change-Id: Id219f3c7cbd4ba3e9875cb81f833720d5d153132
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 1c85fc559ee456a165527d23cb1b7dc237f5504b)
---

diff --git a/tests/auto/qxmlstream/qc14n.h b/tests/auto/qxmlstream/qc14n.h
index c7d3a7d..661ddee 100644
--- a/tests/auto/qxmlstream/qc14n.h
+++ b/tests/auto/qxmlstream/qc14n.h
@@ -191,9 +191,9 @@ bool QC14N::isDifferent(const QXmlStreamReader &r1,
                    r2.processingInstructionData() == r2.processingInstructionData();
 
         }
+        default:
+            qFatal("%s: Unknown tokenType: %d", Q_FUNC_INFO, static_cast<int>(r1.tokenType()));
+            return false;
     }
-
-    Q_ASSERT_X(false, Q_FUNC_INFO, "This line should never be reached");
-    return false;
 }