diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-02-13 11:00:17 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-13 06:28:10 +0100 |
| commit | 3c81e2be20bcdd16bd99751868d170ab09bd0536 (patch) | |
| tree | c2b2190813446d4bbf69004bed4b94960bbdcdfa /tests | |
| parent | bbd47a30c01aa3d3674621af231b2390c4c8eab8 (diff) | |
Remove duplicates of QTRY_VERIFY and QTRY_COMPARE.
These macros are now provided by QTestLib via the QtTest/QtTest header.
Change-Id: I4a63a5fac456205c03bfb8cc7db782302f0eedd0
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/nfcsymbianbackend/common/qnfctestcommon.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/tests/nfcsymbianbackend/common/qnfctestcommon.h b/tests/nfcsymbianbackend/common/qnfctestcommon.h index 7d3c1fc2..0d1cb144 100644 --- a/tests/nfcsymbianbackend/common/qnfctestcommon.h +++ b/tests/nfcsymbianbackend/common/qnfctestcommon.h @@ -55,33 +55,5 @@ } \ } while(0) -// Will try to wait for the condition while allowing event processing -#define QTRY_VERIFY(__expr) \ - do { \ - const int __step = 50; \ - const int __timeout = 4000; \ - if (!(__expr)) { \ - QTest::qWait(0); \ - } \ - for (int __i = 0; __i < __timeout && !(__expr); __i+=__step) { \ - QTest::qWait(__step); \ - } \ - QVERIFY(__expr); \ - } while(0) - -// Will try to wait for the condition while allowing event processing -#define QTRY_COMPARE(__expr, __expected) \ - do { \ - const int __step = 50; \ - const int __timeout = 5000; \ - if ((__expr) != (__expected)) { \ - QTest::qWait(0); \ - } \ - for (int __i = 0; __i < __timeout && ((__expr) != (__expected)); __i+=__step) { \ - QTest::qWait(__step); \ - } \ - QCOMPARE(__expr, __expected); \ - } while(0) - #endif |