Add tests for QgsTask::waitForFinished()

m-kuhn · m-kuhn · commit 95597e3bab6e · 2017-05-11T12:42:26.000+02:00
diff --git a/tests/src/core/testqgstaskmanager.cpp b/tests/src/core/testqgstaskmanager.cpp
@@ -56,12 +56,14 @@ class ProgressReportingTask : public QgsTask
     ProgressReportingTask( const QString &desc = QString() ) : QgsTask( desc ), finished( false ), terminated( false ) {}
 
     void emitProgressChanged( double progress ) { setProgress( progress ); }
-    void finish() { finished = true; }
-    void terminate() { terminated = true; }
 
     bool finished;
     bool terminated;
 
+  public slots:
+    void finish() { finished = true; }
+    void terminate() { terminated = true; }
+
   protected:
 
     bool run() override
@@ -198,6 +200,7 @@ class TestQgsTaskManager : public QObject
     void addTask();
     void taskTerminationBeforeDelete();
     void taskId();
+    void waitForFinished();
     void progressChanged();
     void statusChanged();
     void allTasksFinished();
@@ -654,6 +657,49 @@ void TestQgsTaskManager::taskId()
   delete task3;
 }
 
+void TestQgsTaskManager::waitForFinished()
+{
+  QgsTaskManager manager;
+  QEventLoop loop;
+
+  ProgressReportingTask *finishedTask = new ProgressReportingTask();
+  connect( finishedTask, &ProgressReportingTask::begun, &loop, &QEventLoop::quit );
+  manager.addTask( finishedTask );
+  if ( finishedTask->status() != QgsTask::Running )
+    loop.exec();
+
+  QTimer timer;
+  connect( &timer, &QTimer::timeout, finishedTask, &ProgressReportingTask::finish );
+  timer.start( 100 );
+  QCOMPARE( finishedTask->status(), QgsTask::Running );
+  QCOMPARE( finishedTask->waitForFinished(), true );
+  QCOMPARE( finishedTask->status(), QgsTask::Complete );
+
+  ProgressReportingTask *failedTask = new ProgressReportingTask();
+  connect( failedTask, &ProgressReportingTask::begun, &loop, &QEventLoop::quit );
+  manager.addTask( failedTask );
+  if ( failedTask->status() != QgsTask::Running )
+    loop.exec();
+
+  connect( &timer, &QTimer::timeout, failedTask, &ProgressReportingTask::terminate );
+  timer.start( 100 );
+  QCOMPARE( failedTask->status(), QgsTask::Running );
+  QCOMPARE( failedTask->waitForFinished(), true );
+  QCOMPARE( failedTask->status(), QgsTask::Terminated );
+
+  ProgressReportingTask *timeoutTooShortTask = new ProgressReportingTask();
+  connect( timeoutTooShortTask, &ProgressReportingTask::begun, &loop, &QEventLoop::quit );
+  manager.addTask( timeoutTooShortTask );
+  if ( timeoutTooShortTask->status() != QgsTask::Running )
+    loop.exec();
+
+  connect( &timer, &QTimer::timeout, timeoutTooShortTask, &ProgressReportingTask::finish );
+  timer.start( 1000 );
+  QCOMPARE( timeoutTooShortTask->status(), QgsTask::Running );
+  QCOMPARE( timeoutTooShortTask->waitForFinished( 20 ), false );
+  QCOMPARE( timeoutTooShortTask->status(), QgsTask::Running );
+}
+
 void TestQgsTaskManager::progressChanged()
 {
   // check that progressChanged signals emitted by tasks result in progressChanged signal from manager
