COMP: Ensure DICOM Query, Retrieve and Schedule tests use a different DB

commontk · Jan 18, 2024 · d51bccd · d51bccd
1 parent d5806e9
commit d51bccd
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 18 deletions.
diff --git a/Libs/DICOM/Core/Testing/Cpp/ctkDICOMQueryTest2.cpp b/Libs/DICOM/Core/Testing/Cpp/ctkDICOMQueryTest2.cpp
@@ -22,8 +22,12 @@
 #include <QCoreApplication>
 #include <QDebug>
 #include <QStringList>
+#include <QTemporaryDir>
 #include <QVariant>
 
+// ctkCore includes
+#include <ctkCoreTestingMacros.h>
+
 // ctkDICOMCore includes
 #include "ctkDICOMDatabase.h"
 #include "ctkDICOMQuery.h"
@@ -48,17 +52,18 @@ int ctkDICOMQueryTest2( int argc, char * argv [] )
     return EXIT_FAILURE;
     }
 
+  QTemporaryDir tempDirectory;
+  CHECK_BOOL(tempDirectory.isValid(), true);
+
   ctkDICOMTester tester;
   tester.startDCMQRSCP();
   tester.storeData(arguments);
 
   ctkDICOMDatabase database;
-  QString dbFile = "./ctkDICOM.sql";
-  if (!database.openDatabase(dbFile))
-    {
-    std::cout << "ctkDICOMDatabase::openDatabase() failed" << std::endl;
-    return EXIT_FAILURE;
-    }
+
+  QDir databaseDirectory(tempDirectory.path());
+  QString dbFile = QFileInfo(databaseDirectory, QString("ctkDICOM.sql")).absoluteFilePath();
+  CHECK_BOOL(database.openDatabase(dbFile), true);
   database.cleanup(true);
 
   ctkDICOMQuery query;

diff --git a/Libs/DICOM/Core/Testing/Cpp/ctkDICOMRetrieveTest2.cpp b/Libs/DICOM/Core/Testing/Cpp/ctkDICOMRetrieveTest2.cpp
@@ -24,8 +24,12 @@
 #include <QPair>
 #include <QString>
 #include <QStringList>
+#include <QTemporaryDir>
 #include <QVariant>
 
+// ctkCore includes
+#include <ctkCoreTestingMacros.h>
+
 // ctkDICOMCore includes
 #include "ctkDICOMDatabase.h"
 #include "ctkDICOMQuery.h"
@@ -51,6 +55,9 @@ int ctkDICOMRetrieveTest2( int argc, char * argv [] )
     return EXIT_FAILURE;
     }
 
+  QTemporaryDir tempDirectory;
+  CHECK_BOOL(tempDirectory.isValid(), true);
+
   ctkDICOMTester tester;
   std::cerr << "ctkDICOMRetrieveTest2: Starting dcmqrscp\n";
   tester.startDCMQRSCP();
@@ -59,12 +66,10 @@ int ctkDICOMRetrieveTest2( int argc, char * argv [] )
   tester.storeData(arguments);
 
   ctkDICOMDatabase database;
-  QString dbFile = "./ctkDICOM.sql";
-  if (!database.openDatabase(dbFile))
-    {
-    std::cout << "ctkDICOMDatabase::openDatabase() failed" << std::endl;
-    return EXIT_FAILURE;
-    }
+
+  QDir databaseDirectory(tempDirectory.path());
+  QString dbFile = QFileInfo(databaseDirectory, QString("ctkDICOM.sql")).absoluteFilePath();
+  CHECK_BOOL(database.openDatabase(dbFile), true);
   database.cleanup(true);
 
   std::cerr << "ctkDICOMRetrieveTest2: Setting up query\n";

diff --git a/Libs/DICOM/Core/Testing/Cpp/ctkDICOMSchedulerTest1.cpp b/Libs/DICOM/Core/Testing/Cpp/ctkDICOMSchedulerTest1.cpp
@@ -24,9 +24,10 @@
 
 // Qt includes
 #include <QCoreApplication>
+#include <QTemporaryDir>
 
 // ctkCore includes
-#include "ctkCoreTestingMacros.h"
+#include <ctkCoreTestingMacros.h>
 
 // ctkDICOMCore includes
 #include "ctkDICOMScheduler.h"
@@ -47,6 +48,9 @@ int ctkDICOMSchedulerTest1(int argc, char * argv []) {
     return EXIT_FAILURE;
     }
 
+  QTemporaryDir tempDirectory;
+  CHECK_BOOL(tempDirectory.isValid(), true);
+
   int numberOfImages = arguments.count();
 
   ctkDICOMTester tester;
@@ -78,14 +82,13 @@ int ctkDICOMSchedulerTest1(int argc, char * argv []) {
   // Test scheduler
   std::cout << qPrintable(testName) << ": Setting up scheduler" << std::endl;
   ctkDICOMDatabase database;
-  QString dbFile = "./ctkDICOM.sql";
-  QFile file(dbFile);
-  file.remove();
-  QFile cacheFile("./ctkDICOMTagCache.sql");
-  cacheFile.remove();
+
+  QDir databaseDirectory(tempDirectory.path());
+  QString dbFile = QFileInfo(databaseDirectory, QString("ctkDICOM.sql")).absoluteFilePath();
   CHECK_BOOL(database.openDatabase(dbFile), true);
   CHECK_BOOL(database.isOpen(), true);
   database.cleanup(true);
+
   CHECK_INT(database.patients().count(), 0);
 
   scheduler.setDicomDatabase(database);