diff --git a/Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h b/Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h index 7ecea0ac03a265c206105d899a080402d4af240c..1f2a1202346eb5c5b971b7c24b68dde5f6c56a2c 100644 --- a/Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h +++ b/Code/Mantid/Framework/Kernel/test/ConfigServiceTest.h @@ -188,14 +188,14 @@ public: // TS_ASSERT_LESS_THAN(0, ConfigService::Instance().getHomeDir().length()); //check that the string is not empty TS_ASSERT_LESS_THAN(0, ConfigService::Instance().getTempDir().length()); //check that the string is not empty - std::string appdataDir = ConfigService::Instance().getAppDataDir(); - TS_ASSERT_LESS_THAN(0, appdataDir.length()); + std::string appdataDir = ConfigService::Instance().getAppDataDir(); + TS_ASSERT_LESS_THAN(0, appdataDir.length()); #ifdef _WIN32 - std::string::size_type index = appdataDir.find("\\AppData\\Roaming\\mantidproject\\mantid"); - TSM_ASSERT_LESS_THAN("Could not find correct path in getAppDataDir()",index,appdataDir.size()); + std::string::size_type index = appdataDir.find("\\AppData\\Roaming\\mantidproject\\mantid"); + TSM_ASSERT_LESS_THAN("Could not find correct path in getAppDataDir()",index,appdataDir.size()); #else - std::string::size_type index = appdataDir.find("/.mantid"); - TSM_ASSERT_LESS_THAN("Could not find correct path in getAppDataDir()",index,appdataDir.size()); + std::string::size_type index = appdataDir.find("/.mantid"); + TSM_ASSERT_LESS_THAN("Could not find correct path in getAppDataDir()",index,appdataDir.size()); #endif } @@ -204,25 +204,25 @@ public: { auto directories = ConfigService::Instance().getInstrumentDirectories(); - TS_ASSERT_LESS_THAN(1,directories.size()); - //the first entry should be the AppDataDir + instrument - TSM_ASSERT_LESS_THAN("Could not find the appData directory in getInstrumentDirectories()[0]",directories[0].find(ConfigService::Instance().getAppDataDir()),directories[0].size()); - TSM_ASSERT_LESS_THAN("Could not find the 'instrument' directory in getInstrumentDirectories()[0]",directories[0].find("instrument"),directories[0].size()); - - if (directories.size() == 3) - { - // The middle entry should be /etc/mantid/instrument - TSM_ASSERT_LESS_THAN("Could not find /etc/mantid/instrument path in getInstrumentDirectories()[1]",directories[1].find("etc/mantid/instrument"),directories[1].size()); - } - //Check that the last directory matches that returned by getInstrumentDirectory - TS_ASSERT_EQUALS(directories[directories.size()-1],ConfigService::Instance().getInstrumentDirectory()); - - //check all of the directory entries actually exist - for (auto it = directories.begin(); it != directories.end(); ++it) - { - Poco::File directory(*it); - TSM_ASSERT(*it + " does not exist", directory.exists()); - } + TS_ASSERT_LESS_THAN(1,directories.size()); + //the first entry should be the AppDataDir + instrument + TSM_ASSERT_LESS_THAN("Could not find the appData directory in getInstrumentDirectories()[0]",directories[0].find(ConfigService::Instance().getAppDataDir()),directories[0].size()); + TSM_ASSERT_LESS_THAN("Could not find the 'instrument' directory in getInstrumentDirectories()[0]",directories[0].find("instrument"),directories[0].size()); + + if (directories.size() == 3) + { + // The middle entry should be /etc/mantid/instrument + TSM_ASSERT_LESS_THAN("Could not find /etc/mantid/instrument path in getInstrumentDirectories()[1]",directories[1].find("etc/mantid/instrument"),directories[1].size()); + } + //Check that the last directory matches that returned by getInstrumentDirectory + TS_ASSERT_EQUALS(directories[directories.size()-1],ConfigService::Instance().getInstrumentDirectory()); + + //check all of the directory entries actually exist + for (auto it = directories.begin(); it != directories.end(); ++it) + { + Poco::File directory(*it); + TSM_ASSERT(*it + " does not exist", directory.exists()); + } }