BUG: ctkDICOMBrowser: Add ImportDirectories and ImportDirectory test

Libs/DICOM/Widgets/Testing/Cpp/CMakeLists.txt

@@ -68,6 +68,7 @@ SIMPLE_TEST(ctkDICOMThumbnailListWidgetTest1
 if(EXISTS "${CTKData_DIR}")
   SIMPLE_TEST(ctkDICOMAppWidgetTest1 ${CTKData_DIR}/Data/DICOM/MRHEAD)
   SIMPLE_TEST(ctkDICOMBrowserTest)
+  set_property(TEST ctkDICOMBrowserTest PROPERTY ENVIRONMENT "CTKData_DIR=${CTKData_DIR}")
   SIMPLE_TEST(ctkDICOMBrowserTest1 ${CTKData_DIR}/Data/DICOM/MRHEAD)
   SIMPLE_TEST(ctkDICOMItemViewTest1 ${CTKData_DIR}/Data/DICOM/MRHEAD/000055.IMA)
   SIMPLE_TEST(ctkDICOMImageTest1 ${CTKData_DIR}/Data/DICOM/MRHEAD/000055.IMA)

Libs/DICOM/Widgets/Testing/Cpp/ctkDICOMBrowserTest.cpp

@@ -23,6 +23,7 @@
 #include <QTest>
 
 // CTK includes
+#include "ctkDICOMDatabase.h"
 #include "ctkDICOMBrowser.h"
 #include "ctkScopedCurrentDir.h"
 #include "ctkTest.h"
@@ -34,17 +35,59 @@ class ctkDICOMBrowserTester: public QObject
   Q_OBJECT
 private slots:
 
+  void initTestCase();
+  void init();
+
   void testDefaults();
+
+  void testDatabaseDirectory();
+
+  void testOnImportDirectories();
+  void testOnImportDirectories_data();
+
+  void testOnImportDirectory();
+  void testOnImportDirectory_data();
+
+private:
+  void _testImportCommon(ctkDICOMBrowser& browser);
+
+  QString TemporaryDatabaseDirectoryName;
+
+  QDir DICOMDir;
 };
 
 // ----------------------------------------------------------------------------
-void ctkDICOMBrowserTester::testDefaults()
+void ctkDICOMBrowserTester::initTestCase()
 {
-  ctkScopedCurrentDir scopedCurrentDir(QDir::tempPath());
+  // Get data directory from environment
+  QDir dataDir = QDir(
+        QProcessEnvironment::systemEnvironment().value("CTKData_DIR", ""));
+  QVERIFY(dataDir.exists());
+
+  this->DICOMDir = dataDir.filePath("Data/DICOM");
+  QVERIFY(this->DICOMDir.exists());
+}
 
-  // If any, remove ./ctkDICOM-Database directory
+// ----------------------------------------------------------------------------
+void ctkDICOMBrowserTester::init()
+{
+  // If any, remove default ./ctkDICOM-Database directory
+  {
+  ctkScopedCurrentDir scopedCurrentDir(QDir::tempPath());
   ctk::removeDirRecursively("./ctkDICOM-Database");
   QCOMPARE(QFileInfo("./ctkDICOM-Database").isDir(), false);
+  }
+
+  // Generate a new database directory name
+  this->TemporaryDatabaseDirectoryName =
+      QString("ctkDICOMBrowserTest.%1.DICOM-Database").arg(QTime::currentTime().toString("hhmmsszzz"));
+}
+
+// ----------------------------------------------------------------------------
+void ctkDICOMBrowserTester::testDefaults()
+{
+  // Clear left over settings
+  QSettings().remove(ctkDICOMBrowser::databaseDirectorySettingsKey());
 
   ctkDICOMBrowser browser;
 
@@ -72,5 +115,133 @@ void ctkDICOMBrowserTester::testDefaults()
 }
 
 // ----------------------------------------------------------------------------
+void ctkDICOMBrowserTester::testDatabaseDirectory()
+{
+  // Check that value from setting is picked up
+  {
+  QSettings().setValue(ctkDICOMBrowser::databaseDirectorySettingsKey(), this->TemporaryDatabaseDirectoryName);
+  QCOMPARE(QFileInfo(this->TemporaryDatabaseDirectoryName).isDir(), false);
+
+  ctkDICOMBrowser browser;
+
+  QCOMPARE(QFileInfo(browser.databaseDirectory()).absoluteFilePath(),
+           QFileInfo(this->TemporaryDatabaseDirectoryName).absoluteFilePath());
+  QVERIFY(QDir(browser.databaseDirectory()).exists());
+  }
+}
+
+// ----------------------------------------------------------------------------
+void ctkDICOMBrowserTester::testOnImportDirectories()
+{
+  QFETCH(QStringList, directories);
+  QFETCH(ctkDICOMBrowser::ImportDirectoryMode, importDirectoryMode);
+
+  QSettings().setValue(ctkDICOMBrowser::databaseDirectorySettingsKey(), this->TemporaryDatabaseDirectoryName);
+
+  ctkDICOMBrowser browser;
+
+  browser.setDisplayImportSummary(false);
+  browser.onImportDirectories(directories, /* mode= */ importDirectoryMode, /* confirm= */ false);
+
+  this->_testImportCommon(browser);
+}
+
+// ----------------------------------------------------------------------------
+void ctkDICOMBrowserTester::_testImportCommon(ctkDICOMBrowser& browser)
+{
+  QFETCH(int, expectedImporedPatients);
+  QFETCH(int, expectedImporedStudies);
+  QFETCH(int, expectedImporedSeries);
+  QFETCH(int, expectedImporedInstances);
+
+  QCOMPARE(browser.patientsAddedDuringImport(), expectedImporedPatients);
+  QCOMPARE(browser.studiesAddedDuringImport(), expectedImporedStudies);
+  QCOMPARE(browser.seriesAddedDuringImport(), expectedImporedSeries);
+  QCOMPARE(browser.instancesAddedDuringImport(), expectedImporedInstances);
+
+  QFETCH(int, expectedTotalPatients);
+  QFETCH(int, expectedTotalStudies);
+  QFETCH(int, expectedTotalSeries);
+  QFETCH(int, expectedTotalInstances);
+
+  int currentPatientCount = 0;
+  int currentStudyCount = 0;
+  int currentSerieCount = 0;
+  int currentInstanceCount = 0;
+
+  QStringList patients =  browser.database()->patients();
+  currentPatientCount += patients.count();
+  foreach(const QString& patient, patients)
+    {
+    QStringList studies = browser.database()->studiesForPatient(patient);
+    currentStudyCount += studies.count();
+    foreach(const QString& study, studies)
+      {
+      QStringList series = browser.database()->seriesForStudy(study);
+      currentSerieCount += series.count();
+      foreach(const QString& serie, series)
+        {
+        QStringList instances = browser.database()->instancesForSeries(serie);
+        currentInstanceCount += instances.count();
+        }
+      }
+    }
+
+  QCOMPARE(currentPatientCount, expectedTotalPatients);
+  QCOMPARE(currentStudyCount, expectedTotalStudies);
+  QCOMPARE(currentSerieCount, expectedTotalSeries);
+  QCOMPARE(currentInstanceCount, expectedTotalInstances);
+}
+
+// ----------------------------------------------------------------------------
+void ctkDICOMBrowserTester::testOnImportDirectories_data()
+{
+  this->testOnImportDirectory_data();
+}
+
+// ----------------------------------------------------------------------------
+void ctkDICOMBrowserTester::testOnImportDirectory()
+{
+  QFETCH(QStringList, directories);
+  QFETCH(ctkDICOMBrowser::ImportDirectoryMode, importDirectoryMode);
+
+  QSettings().setValue(ctkDICOMBrowser::databaseDirectorySettingsKey(), this->TemporaryDatabaseDirectoryName);
+
+  ctkDICOMBrowser browser;
+
+  browser.setDisplayImportSummary(false);
+  browser.onImportDirectory(directories[0], /* mode= */ importDirectoryMode, /* confirm= */ false);
+
+  this->_testImportCommon(browser);
+}
+
+// ----------------------------------------------------------------------------
+void ctkDICOMBrowserTester::testOnImportDirectory_data()
+{
+  QTest::addColumn<QStringList>("directories");
+  QTest::addColumn<ctkDICOMBrowser::ImportDirectoryMode>("importDirectoryMode");
+  QTest::addColumn<int>("expectedImporedPatients");
+  QTest::addColumn<int>("expectedImporedStudies");
+  QTest::addColumn<int>("expectedImporedSeries");
+  QTest::addColumn<int>("expectedImporedInstances");
+  QTest::addColumn<int>("expectedTotalPatients");
+  QTest::addColumn<int>("expectedTotalStudies");
+  QTest::addColumn<int>("expectedTotalSeries");
+  QTest::addColumn<int>("expectedTotalInstances");
+
+  QTest::newRow("1-MRHEAD")
+      << /* directories */ (QStringList() << this->DICOMDir.filePath("MRHEAD"))
+      << /* importDirectoryMode */ ctkDICOMBrowser::ImportDirectoryAddLink
+      << /* expectedImporedPatients */ 1
+      << /* expectedImporedStudies */ 1
+      << /* expectedImporedSeries */ 1
+      << /* expectedImporedInstances */ 100
+      << /* expectedTotalPatients */ 1
+      << /* expectedTotalStudies */ 1
+      << /* expectedTotalSeries */ 1
+      << /* expectedTotalInstances */ 100;
+}
+
+// ----------------------------------------------------------------------------
 CTK_TEST_MAIN(ctkDICOMBrowserTest)
 #include "moc_ctkDICOMBrowserTest.cpp"

Libs/DICOM/Widgets/ctkDICOMBrowser.cpp

@@ -277,6 +277,8 @@ ctkDICOMBrowser::ctkDICOMBrowser(QWidget* _parent):Superclass(_parent),
 {
   Q_D(ctkDICOMBrowser);
 
+  qRegisterMetaType<ctkDICOMBrowser::ImportDirectoryMode>("ctkDICOMBrowser::ImportDirectoryMode");
+
   d->setupUi(this);
 
   // signals related to tracking inserts

Libs/DICOM/Widgets/ctkDICOMBrowser.h

@@ -246,4 +246,6 @@ private:
   Q_DISABLE_COPY(ctkDICOMBrowser);
 };
 
+Q_DECLARE_METATYPE(ctkDICOMBrowser::ImportDirectoryMode)
+
 #endif