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

Remove redundant copies of QTRY_COMPARE.

Browse Source 
QTRY_COMPARE is now part of qtestlib, so there's no need for copies of
it.

Change-Id: Ied4e7d3b30c1cf16ddcbf8655e4d976e74c2bd8a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Jason McDonald 2011-11-07 14:47:59 +10:00 committed by Qt by Nokia
parent eb41f4be1e
commit 9de6257657
2 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/auto/corelib/statemachine/qstate/tst_qstate.cpp
View File

@ -45,20 +45,6 @@
#include "qstatemachine.h" #include "qstatemachine.h"
#include "qsignaltransition.h" #include "qsignaltransition.h"
// 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)
//TESTED_CLASS= //TESTED_CLASS=
//TESTED_FILES= //TESTED_FILES=

14
tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
View File

@ -54,20 +54,6 @@
#include "private/qstate_p.h" #include "private/qstate_p.h"
#include "private/qstatemachine_p.h" #include "private/qstatemachine_p.h"
// 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)
//TESTED_CLASS= //TESTED_CLASS=
//TESTED_FILES= //TESTED_FILES=