Merge lp:~carlos-mazieri/ubuntu-filemanager-app/filemanager-bug-1405759 into lp:ubuntu-filemanager-app

[Carlos Jose Mazieri]

enhances the test case TestDirModel::modelCancelRemoveAction()

It just enhances the test case TestDirModel::modelCancelRemoveAction() to match the scenario described in the bug #1405759.

It does not solve the bug, the test above worked reproducing such scenario.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:352
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/437/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/523
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/523/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-vivid-amd64-ci/59

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/437/rebuild

review: Approve (continuous-integration)

[Arto Jalkanen (ajalkane)]

Always good to have more tests, looks fine :).

review: Approve

=== modified file 'src/plugin/test_folderlistmodel/regression/tst_folderlistmodel.cpp'
--- src/plugin/test_folderlistmodel/regression/tst_folderlistmodel.cpp	2014-06-17 21:41:59 +0000
+++ src/plugin/test_folderlistmodel/regression/tst_folderlistmodel.cpp	2014-12-27 15:17:08 +0000
@@ -199,6 +199,7 @@
     int            m_extFSWatcherPathModifiedCounter;
     int            m_selectedItemsCounter;
     int            m_selectionMode;
+    int            m_minimumProgressToCancelAction;
 
 };
 
@@ -345,11 +346,11 @@
 }
 
 void TestDirModel::cancel(int index, int, int percent)
-{
-    DirModel * model = static_cast<DirModel*> (sender());
-    if (index > 1 ||  percent > 1)
+{   
+    if (index > 1 ||  percent > m_minimumProgressToCancelAction)
     {
-         model->cancelAction();
+        DirModel * model = static_cast<DirModel*> (sender());
+        model->cancelAction();
     }
 }
 
@@ -453,6 +454,7 @@
    m_extFSWatcherPathModifiedCounter = 0;
    m_selectedItemsCounter   = 0;
    m_selectionMode          = -1;
+   m_minimumProgressToCancelAction = 1;
 }
 
 
@@ -475,6 +477,7 @@
     m_extFSWatcherPathModifiedCounter   = 0;
     m_selectedItemsCounter = 0;
     m_selectionMode          = -1;
+    m_minimumProgressToCancelAction = 1;
 }
 
 
@@ -931,6 +934,23 @@
      QCOMPARE(totalCopied, m_progressTotalItems);
 }
 
+
+/*!
+ * \brief TestDirModel::modelCancelRemoveAction()
+ *
+ *  It tests cancel on a remove operation
+ *
+ *  Two directories with a deep tree of items are created
+ *
+ *  The first directory is removed and the cancel is triggered after 10 percent of the all files be removed,
+ *  then the first phase of the checks are performed
+ *
+ *  The second phase consists in remove the same directory after the cancel operation
+ *  then a new set of checks are performed
+ *
+ *  The third phase consists in remove the second directory previously created
+ *
+ */
 void TestDirModel::modelCancelRemoveAction()
 {
      const int level = 30;
@@ -943,17 +963,70 @@
      QCOMPARE(m_dirModel_01->rowCount(), 1);
      connect(m_dirModel_01, SIGNAL(progress(int,int,int)),
              this,          SLOT(progress(int,int,int)));
+
+     connect(m_dirModel_01, SIGNAL(error(QString,QString)),
+             this,          SLOT(slotError(QString,QString)));
+
+     //cancel only after removing some files
+     m_minimumProgressToCancelAction = 10;
      connect(m_dirModel_01, SIGNAL(progress(int,int,int)),
              this,          SLOT(cancel(int,int,int)));
 
+
+     //create a second directory
+     m_deepDir_02 = new DeepDir("modelCancelRemoveAction2", level);
+     QCOMPARE( QFileInfo(m_deepDir_02->path()).exists(),  true);
+
+     m_dirModel_02->setPath(m_deepDir_02->path());
+     QTest::qWait(TIME_TO_REFRESH_DIR);
+     QCOMPARE(m_dirModel_02->rowCount(), 1);
+
+
+     //remove from first directory
      m_dirModel_01->removeIndex(0);
      QTest::qWait(TIME_TO_PROCESS);
      QTest::qWait(5);
 
-     QCOMPARE(m_filesRemoved.count() , 0);
+     // sub items do not emit removed()
+     QCOMPARE(m_filesRemoved.count(), 0);
      QCOMPARE(m_dirModel_01->rowCount(), 1);
      QVERIFY(m_progressCurrentItem > 0);     // some file were performed
      QVERIFY(m_progressPercentDone < 100);   //
+     QCOMPARE(m_receivedErrorSignal, false);
+     // high level item still exists
+     QDir a(m_deepDir_01->path(), QString(), QDir::NoSort,  QDir::AllEntries | QDir::NoDotAndDotDot);
+     QCOMPARE(a.exists(), true);
+     QCOMPARE((int)a.count(), 1);
+
+     //First phase OK cancel worked
+     //SECOND PHASE  now remove everything
+     disconnect(m_dirModel_01, SIGNAL(progress(int,int,int)),
+                this,          SLOT(cancel(int,int,int)));
+
+     m_dirModel_01->removeIndex(0);
+     QTest::qWait(TIME_TO_PROCESS * 2);
+     QTest::qWait(5);
+     QCOMPARE(m_progressPercentDone,  100);
+     QCOMPARE(m_filesRemoved.count(), 1);
+     QCOMPARE(m_dirModel_01->rowCount(), 0);
+     QCOMPARE(m_receivedErrorSignal, false);
+     // high level item does NOT exist anymore
+     QDir b(m_deepDir_01->path(), QString(), QDir::NoSort, QDir::AllEntries | QDir::NoDotAndDotDot);
+     QCOMPARE(b.exists(), true);
+     QCOMPARE((int)b.count(), 0);
+
+     //THIRD PHASE
+     //now remove the second directory
+     QDir c(m_deepDir_02->path(), QString(), QDir::NoSort, QDir::AllEntries | QDir::NoDotAndDotDot);
+     QCOMPARE(c.exists(), true);
+     QCOMPARE((int)c.count(), 1);
+     m_dirModel_02->removeIndex(0);
+     QTest::qWait(TIME_TO_PROCESS * 2);
+     QDir d(m_deepDir_02->path(), QString(), QDir::NoSort, QDir::AllEntries | QDir::NoDotAndDotDot);
+     QCOMPARE(d.exists(), true);
+     QCOMPARE((int)d.count(), 0);
+     QCOMPARE(m_receivedErrorSignal, false);
+     QCOMPARE(m_dirModel_02->rowCount(), 0);
 }
 
 void TestDirModel::modelTestFileSize()