Skip to content

Commit 853b0c5

Browse files
authored
FileLister: removed test-only recursiveAddFiles() overload (#7241)
1 parent 6a46223 commit 853b0c5

File tree

2 files changed

+4
-19
lines changed

2 files changed

+4
-19
lines changed

Diff for: cli/filelister.h

-15
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,6 @@ class FileWithDetails;
3232
/** @brief Cross-platform FileLister */
3333
class FileLister {
3434
public:
35-
/**
36-
* @brief Recursively add source files to a map.
37-
* Add source files from given directory and all subdirectries to the
38-
* given map. Only files with accepted extensions
39-
* (*.c;*.cpp;*.cxx;*.c++;*.cc;*.txx) are added.
40-
* @param files output list that associates the size of each file with its name
41-
* @param path root path
42-
* @param ignored ignored paths
43-
* @return On success, an empty string is returned. On error, a error message is returned.
44-
*/
45-
static std::string recursiveAddFiles(std::list<FileWithDetails> &files, const std::string &path, const PathMatch& ignored) {
46-
const std::set<std::string> extra;
47-
return recursiveAddFiles(files, path, extra, ignored);
48-
}
49-
5035
/**
5136
* @brief Recursively add source files to a map.
5237
* Add source files from given directory and all subdirectries to the

Diff for: test/testfilelister.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class TestFileLister : public TestFixture {
6262
std::list<FileWithDetails> files;
6363
std::vector<std::string> masks;
6464
PathMatch matcher(std::move(masks));
65-
std::string err = FileLister::recursiveAddFiles(files, adddir, matcher);
65+
std::string err = FileLister::recursiveAddFiles(files, adddir, {}, matcher);
6666
ASSERT_EQUALS("", err);
6767

6868
ASSERT(!files.empty());
@@ -108,7 +108,7 @@ class TestFileLister : public TestFixture {
108108

109109
void recursiveAddFilesEmptyPath() const {
110110
std::list<FileWithDetails> files;
111-
const std::string err = FileLister::recursiveAddFiles(files, "", PathMatch({}));
111+
const std::string err = FileLister::recursiveAddFiles(files, "", {}, PathMatch({}));
112112
ASSERT_EQUALS("no path specified", err);
113113
}
114114

@@ -118,7 +118,7 @@ class TestFileLister : public TestFixture {
118118
std::list<FileWithDetails> files;
119119
std::vector<std::string> ignored{"lib/token.cpp"};
120120
PathMatch matcher(ignored);
121-
std::string err = FileLister::recursiveAddFiles(files, basedir + "lib/token.cpp", matcher);
121+
std::string err = FileLister::recursiveAddFiles(files, basedir + "lib/token.cpp", {}, matcher);
122122
ASSERT_EQUALS("", err);
123123
ASSERT(files.empty());
124124
}
@@ -129,7 +129,7 @@ class TestFileLister : public TestFixture {
129129
std::list<FileWithDetails> files;
130130
std::vector<std::string> ignored;
131131
PathMatch matcher(ignored);
132-
std::string err = FileLister::recursiveAddFiles(files, basedir + "lib/token.cpp", matcher);
132+
std::string err = FileLister::recursiveAddFiles(files, basedir + "lib/token.cpp", {}, matcher);
133133
ASSERT_EQUALS("", err);
134134
ASSERT_EQUALS(1, files.size());
135135
ASSERT_EQUALS(basedir + "lib/token.cpp", files.begin()->path());

0 commit comments

Comments
 (0)