summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorEdward Welbourne <edward.welbourne@qt.io>2020-11-16 13:32:52 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2020-11-17 19:55:05 +0100
commit26e41291bb83996d54c5e44ce16432a5c992e751 (patch)
treef9c98cc7ae7744249cedca7a8f8f27227d7e0cae /tests/auto
parent06c898d7a994cc1c4193760cf348a3e69a741847 (diff)
Test QTimer's isSingleShot() and timerType()
Previously neglected in testing. Task-number: QTBUG-88183 Change-Id: Iacfca6f8c590af6dccb126cf3e43387ed50dbf06 Reviewed-by: Andrei Golubev <andrei.golubev@qt.io> Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
index 00686ab46e..d9c8b34690 100644
--- a/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
+++ b/tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
** Copyright (C) 2016 Intel Corporation.
** Contact: https://www.qt.io/licensing/
**
@@ -93,8 +93,10 @@ private slots:
void tst_QTimer::zeroTimer()
{
QTimer timer;
+ QVERIFY(!timer.isSingleShot());
timer.setInterval(0);
timer.setSingleShot(true);
+ QVERIFY(timer.isSingleShot());
QSignalSpy timeoutSpy(&timer, &QTimer::timeout);
timer.start();
@@ -108,7 +110,9 @@ void tst_QTimer::zeroTimer()
void tst_QTimer::singleShotTimeout()
{
QTimer timer;
+ QVERIFY(!timer.isSingleShot());
timer.setSingleShot(true);
+ QVERIFY(timer.isSingleShot());
QSignalSpy timeoutSpy(&timer, &QTimer::timeout);
timer.start(100);
@@ -206,7 +210,9 @@ void tst_QTimer::remainingTimeInitial()
QFETCH(Qt::TimerType, timerType);
QTimer timer;
+ QCOMPARE(timer.timerType(), Qt::CoarseTimer);
timer.setTimerType(timerType);
+ QCOMPARE(timer.timerType(), timerType);
timer.start(startTimeMs);
const int rt = timer.remainingTime();