AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_QDeadlineTimer: remove the testing of the different timer types

Browse Source 
Commit b498e1ae3a removed the last
distinction. And since there was no distinction, the code that was
previously under a conditional for CoarseTimer must work for precise
too.

Change-Id: I6f518d59e63249ddbf43fffd175a3eddbd41611a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Thiago Macieira 2023-04-28 17:02:12 -07:00
parent e5ecebef4f
commit 285f92bd54
1 changed files with 13 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/auto/corelib/kernel/qdeadlinetimer/tst_qdeadlinetimer.cpp
View File

@ -35,7 +35,6 @@ class tst_QDeadlineTimer : public QObject
Q_OBJECT Q_OBJECT
private Q_SLOTS: private Q_SLOTS:
void initTestCase_data();
void basics(); void basics();
void foreverness(); void foreverness();
void current(); void current();
@ -46,20 +45,13 @@ private Q_SLOTS:
void stdchrono(); void stdchrono();
}; };
void tst_QDeadlineTimer::initTestCase_data() static constexpr auto timerType = Qt::PreciseTimer;
{
qRegisterMetaType<Qt::TimerType>();
QTest::addColumn<Qt::TimerType>("timerType");
QTest::newRow("precise") << Qt::PreciseTimer;
QTest::newRow("coarse") << Qt::CoarseTimer;
}
void tst_QDeadlineTimer::basics() void tst_QDeadlineTimer::basics()
{ {
QDeadlineTimer deadline; QDeadlineTimer deadline;
QCOMPARE(deadline.timerType(), Qt::CoarseTimer); QCOMPARE(deadline.timerType(), Qt::CoarseTimer);
QFETCH_GLOBAL(Qt::TimerType, timerType);
deadline = QDeadlineTimer(timerType); deadline = QDeadlineTimer(timerType);
QCOMPARE(deadline.timerType(), timerType); QCOMPARE(deadline.timerType(), timerType);
QVERIFY(!deadline.isForever()); QVERIFY(!deadline.isForever());
@ -113,9 +105,6 @@ void tst_QDeadlineTimer::basics()
void tst_QDeadlineTimer::foreverness() void tst_QDeadlineTimer::foreverness()
{ {
QFETCH_GLOBAL(Qt::TimerType, timerType);
// we don't check whether timerType() is our type since it's possible it detects it's forever
QDeadlineTimer deadline = QDeadlineTimer::Forever; QDeadlineTimer deadline = QDeadlineTimer::Forever;
QCOMPARE(deadline.timerType(), Qt::CoarseTimer); QCOMPARE(deadline.timerType(), Qt::CoarseTimer);
QVERIFY(deadline.isForever()); QVERIFY(deadline.isForever());
@ -225,7 +214,6 @@ void tst_QDeadlineTimer::foreverness()
void tst_QDeadlineTimer::current() void tst_QDeadlineTimer::current()
{ {
QFETCH_GLOBAL(Qt::TimerType, timerType);
auto deadline = QDeadlineTimer::current(timerType); auto deadline = QDeadlineTimer::current(timerType);
QVERIFY(deadline.hasExpired()); QVERIFY(deadline.hasExpired());
QVERIFY(!deadline.isForever()); QVERIFY(!deadline.isForever());
@ -261,8 +249,6 @@ void tst_QDeadlineTimer::current()
void tst_QDeadlineTimer::deadlines() void tst_QDeadlineTimer::deadlines()
{ {
QFETCH_GLOBAL(Qt::TimerType, timerType);
QDeadlineTimer deadline(4 * minResolution, timerType); QDeadlineTimer deadline(4 * minResolution, timerType);
QVERIFY(!deadline.hasExpired()); QVERIFY(!deadline.hasExpired());
QVERIFY(!deadline.isForever()); QVERIFY(!deadline.isForever());
@ -359,7 +345,6 @@ void tst_QDeadlineTimer::deadlines()
void tst_QDeadlineTimer::setDeadline() void tst_QDeadlineTimer::setDeadline()
{ {
QFETCH_GLOBAL(Qt::TimerType, timerType);
auto now = QDeadlineTimer::current(timerType); auto now = QDeadlineTimer::current(timerType);
QDeadlineTimer deadline; QDeadlineTimer deadline;
@ -411,7 +396,6 @@ void tst_QDeadlineTimer::setDeadline()
void tst_QDeadlineTimer::overflow() void tst_QDeadlineTimer::overflow()
{ {
QFETCH_GLOBAL(Qt::TimerType, timerType);
// Check the constructor for overflows (should also cover saturating the result of the deadline() method if overflowing) // Check the constructor for overflows (should also cover saturating the result of the deadline() method if overflowing)
QDeadlineTimer now = QDeadlineTimer::current(timerType), deadline(std::numeric_limits<qint64>::max() - 1, timerType); QDeadlineTimer now = QDeadlineTimer::current(timerType), deadline(std::numeric_limits<qint64>::max() - 1, timerType);
QVERIFY(deadline.isForever() || deadline.deadline() >= now.deadline()); QVERIFY(deadline.isForever() || deadline.deadline() >= now.deadline());
@ -489,8 +473,6 @@ void tst_QDeadlineTimer::overflow()
void tst_QDeadlineTimer::expire() void tst_QDeadlineTimer::expire()
{ {
QFETCH_GLOBAL(Qt::TimerType, timerType);
QDeadlineTimer deadline(minResolution, timerType); QDeadlineTimer deadline(minResolution, timerType);
QVERIFY(!deadline.hasExpired()); QVERIFY(!deadline.hasExpired());
QVERIFY(!deadline.isForever()); QVERIFY(!deadline.isForever());
@ -512,7 +494,6 @@ void tst_QDeadlineTimer::stdchrono()
{ {
using namespace std::chrono; using namespace std::chrono;
using namespace std::chrono_literals; using namespace std::chrono_literals;
QFETCH_GLOBAL(Qt::TimerType, timerType);
// create some forevers // create some forevers
QDeadlineTimer deadline = milliseconds::max(); QDeadlineTimer deadline = milliseconds::max();
@ -641,7 +622,6 @@ void tst_QDeadlineTimer::stdchrono()
system_clock::now() + 3ms * minResolution); system_clock::now() + 3ms * minResolution);
QCOMPARE_LT((deadline.deadline<system_clock, milliseconds>()), QCOMPARE_LT((deadline.deadline<system_clock, milliseconds>()),
system_clock::now() + 5ms * minResolution); system_clock::now() + 5ms * minResolution);
if (timerType == Qt::CoarseTimer) {
QCOMPARE_GT(deadline, now + 3ms * minResolution); QCOMPARE_GT(deadline, now + 3ms * minResolution);
QCOMPARE_LT(deadline, now + 5ms * minResolution); QCOMPARE_LT(deadline, now + 5ms * minResolution);
QCOMPARE_GT(deadline, now + 3000000ns * minResolution); QCOMPARE_GT(deadline, now + 3000000ns * minResolution);
@ -652,7 +632,6 @@ void tst_QDeadlineTimer::stdchrono()
QCOMPARE_LT(deadline, 5000000ns * minResolution); QCOMPARE_LT(deadline, 5000000ns * minResolution);
QCOMPARE_GE(deadline, steady_clock::now()); QCOMPARE_GE(deadline, steady_clock::now());
QCOMPARE_GE(deadline, system_clock::now()); QCOMPARE_GE(deadline, system_clock::now());
}
now = QDeadlineTimer::current(timerType); now = QDeadlineTimer::current(timerType);
deadline = QDeadlineTimer(1s, timerType); deadline = QDeadlineTimer(1s, timerType);
@ -665,10 +644,8 @@ void tst_QDeadlineTimer::stdchrono()
QCOMPARE_LE(deadline.deadline<steady_clock>(), steady_clock::now() + 1s + 1ms * minResolution); QCOMPARE_LE(deadline.deadline<steady_clock>(), steady_clock::now() + 1s + 1ms * minResolution);
QCOMPARE_GT(deadline.deadline<system_clock>(), system_clock::now() + 1s - 1ms * minResolution); QCOMPARE_GT(deadline.deadline<system_clock>(), system_clock::now() + 1s - 1ms * minResolution);
QCOMPARE_LE(deadline.deadline<system_clock>(), system_clock::now() + 1s + 1ms * minResolution); QCOMPARE_LE(deadline.deadline<system_clock>(), system_clock::now() + 1s + 1ms * minResolution);
if (timerType == Qt::CoarseTimer) {
QCOMPARE_GT(deadline, 1s - 1ms * minResolution); QCOMPARE_GT(deadline, 1s - 1ms * minResolution);
QCOMPARE_LE(deadline, 1s); QCOMPARE_LE(deadline, 1s);
}
now = QDeadlineTimer::current(timerType); now = QDeadlineTimer::current(timerType);
deadline.setRemainingTime(1h, timerType); deadline.setRemainingTime(1h, timerType);