From d7bfc0af69e25a11b1a9de76bba593bb0fc96b07 Mon Sep 17 00:00:00 2001
From: Tom Titcombe <t.j.titcombe@gmail.com>
Date: Wed, 9 Jan 2019 10:43:09 +0000
Subject: [PATCH] Remove unnecessary unit tests for extension uniqueness
Refs #21231
---
Framework/API/inc/MantidAPI/FileFinder.h | 4 ++--
Framework/API/src/FileFinder.cpp | 8 ++++++++
Framework/API/test/FileFinderTest.h | 16 ----------------
3 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/Framework/API/inc/MantidAPI/FileFinder.h b/Framework/API/inc/MantidAPI/FileFinder.h
index b83a60068c5..594d34c4731 100644
--- a/Framework/API/inc/MantidAPI/FileFinder.h
+++ b/Framework/API/inc/MantidAPI/FileFinder.h
@@ -58,8 +58,6 @@ public:
/// DO NOT USE! MADE PUBLIC FOR TESTING ONLY.
std::string getExtension(const std::string &filename,
const std::vector<std::string> &exts) const;
- void getUniqueExtensions(const std::vector<std::string> &exts,
- std::set<std::string> &uniqueExts) const;
private:
friend struct Mantid::Kernel::CreateUsingNew<FileFinderImpl>;
@@ -79,6 +77,8 @@ private:
const std::set<std::string> &filenames,
const std::vector<std::string> &exts) const;
std::string toUpper(const std::string &src) const;
+ void getUniqueExtensions(const std::vector<std::string> &exts,
+ std::set<std::string> &uniqueExts) const;
/// glob option - set to case sensitive or insensitive
int m_globOption;
};
diff --git a/Framework/API/src/FileFinder.cpp b/Framework/API/src/FileFinder.cpp
index aa035053c49..4282d96b536 100644
--- a/Framework/API/src/FileFinder.cpp
+++ b/Framework/API/src/FileFinder.cpp
@@ -512,6 +512,14 @@ FileFinderImpl::findRun(const std::string &hintstr,
return "";
}
+/**
+ * Given a set of already determined extensions and new extensions,
+ * create a set of all extensions.
+ * If not in an extension-is-case-sensitive environment, only add the
+ * lower case OR upper case version of the extension
+ * @param exts :: a vector of extensions to add
+ * @param uniqueExts :: a set of currently included extensions
+ */
void FileFinderImpl::getUniqueExtensions(
const std::vector<std::string> &exts,
std::set<std::string> &uniqueExts) const {
diff --git a/Framework/API/test/FileFinderTest.h b/Framework/API/test/FileFinderTest.h
index 60255b78e7c..3c9d1979283 100644
--- a/Framework/API/test/FileFinderTest.h
+++ b/Framework/API/test/FileFinderTest.h
@@ -347,22 +347,6 @@ public:
std::cout << "\n end of test \n";
}
- void testGetUniqueExtensions() {
- std::set<std::string> uniqueExts;
- std::vector<std::string> firstExtsToAdd = {".RAW", ".log"};
- std::vector<std::string> secondExtsToAdd = {".so", ".txt", ".RAW"};
-
- std::set<std::string> expectedFirstExtensions = {".RAW", ".log"};
- std::set<std::string> expectedSecondExtensions = {".RAW", ".log", ".so",
- ".txt"};
-
- FileFinder::Instance().getUniqueExtensions(firstExtsToAdd, uniqueExts);
- TS_ASSERT_EQUALS(uniqueExts, expectedFirstExtensions);
-
- FileFinder::Instance().getUniqueExtensions(secondExtsToAdd, uniqueExts);
- TS_ASSERT_EQUALS(uniqueExts, expectedSecondExtensions);
- }
-
void testFindAddFiles() {
// create a test file to find
Poco::File file("LOQ00111-add.raw");
--
GitLab