diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-12-06 15:55:38 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-06 10:51:50 +0100 |
commit | 327b2e5bb95815a8bd0a732e65b0b46711c0956a (patch) | |
tree | 96e9ddfb7f7997935f00fd35a95d1af83c1505e7 /tests | |
parent | 08ca0bb8dc6a115147899573ae18d42b200acf8f (diff) |
Remove unnecessary header file.
The removed header defines four macros: QTRY_VERIFY and QTRY_COMPARE,
which are provided by testlib, and QTRY_NOOP and QTRY_VERIFY_TIMEOUT,
which are not used by any test that includes the header.
Change-Id: I0f92ff961de78988703089c085098f72e8c34d1f
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests')
4 files changed, 0 insertions, 106 deletions
diff --git a/tests/auto/qconnectivitytestcommon.h b/tests/auto/qconnectivitytestcommon.h deleted file mode 100644 index e2a6f748..00000000 --- a/tests/auto/qconnectivitytestcommon.h +++ /dev/null @@ -1,100 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QCONNECTIVITYTESTCOMMON_H -#define QCONNECTIVITYTESTCOMMON_H - -// Wait for __expr to happen, while still allowing events to be processed. -#define QTRY_NOOP(__expr) \ - do { \ - const int __step = 50; \ - const int __timeout = 15000; \ - if (!(__expr)) { \ - QTest::qWait(0); \ - } \ - for (int __i = 0; __i < __timeout && !(__expr); __i+=__step) { \ - QTest::qWait(__step); \ - } \ - } 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 = 5000; \ - 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_VERIFY_TIMEOUT(__timeout, __expr) \ - do { \ - const int __step = 50; \ - 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 - diff --git a/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp b/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp index 4a4ed3dc..49d0b019 100644 --- a/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp +++ b/tests/auto/qnearfieldmanager/tst_qnearfieldmanager.cpp @@ -41,8 +41,6 @@ #include <QtTest/QtTest> -#include "../qconnectivitytestcommon.h" - #include <private/qnearfieldmanager_emulator_p.h> #include <qnearfieldmanager.h> #include <qndefnfctextrecord.h> diff --git a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp index 869ac061..8f31b4c2 100644 --- a/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp +++ b/tests/auto/qnearfieldtagtype1/tst_qnearfieldtagtype1.cpp @@ -41,8 +41,6 @@ #include <QtTest/QtTest> -#include "../qconnectivitytestcommon.h" - #include <private/qnearfieldmanager_emulator_p.h> #include <qnearfieldmanager.h> #include <qndefmessage.h> diff --git a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp index bd7b8e5a..88f4fa95 100644 --- a/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp +++ b/tests/auto/qnearfieldtagtype2/tst_qnearfieldtagtype2.cpp @@ -41,8 +41,6 @@ #include <QtTest/QtTest> -#include "../qconnectivitytestcommon.h" - #include <private/qnearfieldmanager_emulator_p.h> #include <qnearfieldmanager.h> #include <qndefmessage.h> |