1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Q_ASSERT from QDom autotest

Browse Source 
The Q_ASSERT here should really be a QVERIFY.  Expanded the trivial
helper function to make it more obvious what the test does.

Change-Id: Ia6017fe820a83b4d6101e5edcfcb68993eef233a
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 6181805f9ea66b37ee164bd67bdac2ac9d53fb65)
This commit is contained in:
Jason McDonald 2011-04-20 16:27:07 +10:00 committed by Rohan McGovern
parent 20d16d3f8b
commit 2d471a2bef
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/auto/qdom/tst_qdom.cpp
View File

@ -137,7 +137,6 @@ private slots:
private: private:
static QDomDocument generateRequest(); static QDomDocument generateRequest();
static QDomDocument doc(const QString &title, const QByteArray &ba);
static int hasAttributesHelper( const QDomNode& node ); static int hasAttributesHelper( const QDomNode& node );
static bool compareDocuments( const QDomDocument &doc1, const QDomDocument &doc2 ); static bool compareDocuments( const QDomDocument &doc1, const QDomDocument &doc2 );
static bool compareNodes( const QDomNode &node1, const QDomNode &node2, bool deep ); static bool compareNodes( const QDomNode &node1, const QDomNode &node2, bool deep );
@ -1591,14 +1590,6 @@ void tst_QDom::reportDuplicateAttributes() const
QVERIFY2(!isSuccess, "Duplicate attributes are well-formedness errors, and should be reported as such."); QVERIFY2(!isSuccess, "Duplicate attributes are well-formedness errors, and should be reported as such.");
} }
QDomDocument tst_QDom::doc(const QString &title, const QByteArray &ba)
{
QDomDocument doc(title);
const bool ret = doc.setContent(ba, true);
Q_ASSERT(ret);
return doc;
}
void tst_QDom::namespacedAttributes() const void tst_QDom::namespacedAttributes() const
{ {
static const char *const xml = static const char *const xml =
@ -1611,8 +1602,13 @@ void tst_QDom::namespacedAttributes() const
" <Title displayLabel='Title' >>>> SIMPLE BASIC OP - SEND - DUT AS SINK</Title>\n" " <Title displayLabel='Title' >>>> SIMPLE BASIC OP - SEND - DUT AS SINK</Title>\n"
"</xan:td>\n"; "</xan:td>\n";
QDomDocument one = doc("document", xml); QDomDocument one("document");
QDomDocument two = doc("document2", one.toByteArray(2)); QString error;
bool docParsed = one.setContent(QByteArray(xml), true, &error);
QVERIFY2(docParsed, qPrintable(error));
QDomDocument two("document2");
docParsed = two.setContent(one.toByteArray(2), true, &error);
QVERIFY2(docParsed, qPrintable(error));
QVERIFY(isDeepEqual(one, two)); QVERIFY(isDeepEqual(one, two));
} }