diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-05-04 01:17:49 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2011-05-04 04:45:49 (GMT) |
commit | edd9d3f64f1532e39a80a2c7a97a2501391b2316 (patch) | |
tree | b854f82772ca893749bc2b09f6d05cdf047b55b3 | |
parent | 8a1279b0ae180fae94d3da1a4eeb20df5a748d33 (diff) | |
download | Qt-edd9d3f64f1532e39a80a2c7a97a2501391b2316.zip Qt-edd9d3f64f1532e39a80a2c7a97a2501391b2316.tar.gz Qt-edd9d3f64f1532e39a80a2c7a97a2501391b2316.tar.bz2 |
Remove Q_ASSERT's from xmlpatterns autotest
Verify initial state in initTestCase() rather than asserting in the
test class's constructor.
Change-Id: Ic7612a5368e35b2abda96828d2a95690baeaf6a9
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
-rw-r--r-- | tests/auto/xmlpatterns/tst_xmlpatterns.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp index 4d59f22..45aa8d6 100644 --- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp +++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp @@ -107,13 +107,13 @@ tst_XmlPatterns::tst_XmlPatterns() : m_generatedTests(0) , m_dontRun(false) { Q_SET_DEFAULT_IAP - - Q_ASSERT(m_normalizeTestName.isValid()); - Q_ASSERT(m_filenameInStderr.isValid()); } void tst_XmlPatterns::initTestCase() { + QVERIFY(m_normalizeTestName.isValid()); + QVERIFY(m_filenameInStderr.isValid()); + QProcess process; process.start(m_command); @@ -121,7 +121,7 @@ void tst_XmlPatterns::initTestCase() { m_dontRun = true; QEXPECT_FAIL("", "The command line tool is not in the path, most likely because Qt " - "has been partically built, such as only the sub-src rule. No tests will be run.", Abort); + "has been partially built, such as only the sub-src rule. No tests will be run.", Abort); QVERIFY(false); } |