diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-05-03 12:43:15 +1000 |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-05-18 11:02:59 +1000 |
commit | 18c9331213efa436a25b555b1b1fb4e01ce52ad1 (patch) | |
tree | 4753a586d466ef543e0befbb8a6996cc8fb49a67 | |
parent | e8e409944ce0ff1b00c91a58bba5fdce4eab69d9 (diff) | |
download | qtscript-18c9331213efa436a25b555b1b1fb4e01ce52ad1.tar.gz |
Remove Q_ASSERT's from qscriptclass autotest
Allow the extension() function to return a null QVariant, which will
cause the test to fail gracefully.
Change-Id: Ide9ef69c48f4bdd5a000f525fe9f395c27854da9
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit 8b95b4b5c09bf31f813fe39a3eec611c9daddb98)
-rw-r--r-- | tests/auto/qscriptclass/tst_qscriptclass.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/qscriptclass/tst_qscriptclass.cpp b/tests/auto/qscriptclass/tst_qscriptclass.cpp index 9ab8318..4d27672 100644 --- a/tests/auto/qscriptclass/tst_qscriptclass.cpp +++ b/tests/auto/qscriptclass/tst_qscriptclass.cpp @@ -369,8 +369,7 @@ QVariant TestClass::extension(Extension extension, { m_lastExtensionType = extension; m_lastExtensionArgument = argument; - if (extension == Callable) { - Q_ASSERT(m_callableMode != NotCallable); + if (extension == Callable && m_callableMode != NotCallable) { QScriptContext *ctx = qvariant_cast<QScriptContext*>(argument); if (m_callableMode == CallableReturnsSum) { qsreal sum = 0; @@ -398,8 +397,7 @@ QVariant TestClass::extension(Extension extension, engine()->newQObject(ctx->thisObject(), engine()); return QVariant(); } - } else if (extension == HasInstance) { - Q_ASSERT(m_hasInstance); + } else if (extension == HasInstance && m_hasInstance) { QScriptValueList args = qvariant_cast<QScriptValueList>(argument); QScriptValue obj = args.at(0); QScriptValue value = args.at(1); |