Merge branch release-2018

[alexxy/gromacs.git] / src / gromacs / gmxpreprocess / tests / solvate.cpp

diff --git a/src/gromacs/gmxpreprocess/tests/solvate.cpp b/src/gromacs/gmxpreprocess/tests/solvate.cpp
index cbcc89385d52a40669547b95598840c3dca6d964..8b8e6594593cded197500e4a7449b8013eb2a631 100644 (file)
--- a/src/gromacs/gmxpreprocess/tests/solvate.cpp
+++ b/src/gromacs/gmxpreprocess/tests/solvate.cpp
@@ -106,7 +106,7 @@ TEST_F(SolvateTest, cs_cp_p_Works)
     setInputFile("-cp", "spc-and-methanol.gro");
 
     // TODO: Consider adding a convenience method for this.
-    std::string topFileName           = fileManager().getInputFilePath("spc-and-methanol.top");
+    std::string topFileName           = gmx::test::TestFileManager::getInputFilePath("spc-and-methanol.top");
     std::string modifiableTopFileName = fileManager().getTemporaryFilePath(".top");
     gmx_file_copy(topFileName.c_str(), modifiableTopFileName.c_str(), true);
     commandLine().addOption("-p", modifiableTopFileName);
@@ -138,7 +138,7 @@ TEST_F(SolvateTest, update_Topology_Works)
     // TODO: Consider adding a convenience method for this.
     // Copies topology file to where it would be found as an output file, so the copied
     // .top file is used as both input and output
-    std::string topFileName           = fileManager().getInputFilePath("simple.top");
+    std::string topFileName           = gmx::test::TestFileManager::getInputFilePath("simple.top");
     std::string modifiableTopFileName = fileManager().getTemporaryFilePath("simple.top");
     gmx_file_copy(topFileName.c_str(), modifiableTopFileName.c_str(), true);
     setOutputFile("-p", "simple.top", ExactTextMatch());