From bf7a57fc55493247a624ecfd65e4d73964e7d8d2 Mon Sep 17 00:00:00 2001 From: SulfurNitride Date: Sun, 12 Apr 2026 02:40:16 -0500 Subject: Remove vendored usvfs and Windows-only usvfs code paths The Linux port uses its own in-process FUSE VFS (FuseConnector), so usvfs was dead weight: libs/usvfs/ was never built, usvfsconnector.cpp was explicitly REMOVE_ITEM'd from the source list, and every call site was already guarded by #ifdef _WIN32 with a working Linux branch (the Windows build is also broken on this branch, since FUSE3 is a hard find_package dependency). - Drop libs/usvfs/ and src/src/usvfsconnector.{cpp,h} - Collapse #ifdef _WIN32 / usvfs include branches in organizercore, mainwindow, settings, util, spawn - Remove getUsvfsVersionString() and the "usvfs: ..." log field - Remove vfs32/64DLLName APPPARAMs (nothing reads them) - Relabel About dialog "usvfs:" row to "VFS: FUSE 3" --- libs/usvfs/test/gtest_utils/gtest_utils.cpp | 122 ---------------------------- 1 file changed, 122 deletions(-) delete mode 100644 libs/usvfs/test/gtest_utils/gtest_utils.cpp (limited to 'libs/usvfs/test/gtest_utils/gtest_utils.cpp') diff --git a/libs/usvfs/test/gtest_utils/gtest_utils.cpp b/libs/usvfs/test/gtest_utils/gtest_utils.cpp deleted file mode 100644 index f292dfd..0000000 --- a/libs/usvfs/test/gtest_utils/gtest_utils.cpp +++ /dev/null @@ -1,122 +0,0 @@ -#include "gtest_utils.h" - -// this file is shared by both usvfs_global_test and usvfs_global_test_runner -// - -#include -#include -#include - -#include - -#include - -std::string trimmed(std::string content) -{ - boost::algorithm::trim(content); - return content; -} - -// small utility to read files -std::optional read_content(const std::filesystem::path& path, - bool trim = true) -{ - std::ifstream ifs(path, std::ios::binary | std::ios::ate); - - if (!ifs) { - return {}; - } - - const auto count = ifs.tellg(); - - std::string buffer(static_cast(count), '\0'); - - ifs.seekg(0, std::ios::beg); - ifs.read(buffer.data(), count); - - if (trim) { - boost::algorithm::trim(buffer); - } - - return buffer; -} - -::testing::AssertionResult AssertDirectoryEquals(const std::filesystem::path& expected, - const std::filesystem::path& actual, - bool content) -{ - std::vector failure_messages; - std::vector in_both; - - // iterate left, check on right - for (const auto& it : std::filesystem::recursive_directory_iterator{expected}) { - const auto relpath = relative(it.path(), expected); - if (!exists(actual / relpath)) { - failure_messages.push_back( - std::format("{} expected but not found", relpath.string())); - } else { - in_both.push_back(relpath); - } - } - - // iterate right, check on left - for (const auto& it : std::filesystem::recursive_directory_iterator{actual}) { - const auto relpath = relative(it.path(), actual); - if (!exists(expected / relpath)) { - failure_messages.push_back( - std::format("{} found but not expected", relpath.string())); - } - } - - // check contents - if (content) { - for (const auto& relpath : in_both) { - const auto expected_path = expected / relpath, actual_path = actual / relpath; - - if (is_directory(expected_path) != is_directory(actual_path)) { - failure_messages.push_back( - std::format("{} type mismatch, expected {} but found {}", relpath.string(), - is_directory(expected_path) ? "directory" : "file", - is_directory(expected_path) ? "file" : "directory")); - continue; - } - - if (is_directory(expected_path)) { - continue; - } - - if (read_content(expected_path) != read_content(actual_path)) { - failure_messages.push_back( - std::format("{} content mismatch", relpath.string())); - } - } - } - - if (failure_messages.empty()) { - return ::testing::AssertionSuccess(); - } - - return ::testing::AssertionFailure() - << "\n" - << boost::algorithm::join(failure_messages, "\n") << "\n"; -} - -::testing::AssertionResult AssertContentEquals(std::string_view expected, - const std::filesystem::path& path, - bool trim) -{ - const auto content = read_content(path, trim); - - if (!content) { - return ::testing::AssertionFailure() - << "failed to open path '" << path.string() << "'"; - } - - if (*content != expected) { - return ::testing::AssertionFailure() - << "mismatch content for '" << path.string() << "', expected '" << expected - << "', found '" << *content << "'"; - } - - return ::testing::AssertionSuccess(); -} -- cgit v1.3.1