Extend TestFileManager

[alexxy/gromacs.git] / src / testutils / testfilemanager.cpp

diff --git a/src/testutils/testfilemanager.cpp b/src/testutils/testfilemanager.cpp
index 0a7027ec5f1427dc61152080c24586779ce1d407..3d6f251975ce593ded162aa801f6b8b7b85816a6 100644 (file)
--- a/src/testutils/testfilemanager.cpp
+++ b/src/testutils/testfilemanager.cpp
@@ -75,12 +75,23 @@ class TestFileManager::Impl
         //! Global test input data path set with setDataInputDirectory().
         static const char *s_inputDirectory;
 
-        //! Global temporary output directory for tests, set with setOutputTempDirectory().
-        static const char *s_outputTempDirectory;
+        //! Global temporary output directory for tests, set with setGlobalOutputTempDirectory().
+        static const char *s_globalOutputTempDirectory;
 
         //! Container type for names of temporary files.
         typedef std::set<std::string> FileNameList;
 
+        /*! \brief Constructor
+         *
+         * \param path Value for the outputTempDirectory, typically
+         * set by default from s_globalOutputTempDirectory */
+        explicit Impl(const char *path)
+            : outputTempDirectory_(path)
+        {
+            GMX_RELEASE_ASSERT(Directory::exists(outputTempDirectory_),
+                               "Directory for tests' temporary files does not exist");
+        }
+
         /*! \brief
          * Try to remove all temporary files.
          *
@@ -90,10 +101,15 @@ class TestFileManager::Impl
 
         //! List of unique paths returned by getTemporaryFilePath().
         FileNameList            files_;
+
+        /*! \brief Temporary output directory local to the current
+         * test, set by a test with setOutputTempDirectory() if the
+         * global default is inappropriate. */
+        std::string outputTempDirectory_;
 };
 
-const char *TestFileManager::Impl::s_inputDirectory      = NULL;
-const char *TestFileManager::Impl::s_outputTempDirectory = NULL;
+const char *TestFileManager::Impl::s_inputDirectory            = NULL;
+const char *TestFileManager::Impl::s_globalOutputTempDirectory = NULL;
 /** Controls whether TestFileManager should delete temporary files
     after the test finishes. */
 static bool g_bDeleteFilesAfterTest = true;
@@ -122,7 +138,7 @@ void TestFileManager::Impl::removeFiles()
  */
 
 TestFileManager::TestFileManager()
-    : impl_(new Impl())
+    : impl_(new Impl(Impl::s_globalOutputTempDirectory))
 {
 }
 
@@ -174,10 +190,15 @@ const char *TestFileManager::getInputDataDirectory()
     return Impl::s_inputDirectory;
 }
 
-const char *TestFileManager::getOutputTempDirectory()
+const char *TestFileManager::getGlobalOutputTempDirectory()
+{
+    GMX_RELEASE_ASSERT(Impl::s_globalOutputTempDirectory != NULL, "Global path for temporary output files from tests is not set");
+    return Impl::s_globalOutputTempDirectory;
+}
+
+const char *TestFileManager::getOutputTempDirectory() const
 {
-    GMX_RELEASE_ASSERT(Impl::s_outputTempDirectory != NULL, "Path for temporary output files from tests is not set");
-    return Impl::s_outputTempDirectory;
+    return impl_->outputTempDirectory_.c_str();
 }
 
 void TestFileManager::setInputDataDirectory(const char *path)
@@ -189,13 +210,22 @@ void TestFileManager::setInputDataDirectory(const char *path)
     Impl::s_inputDirectory = path;
 }
 
-void TestFileManager::setOutputTempDirectory(const char *path)
+void TestFileManager::setGlobalOutputTempDirectory(const char *path)
 {
     // There is no need to protect this by a mutex, as this is called in early
     // initialization of the tests.
     GMX_RELEASE_ASSERT(Directory::exists(path),
                        "Directory for tests' temporary files does not exist");
-    Impl::s_outputTempDirectory = path;
+    Impl::s_globalOutputTempDirectory = path;
+}
+
+void TestFileManager::setOutputTempDirectory(const std::string &path)
+{
+    // There could be a need to protect this with a mutex, since it is
+    // intended to be used in test fixtures, not just during setup.
+    GMX_RELEASE_ASSERT(Directory::exists(path),
+                       "Directory for tests' temporary files does not exist");
+    impl_->outputTempDirectory_ = path;
 }
 
 } // namespace test