Skip to content

Commit 8601c64

Browse files
author
Daniel Marjamaki
committed
Fixed TestFileLister tests in windows
1 parent 6f7e9a6 commit 8601c64

1 file changed

Lines changed: 13 additions & 5 deletions

File tree

test/testfilelister.cpp

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,18 +53,26 @@ class TestFileLister: public TestFixture
5353
// Recursively add add files..
5454
std::vector<std::string> filenames;
5555
FileLister::recursiveAddFiles(filenames, ".");
56+
57+
// In case there are leading "./"..
58+
for (unsigned int i = 0; i < filenames.size(); ++i) {
59+
if (filenames[i].compare(0,2,"./") == 0)
60+
filenames[i].erase(0,2);
61+
}
62+
5663
/*
5764
for (unsigned int i = 0; i < filenames.size(); ++i)
5865
std::cout << filenames[i] << std::endl;
5966
*/
67+
6068
// Make sure source files are added..
61-
ASSERT(std::find(filenames.begin(), filenames.end(), "./cli/main.cpp") != filenames.end());
62-
ASSERT(std::find(filenames.begin(), filenames.end(), "./lib/token.cpp") != filenames.end());
63-
ASSERT(std::find(filenames.begin(), filenames.end(), "./lib/tokenize.cpp") != filenames.end());
64-
ASSERT(std::find(filenames.begin(), filenames.end(), "./test/testfilelister.cpp") != filenames.end());
69+
ASSERT(std::find(filenames.begin(), filenames.end(), "cli/main.cpp") != filenames.end());
70+
ASSERT(std::find(filenames.begin(), filenames.end(), "lib/token.cpp") != filenames.end());
71+
ASSERT(std::find(filenames.begin(), filenames.end(), "lib/tokenize.cpp") != filenames.end());
72+
ASSERT(std::find(filenames.begin(), filenames.end(), "test/testfilelister.cpp") != filenames.end());
6573

6674
// Make sure headers are not added..
67-
ASSERT(std::find(filenames.begin(), filenames.end(), "./lib/tokenize.h") == filenames.end());
75+
ASSERT(std::find(filenames.begin(), filenames.end(), "lib/tokenize.h") == filenames.end());
6876
}
6977
};
7078

0 commit comments

Comments
 (0)