From 9de6257657a4c23f35a5936b1df7d5657d33847b Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Mon, 7 Nov 2011 14:47:59 +1000 Subject: [PATCH] Remove redundant copies of QTRY_COMPARE. QTRY_COMPARE is now part of qtestlib, so there's no need for copies of it. Change-Id: Ied4e7d3b30c1cf16ddcbf8655e4d976e74c2bd8a Reviewed-by: Rohan McGovern --- .../corelib/statemachine/qstate/tst_qstate.cpp | 14 -------------- .../qstatemachine/tst_qstatemachine.cpp | 14 -------------- 2 files changed, 28 deletions(-) diff --git a/tests/auto/corelib/statemachine/qstate/tst_qstate.cpp b/tests/auto/corelib/statemachine/qstate/tst_qstate.cpp index 9950f85cfcb..59170cf703e 100644 --- a/tests/auto/corelib/statemachine/qstate/tst_qstate.cpp +++ b/tests/auto/corelib/statemachine/qstate/tst_qstate.cpp @@ -45,20 +45,6 @@ #include "qstatemachine.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_FILES= diff --git a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp index c379504d2cb..5b9e078b697 100644 --- a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp +++ b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp @@ -54,20 +54,6 @@ #include "private/qstate_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_FILES=