ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

util: Fix FilePath::isValid() and add tests (#908)

Browse Source 
* fixed bug that caused FilePath to be invalid for files with extension
* added tests for FilePath::isValid()
fixes #907
This commit is contained in:
Malte Langkabel
2020-02-13 00:29:15 +01:00
committed by GitHub
parent 3be685dbc9
commit db95591645
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/utility/file/FilePath.cpp
+5 -7
View File
@@ -115,17 +115,19 @@ bool FilePath::isAbsolute() const
bool FilePath::isValid() const
{
boost::filesystem::path::iterator end = m_path->end();
if (!isDirectory())
{
if (!boost::filesystem::portable_file_name(m_path->filename().generic_string()))
{
return false;
}
end--;
}
boost::filesystem::path::iterator it = m_path->begin();
#if WIN32
if (isAbsolute() && m_path->has_root_path())
{
std::string root = m_path->root_path().string();
@@ -136,14 +138,10 @@ bool FilePath::isValid() const
it++;
}
}
#else
return true; // FIXME: hot fix for issue #907
#endif
for (; it != m_path->end(); ++it)
for (; it != end; ++it)
{
std::string ss = it->string();
if (!boost::filesystem::portable_directory_name(ss))
if (!boost::filesystem::portable_directory_name(it->string()))
{
return false;
}
src/test/FilePathTestSuite.cpp
+24
View File
@@ -210,3 +210,27 @@ TEST_CASE("file_path_differs_for_existing_and_nonexisting_files")
REQUIRE(pathA != pathB);
}
TEST_CASE("file path is valid for absolute and relative existing files and directories paths")
{
REQUIRE(FilePath(L"data/FilePathTestSuite/a.cpp").isValid());
REQUIRE(FilePath(L"data/FilePathTestSuite/a.cpp").makeAbsolute().isValid());
REQUIRE(FilePath(L"data/FilePathTestSuite").isValid());
REQUIRE(FilePath(L"data/FilePathTestSuite").makeAbsolute().isValid());
}
TEST_CASE("file path is valid for absolute and relative non-existing files and directories paths")
{
REQUIRE(FilePath(L"data/non-existing-file.cpp").isValid());
REQUIRE(FilePath(L"data/non-existing-file.cpp").makeAbsolute().isValid());
REQUIRE(FilePath(L"data/non-existing-dir").isValid());
REQUIRE(FilePath(L"data/non-existing-dir").makeAbsolute().isValid());
}
TEST_CASE("file path is invalid for absolute and relative paths with invalid characters")
{
REQUIRE(!FilePath(L"data/non-exis\"ting-file.cpp").isValid());
REQUIRE(!FilePath(L"data/non-exis\"ting-file.cpp").makeAbsolute().isValid());
REQUIRE(!FilePath(L"data/non-exis|ting-dir").isValid());
REQUIRE(!FilePath(L"data/non-exis|ting-dir").makeAbsolute().isValid());
}