ENH: Support running ctkDICOMDatabase tests in parallel using QTempor…

…aryDir
commontk · Jan 13, 2024 · bfe6d92 · bfe6d92
1 parent 0f5da46
commit bfe6d92
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 8 deletions.
diff --git a/Libs/DICOM/Core/Testing/Cpp/ctkDICOMDatabaseTest1.cpp b/Libs/DICOM/Core/Testing/Cpp/ctkDICOMDatabaseTest1.cpp
@@ -21,8 +21,12 @@
 // Qt includes
 #include <QCoreApplication>
 #include <QDir>
+#include <QTemporaryDir>
 #include <QTimer>
 
+// ctkCore includes
+#include <ctkCoreTestingMacros.h>
+
 // ctkDICOMCore includes
 #include "ctkDICOMDatabase.h"
 
@@ -35,8 +39,11 @@ int ctkDICOMDatabaseTest1( int argc, char * argv [] )
 {
   QCoreApplication app(argc, argv);
 
+  QTemporaryDir tempDirectory;
+  CHECK_BOOL(tempDirectory.isValid(), true);
+
   ctkDICOMDatabase database;
-  QDir databaseDirectory = QDir::temp();
+  QDir databaseDirectory(tempDirectory.path());
   QFileInfo databaseFile(databaseDirectory, QString("database.test"));
   database.openDatabase(databaseFile.absoluteFilePath());
 

diff --git a/Libs/DICOM/Core/Testing/Cpp/ctkDICOMDatabaseTest2.cpp b/Libs/DICOM/Core/Testing/Cpp/ctkDICOMDatabaseTest2.cpp
@@ -21,8 +21,12 @@
 // Qt includes
 #include <QCoreApplication>
 #include <QDir>
+#include <QTemporaryDir>
 #include <QTimer>
 
+// ctkCore includes
+#include <ctkCoreTestingMacros.h>
+
 // ctkDICOMCore includes
 #include "ctkDICOMDatabase.h"
 
@@ -44,8 +48,11 @@ int ctkDICOMDatabaseTest2( int argc, char * argv [] )
 
   QString dicomFilePath(argv[1]);
 
+  QTemporaryDir tempDirectory;
+  CHECK_BOOL(tempDirectory.isValid(), true);
+
   ctkDICOMDatabase database;
-  QDir databaseDirectory = QDir::temp();
+  QDir databaseDirectory(tempDirectory.path());
   databaseDirectory.remove("ctkDICOMDatabase.sql");
   databaseDirectory.remove("ctkDICOMTagCache.sql");
 

diff --git a/Libs/DICOM/Core/Testing/Cpp/ctkDICOMDatabaseTest3.cpp b/Libs/DICOM/Core/Testing/Cpp/ctkDICOMDatabaseTest3.cpp
@@ -21,6 +21,10 @@
 // Qt includes
 #include <QCoreApplication>
 #include <QDir>
+#include <QTemporaryDir>
+
+// ctkCore includes
+#include <ctkCoreTestingMacros.h>
 
 // ctkDICOMCore includes
 #include "ctkDICOMDatabase.h"
@@ -41,9 +45,10 @@ int ctkDICOMDatabaseTest3( int argc, char * argv [] )
     return EXIT_FAILURE;
     }
 
-  QDir databaseDirectory = QDir::temp();
-  databaseDirectory.remove("ctkDICOMDatabase.sql");
+  QTemporaryDir tempDirectory;
+  CHECK_BOOL(tempDirectory.isValid(), true);
 
+  QDir databaseDirectory(tempDirectory.path());
   QFileInfo databaseFile(databaseDirectory, QString("database.test"));
   QString databaseFileName(databaseFile.absoluteFilePath());
 

diff --git a/Libs/DICOM/Core/Testing/Cpp/ctkDICOMDatabaseTest4.cpp b/Libs/DICOM/Core/Testing/Cpp/ctkDICOMDatabaseTest4.cpp
@@ -21,6 +21,10 @@
 // Qt includes
 #include <QCoreApplication>
 #include <QDir>
+#include <QTemporaryDir>
+
+// ctkCore includes
+#include <ctkCoreTestingMacros.h>
 
 // ctkDICOMCore includes
 #include "ctkDICOMDatabase.h"
@@ -43,8 +47,11 @@ int ctkDICOMDatabaseTest4( int argc, char * argv [] )
 
   QString dicomFilePath(argv[1]);
 
+  QTemporaryDir tempDirectory;
+  CHECK_BOOL(tempDirectory.isValid(), true);
+
   ctkDICOMDatabase database;
-  QDir databaseDirectory = QDir::temp();
+  QDir databaseDirectory(tempDirectory.path());
   databaseDirectory.remove("ctkDICOMDatabase.sql");
   databaseDirectory.remove("ctkDICOMTagCache.sql");
 

diff --git a/Libs/DICOM/Core/Testing/Cpp/ctkDICOMDatabaseTest5.cpp b/Libs/DICOM/Core/Testing/Cpp/ctkDICOMDatabaseTest5.cpp
@@ -21,6 +21,10 @@
 // Qt includes
 #include <QCoreApplication>
 #include <QDir>
+#include <QTemporaryDir>
+
+// ctkCore includes
+#include <ctkCoreTestingMacros.h>
 
 // ctkDICOMCore includes
 #include "ctkDICOMDatabase.h"
@@ -43,8 +47,11 @@ int ctkDICOMDatabaseTest5( int argc, char * argv [] )
 
   QString dicomFilePath(argv[1]);
 
+  QTemporaryDir tempDirectory;
+  CHECK_BOOL(tempDirectory.isValid(), true);
+
   ctkDICOMDatabase database;
-  QDir databaseDirectory = QDir::temp();
+  QDir databaseDirectory(tempDirectory.path());
   databaseDirectory.remove("ctkDICOMDatabase.sql");
   databaseDirectory.remove("ctkDICOMTagCache.sql");
 

diff --git a/Libs/DICOM/Core/Testing/Cpp/ctkDICOMDatabaseTest6.cpp b/Libs/DICOM/Core/Testing/Cpp/ctkDICOMDatabaseTest6.cpp
@@ -21,6 +21,10 @@
 // Qt includes
 #include <QCoreApplication>
 #include <QDir>
+#include <QTemporaryDir>
+
+// ctkCore includes
+#include <ctkCoreTestingMacros.h>
 
 // ctkDICOMCore includes
 #include "ctkDICOMDatabase.h"
@@ -43,8 +47,11 @@ int ctkDICOMDatabaseTest6( int argc, char * argv [] )
 
   QString dicomFilePath(argv[1]);
 
+  QTemporaryDir tempDirectory;
+  CHECK_BOOL(tempDirectory.isValid(), true);
+
   ctkDICOMDatabase database;
-  QDir databaseDirectory = QDir::temp();
+  QDir databaseDirectory(tempDirectory.path());
   databaseDirectory.remove("ctkDICOMDatabase.sql");
   databaseDirectory.remove("ctkDICOMTagCache.sql");
 

diff --git a/Libs/DICOM/Core/Testing/Cpp/ctkDICOMDatabaseTest7.cpp b/Libs/DICOM/Core/Testing/Cpp/ctkDICOMDatabaseTest7.cpp
@@ -21,6 +21,10 @@
 // Qt includes
 #include <QCoreApplication>
 #include <QDir>
+#include <QTemporaryDir>
+
+// ctkCore includes
+#include <ctkCoreTestingMacros.h>
 
 // ctkDICOMCore includes
 #include "ctkDICOMDatabase.h"
@@ -34,8 +38,11 @@ int ctkDICOMDatabaseTest7( int argc, char * argv [] )
 {
   QCoreApplication app(argc, argv);
 
+  QTemporaryDir tempDirectory;
+  CHECK_BOOL(tempDirectory.isValid(), true);
+
   ctkDICOMDatabase database;
-  QDir databaseDirectory = QDir::temp();
+  QDir databaseDirectory(tempDirectory.path());
   databaseDirectory.remove("ctkDICOMDatabase.sql");
   databaseDirectory.remove("ctkDICOMTagCache.sql");