diff options
Diffstat (limited to 'tests/auto/corelib/kernel/qelapsedtimer/tst_qelapsedtimer.cpp')
| -rw-r--r-- | tests/auto/corelib/kernel/qelapsedtimer/tst_qelapsedtimer.cpp | 59 |
1 files changed, 26 insertions, 33 deletions
diff --git a/tests/auto/corelib/kernel/qelapsedtimer/tst_qelapsedtimer.cpp b/tests/auto/corelib/kernel/qelapsedtimer/tst_qelapsedtimer.cpp index d0b6992fce..7623fd2e43 100644 --- a/tests/auto/corelib/kernel/qelapsedtimer/tst_qelapsedtimer.cpp +++ b/tests/auto/corelib/kernel/qelapsedtimer/tst_qelapsedtimer.cpp @@ -1,43 +1,21 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only +#include <QtCore/QDateTime> #include <QtCore/QString> -#include <QtCore/QTime> #include <QtCore/QElapsedTimer> -#include <QtTest/QtTest> +#include <QTest> +#include <QTimer> static const int minResolution = 100; // the minimum resolution for the tests +QT_BEGIN_NAMESPACE QDebug operator<<(QDebug s, const QElapsedTimer &t) { s.nospace() << "(" << t.msecsSinceReference() << ")"; return s.space(); } +QT_END_NAMESPACE class tst_QElapsedTimer : public QObject { @@ -53,11 +31,25 @@ private Q_SLOTS: void tst_QElapsedTimer::statics() { - qDebug() << "Clock type is" << QElapsedTimer::clockType(); - qDebug() << "Said clock is" << (QElapsedTimer::isMonotonic() ? "monotonic" : "not monotonic"); + // these have been required since Qt 6.6 + QCOMPARE(QElapsedTimer::clockType(), QElapsedTimer::MonotonicClock); + QVERIFY(QElapsedTimer::isMonotonic()); + QElapsedTimer t; t.start(); - qDebug() << "Current time is" << t.msecsSinceReference(); + qint64 system_now = QDateTime::currentMSecsSinceEpoch(); + + auto setprecision = +[](QTextStream &s) -> QTextStream & { + s.setRealNumberNotation(QTextStream::FixedNotation); + s.setRealNumberPrecision(3); + return s; + }; + qDebug() << setprecision + << "Current monotonic time is" << (t.msecsSinceReference() / 1000.) + << "s and current system time is" << (system_now / 1000.) << 's'; + if (qAbs(system_now - t.msecsSinceReference()) < 5 * minResolution) + qWarning() << "The monotonic clock is awfully close to the system clock" + " (it may not be monotonic at all!)"; } void tst_QElapsedTimer::validity() @@ -126,7 +118,8 @@ void tst_QElapsedTimer::elapsed() timerExecuted = true; }); - QTRY_VERIFY_WITH_TIMEOUT(timerExecuted, 4 * minResolution); + QTRY_VERIFY2_WITH_TIMEOUT(timerExecuted, + "Looks like timer didn't fire on time.", 4 * minResolution); QVERIFY(nsecs > 0); QVERIFY(msecs > 0); |