summaryrefslogtreecommitdiffstats
path: root/tests/auto/qelapsedtimer
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-02-26 15:10:19 +0100
committerThiago Macieira <thiago.macieira@nokia.com>2010-03-17 11:54:19 +0100
commitbc88d38905a80b2a025acf5b52858264c0ef0d39 (patch)
treebce5c0eb08897dfec0abcdabd7b8b593c32fe8a4 /tests/auto/qelapsedtimer
parent7f3c9feaaf67ce7e89cd2f9df2155c61a58acaed (diff)
Autotest: Rename the test to match the new class name
Diffstat (limited to 'tests/auto/qelapsedtimer')
-rw-r--r--tests/auto/qelapsedtimer/qelapsedtimer.pro2
-rw-r--r--tests/auto/qelapsedtimer/tst_qelapsedtimer.cpp24
2 files changed, 13 insertions, 13 deletions
diff --git a/tests/auto/qelapsedtimer/qelapsedtimer.pro b/tests/auto/qelapsedtimer/qelapsedtimer.pro
index 3a06390e25..ed752284ec 100644
--- a/tests/auto/qelapsedtimer/qelapsedtimer.pro
+++ b/tests/auto/qelapsedtimer/qelapsedtimer.pro
@@ -1,7 +1,7 @@
load(qttest_p4)
QT -= gui
-SOURCES += tst_qtimestamp.cpp
+SOURCES += tst_qelapsedtimer.cpp
wince* {
DEFINES += SRCDIR=\\\"\\\"
} else:symbian {
diff --git a/tests/auto/qelapsedtimer/tst_qelapsedtimer.cpp b/tests/auto/qelapsedtimer/tst_qelapsedtimer.cpp
index 79138ce38a..d671d1b34d 100644
--- a/tests/auto/qelapsedtimer/tst_qelapsedtimer.cpp
+++ b/tests/auto/qelapsedtimer/tst_qelapsedtimer.cpp
@@ -1,11 +1,11 @@
#include <QtCore/QString>
#include <QtCore/QTime>
-#include <QtCore/QTimestamp>
+#include <QtCore/QElapsedTimer>
#include <QtTest/QtTest>
static const int minResolution = 50; // the minimum resolution for the tests
-class tst_QTimestamp : public QObject
+class tst_QElapsedTimer : public QObject
{
Q_OBJECT
@@ -15,9 +15,9 @@ private Q_SLOTS:
void elapsed();
};
-void tst_QTimestamp::validity()
+void tst_QElapsedTimer::validity()
{
- QTimestamp t;
+ QElapsedTimer t;
t.invalidate();
QVERIFY(!t.isValid());
@@ -29,9 +29,9 @@ void tst_QTimestamp::validity()
QVERIFY(!t.isValid());
}
-void tst_QTimestamp::basics()
+void tst_QElapsedTimer::basics()
{
- QTimestamp t1;
+ QElapsedTimer t1;
t1.start();
QCOMPARE(t1, t1);
@@ -42,7 +42,7 @@ void tst_QTimestamp::basics()
QCOMPARE(t1 + 0, t1);
QCOMPARE(t1 - 0, t1);
- QTimestamp t2 = t1;
+ QElapsedTimer t2 = t1;
t2 += 1000; // so we can use secsTo
QVERIFY(t1 != t2);
@@ -58,13 +58,13 @@ void tst_QTimestamp::basics()
QVERIFY(elapsed < minResolution);
}
-void tst_QTimestamp::elapsed()
+void tst_QElapsedTimer::elapsed()
{
- QTimestamp t1;
+ QElapsedTimer t1;
t1.start();
QTest::qSleep(4*minResolution);
- QTimestamp t2;
+ QElapsedTimer t2;
t2.start();
QVERIFY(t1 != t2);
@@ -89,6 +89,6 @@ void tst_QTimestamp::elapsed()
QVERIFY(diff < minResolution);
}
-QTEST_MAIN(tst_QTimestamp);
+QTEST_MAIN(tst_QElapsedTimer);
-#include "tst_qtimestamp.moc"
+#include "tst_qelapsedtimer.moc"