Skip to content
Snippets Groups Projects
Commit 41939ad9 authored by Nick Draper's avatar Nick Draper
Browse files

clang format re #18885

parent efc11d88
No related merge requests found
...@@ -100,19 +100,15 @@ public: ...@@ -100,19 +100,15 @@ public:
} }
static void destroySuite(DownloadInstrumentTest *suite) { delete suite; } static void destroySuite(DownloadInstrumentTest *suite) { delete suite; }
void createDirectory(Poco::Path path) void createDirectory(Poco::Path path) {
{
Poco::File file(path); Poco::File file(path);
if (file.createDirectory()) if (file.createDirectory()) {
{
m_directoriesToRemove.push_back(file); m_directoriesToRemove.push_back(file);
} }
} }
void removeDirectories() void removeDirectories() {
{ for (auto directory : m_directoriesToRemove) {
for (auto directory : m_directoriesToRemove)
{
try { try {
directory.remove(true); directory.remove(true);
} catch (Poco::FileException &fe) { } catch (Poco::FileException &fe) {
...@@ -125,7 +121,7 @@ public: ...@@ -125,7 +121,7 @@ public:
void setUp() override { void setUp() override {
const std::string TEST_SUFFIX = "TEMPORARY_unitTest"; const std::string TEST_SUFFIX = "TEMPORARY_unitTest";
m_originalInstDir = m_originalInstDir =
Mantid::Kernel::ConfigService::Instance().getInstrumentDirectories(); Mantid::Kernel::ConfigService::Instance().getInstrumentDirectories();
// change the local download directory by adding a unittest subdirectory // change the local download directory by adding a unittest subdirectory
auto testDirectories = m_originalInstDir; auto testDirectories = m_originalInstDir;
...@@ -143,17 +139,20 @@ public: ...@@ -143,17 +139,20 @@ public:
createDirectory(installInstrumentPath); createDirectory(installInstrumentPath);
testDirectories.back() = installInstrumentPath.toString(); testDirectories.back() = installInstrumentPath.toString();
} catch (Poco::FileException &) { } catch (Poco::FileException &) {
std::cout << "Failed to change instrument directory continuing without, fine, just slower\n"; std::cout << "Failed to change instrument directory continuing without, "
"fine, just slower\n";
} }
Mantid::Kernel::ConfigService::Instance().setInstrumentDirectories(testDirectories); Mantid::Kernel::ConfigService::Instance().setInstrumentDirectories(
testDirectories);
auto test = auto test =
Mantid::Kernel::ConfigService::Instance().getInstrumentDirectories(); Mantid::Kernel::ConfigService::Instance().getInstrumentDirectories();
} }
void tearDown() override { void tearDown() override {
Mantid::Kernel::ConfigService::Instance().setInstrumentDirectories(m_originalInstDir); Mantid::Kernel::ConfigService::Instance().setInstrumentDirectories(
m_originalInstDir);
removeDirectories(); removeDirectories();
} }
...@@ -163,7 +162,7 @@ public: ...@@ -163,7 +162,7 @@ public:
TS_ASSERT(alg.isInitialized()) TS_ASSERT(alg.isInitialized())
} }
// These tests create some files, but they entire directories are created and // These tests create some files, but they entire directories are created and
// removed in setup and teardown // removed in setup and teardown
void test_exec() { void test_exec() {
TSM_ASSERT_EQUALS("The expected number of files downloaded was wrong.", TSM_ASSERT_EQUALS("The expected number of files downloaded was wrong.",
...@@ -179,14 +178,13 @@ public: ...@@ -179,14 +178,13 @@ public:
std::ofstream file; std::ofstream file;
file.open(orphanedFilePath.toString().c_str()); file.open(orphanedFilePath.toString().c_str());
file.close(); file.close();
TSM_ASSERT_EQUALS("The expected number of files downloaded was wrong.", TSM_ASSERT_EQUALS("The expected number of files downloaded was wrong.",
runDownloadInstrument(), 2); runDownloadInstrument(), 2);
Poco::File orphanedFile(orphanedFilePath); Poco::File orphanedFile(orphanedFilePath);
TSM_ASSERT("The orphaned file was not deleted", TSM_ASSERT("The orphaned file was not deleted",
orphanedFile.exists() == false); orphanedFile.exists() == false);
} }
int runDownloadInstrument() { int runDownloadInstrument() {
......
...@@ -208,7 +208,7 @@ public: ...@@ -208,7 +208,7 @@ public:
/// Get the list of user search paths /// Get the list of user search paths
const std::vector<std::string> &getUserSearchDirs() const; const std::vector<std::string> &getUserSearchDirs() const;
/// Sets instrument directories /// Sets instrument directories
void setInstrumentDirectories(const std::vector<std::string>& directories); void setInstrumentDirectories(const std::vector<std::string> &directories);
/// Get instrument search directory /// Get instrument search directory
const std::vector<std::string> &getInstrumentDirectories() const; const std::vector<std::string> &getInstrumentDirectories() const;
/// Get instrument search directory /// Get instrument search directory
......
...@@ -360,11 +360,12 @@ public: ...@@ -360,11 +360,12 @@ public:
void TestSetInstrumentDirectory() { void TestSetInstrumentDirectory() {
auto originalDirectories = ConfigService::Instance().getInstrumentDirectories(); auto originalDirectories =
ConfigService::Instance().getInstrumentDirectories();
std::vector<std::string> testDirectories; std::vector<std::string> testDirectories;
testDirectories.push_back("Test Directory 1"); testDirectories.push_back("Test Directory 1");
testDirectories.push_back("Test Directory 2"); testDirectories.push_back("Test Directory 2");
ConfigService::Instance().setInstrumentDirectories(testDirectories); ConfigService::Instance().setInstrumentDirectories(testDirectories);
auto readDirectories = ConfigService::Instance().getInstrumentDirectories(); auto readDirectories = ConfigService::Instance().getInstrumentDirectories();
TS_ASSERT_EQUALS(readDirectories.size(), testDirectories.size()); TS_ASSERT_EQUALS(readDirectories.size(), testDirectories.size());
TS_ASSERT_EQUALS(readDirectories[0], testDirectories[0]); TS_ASSERT_EQUALS(readDirectories[0], testDirectories[0]);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment