Skip to content

Improve get all files in directory unit test #2666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ld-kerley merged 2 commits into from
Nov 14, 2025
Merged

Improve get all files in directory unit test #2666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b0aaa7
Inverting the logic to compare file list to account for possible OS l…
ld-kerley Nov 11, 2025
70d7411
fix up windows test failure with help from Bernards notes
ld-kerley Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/MaterialXFormat/File.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ FilePathVec FilePath::getFilesInDirectory(const string& extension) const

#if defined(_WIN32)
WIN32_FIND_DATAA fd;
FilePath query = extension.empty() ? *this : (*this / ("*." + extension));
FilePath query = extension.empty() ? (*this / "*") : (*this / ("*." + extension));
HANDLE hFind = FindFirstFileA(query.asString().c_str(), &fd);
if (hFind != INVALID_HANDLE_VALUE)
{
Expand Down
15 changes: 9 additions & 6 deletions source/MaterialXTest/MaterialXFormat/File.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,20 +185,23 @@ TEST_CASE("Get all files in directory", "[file]")
mx::FilePathVec results;

results = lightsDir.getFilesInDirectory("mtlx");
for (const mx::FilePath& filename : results)
REQUIRE(results.size() > 0);
for (const mx::FilePath& filename : mtlxFilenames)
{
REQUIRE(std::find(mtlxFilenames.begin(), mtlxFilenames.end(), filename) != mtlxFilenames.end());
REQUIRE(std::find(results.begin(), results.end(), filename) != results.end());
}

results = lightsDir.getFilesInDirectory("hdr");
for (const mx::FilePath& filename : results)
REQUIRE(results.size() > 0);
for (const mx::FilePath& filename : hdrFilenames)
{
REQUIRE(std::find(hdrFilenames.begin(), hdrFilenames.end(), filename) != hdrFilenames.end());
REQUIRE(std::find(results.begin(), results.end(), filename) != results.end());
}

results = lightsDir.getFilesInDirectory();
for (const mx::FilePath& filename : results)
REQUIRE(results.size() > 0);
for (const mx::FilePath& filename : allFilesnames)
{
REQUIRE(std::find(allFilesnames.begin(), allFilesnames.end(), filename) != allFilesnames.end());
REQUIRE(std::find(results.begin(), results.end(), filename) != results.end());
}
}