Cleanup corelib autotests.

When using QSignalSpy, always verify that the signal spy is valid.  This
will cause the test to give a meaningful failure when spying on a
non-existant signal.  Without this change, tests that spy on a signal to
ensure that it is not emitted (i.e. by comparing the spy count to zero)
could pass erroneously if something went wrong when creating the signal
spy, as an invalid QSignalSpy will always return a count of zero.

Change-Id: I41f4a63d9f0de9190a86de237662dc96be802446
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

1 files changed, 12 insertions, 0 deletions

diff --git a/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp b/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp
index 0bc1352681..3f994b5928 100644
--- a/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp
+++ b/tests/auto/corelib/tools/qtimeline/tst_qtimeline.cpp
@@ -102,6 +102,7 @@ void tst_QTimeLine::range()
     // Verify that you can change the range in the timeLine
     timeLine.setFrameRange(10, 20);
     QSignalSpy spy(&timeLine, SIGNAL(frameChanged(int)));
+    QVERIFY(spy.isValid());
     timeLine.start();
 #ifdef Q_OS_WINCE
     QTest::qWait(1000);
@@ -131,6 +132,7 @@ void tst_QTimeLine::currentTime()
     timeLine.setUpdateInterval((timeLine.duration()/2) / 33);
     qRegisterMetaType<qreal>("qreal");
     QSignalSpy spy(&timeLine, SIGNAL(valueChanged(qreal)));
+    QVERIFY(spy.isValid());
     timeLine.setFrameRange(10, 20);
     QCOMPARE(timeLine.currentTime(), 0);
     timeLine.start();
@@ -200,6 +202,7 @@ void tst_QTimeLine::frameRate()
     // Default speed
     timeLine.setUpdateInterval(1000 / 33);
     QSignalSpy spy(&timeLine, SIGNAL(frameChanged(int)));
+    QVERIFY(spy.isValid());
     timeLine.start();
     QTest::qWait(timeLine.duration()*2);
     QCOMPARE(timeLine.state(), QTimeLine::NotRunning);
@@ -223,6 +226,7 @@ void tst_QTimeLine::value()
     // Default speed
     qRegisterMetaType<qreal>("qreal");
     QSignalSpy spy(&timeLine, SIGNAL(valueChanged(qreal)));
+    QVERIFY(spy.isValid());
     timeLine.start();
     QTest::qWait(timeLine.duration()/3);
     QVERIFY(timeLine.currentValue() > 0);
@@ -253,6 +257,7 @@ void tst_QTimeLine::currentFrame()
 
     // Default speed
     QSignalSpy spy(&timeLine, SIGNAL(frameChanged(int)));
+    QVERIFY(spy.isValid());
     timeLine.start();
     QTest::qWait(timeLine.duration()/3);
     QVERIFY(timeLine.currentFrame() > 10);
@@ -284,6 +289,7 @@ void tst_QTimeLine::loopCount()
 
     // Default speed infiniti looping
     QSignalSpy spy(&timeLine, SIGNAL(frameChanged(int)));
+    QVERIFY(spy.isValid());
     timeLine.start();
     QTest::qWait(timeLine.duration());
     QCOMPARE(timeLine.state(), QTimeLine::Running);
@@ -302,6 +308,8 @@ void tst_QTimeLine::loopCount()
 
     QSignalSpy finishedSpy(&timeLine, SIGNAL(finished()));
     QSignalSpy frameChangedSpy(&timeLine, SIGNAL(frameChanged(int)));
+    QVERIFY(finishedSpy.isValid());
+    QVERIFY(frameChangedSpy.isValid());
     QEventLoop loop;
     connect(&timeLine, SIGNAL(finished()), &loop, SLOT(quit()));
 
@@ -451,6 +459,7 @@ void tst_QTimeLine::frameChanged()
     timeLine.setFrameRange(0,9);
     timeLine.setUpdateInterval(1000);
     QSignalSpy spy(&timeLine, SIGNAL(frameChanged(int)));
+    QVERIFY(spy.isValid());
     timeLine.start();
     QTest::qWait(timeLine.duration()*2);
     QCOMPARE(timeLine.state(), QTimeLine::NotRunning);
@@ -473,6 +482,7 @@ void tst_QTimeLine::stopped()
     timeLine.setFrameRange(0, 9);
     qRegisterMetaType<QTimeLine::State>("QTimeLine::State");
     QSignalSpy spy(&timeLine, SIGNAL(stateChanged(QTimeLine::State)));
+    QVERIFY(spy.isValid());
     timeLine.start();
     QTest::qWait(timeLine.duration()*2);
     QCOMPARE(timeLine.state(), QTimeLine::NotRunning);
@@ -490,6 +500,7 @@ void tst_QTimeLine::finished()
     QTimeLine timeLine;
     timeLine.setFrameRange(0,9);
     QSignalSpy spy(&timeLine, SIGNAL(finished()));
+    QVERIFY(spy.isValid());
     timeLine.start();
     QTest::qWait(timeLine.duration()*2);
     QCOMPARE(timeLine.state(), QTimeLine::NotRunning);
@@ -522,6 +533,7 @@ void tst_QTimeLine::multipleTimeLines()
     QTimeLine timeLine(200);
     timeLine.setFrameRange(0,99);
     QSignalSpy spy(&timeLine, SIGNAL(finished()));
+    QVERIFY(spy.isValid());
 
     QTimeLine timeLineKiller;
     timeLineKiller.setFrameRange(0,99);