mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-04 22:31:02 +00:00
HanifKoh
84657ff11e
* Ignore Clipper, libpng, mcut and Boost.Polygon Internals in clang-tidy Each only works through a wrapper or umbrella header: libslic3r/clipper.hpp or clipper_z.hpp configure Clipper before including it, png.h pulls in libpng's config headers, and Boost.Polygon's headers only compile through polygon.hpp or voronoi.hpp. * Ignore minilzo's Config Headers in clang-tidy lzoconf.h and lzodefs.h are internal to minilzo.h, which is what the code includes. * Add Missing Includes Across the Remaining Sources and Tests Covers src/slic3r/Utils, src/slic3r/plugin, src/slic3r/Config, src/libvgcode, src/dev-utils, src/OrcaSlicer.cpp and tests/, the directories left after src/slic3r/GUI and src/libslic3r. Generated with clang-tidy misc-include-cleaner. libvgcode's own headers are included by relative path as in the rest of that library, and Catch2 and pybind11 with angle brackets as elsewhere in the repo. * Make the GUI and Test Headers Compile on Their Own Each now includes, or forward-declares, what it uses instead of relying on what its includers happened to include first. Headers that only compile on one platform, or that nothing built includes, are left alone. * Keep Windows and nanosvg Setup Ahead of the Added Includes OrcaSlicer.cpp and several tests set _WIN32_WINNT, WIN32_LEAN_AND_MEAN or NOMINMAX before including Windows.h, and the profile validator defines NANOSVG_IMPLEMENTATION before any libslic3r header. The added includes had landed above those blocks, which broke the Windows build. * Add the GUI Includes the First Pass Missed Covers headers that only became editable once they compiled on their own, and wx symbols whose suggested header changed as the clang-tidy ignore list grew after the src/slic3r/GUI pass. * Keep the Added Test Includes Below the NOMINMAX Guard test_marchingsquares.cpp and test_texture_displacement.cpp had includes inside #ifndef NOMINMAX, which the tests inherit as defined on Windows from libslic3r, so those were skipped there. .clang-tidy also ignores the MSVC STL and UCRT internals, Boost.Multiprecision's fwd.hpp and CPython's Windows include directory, as in #16068.
77 lines
2.8 KiB
C++
77 lines
2.8 KiB
C++
#include <catch2/catch_test_macros.hpp>
|
|
#include <catch2/catch_all.hpp>
|
|
|
|
#include "libslic3r/Config.hpp"
|
|
#include <libslic3r/Preset.hpp>
|
|
#include <libslic3r/PrintConfig.hpp>
|
|
#include <slic3r/plugin/PluginResolver.hpp>
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
using namespace Slic3r;
|
|
|
|
namespace {
|
|
|
|
// A print preset carrying a "plugins" manifest and the one plugin-backed print option.
|
|
Preset make_print_preset(const std::vector<std::string>& manifest, const std::vector<std::string>& pipeline)
|
|
{
|
|
Preset preset(Preset::TYPE_PRINT, "test-print");
|
|
const std::unique_ptr<DynamicPrintConfig> defaults(
|
|
DynamicPrintConfig::new_from_defaults_keys({"plugins", "slicing_pipeline_plugin"}));
|
|
preset.config = *defaults;
|
|
preset.config.option<ConfigOptionStrings>("plugins")->values = manifest;
|
|
preset.config.option<ConfigOptionStrings>("slicing_pipeline_plugin")->values = pipeline;
|
|
return preset;
|
|
}
|
|
|
|
std::vector<std::string> capability_names(const std::vector<PluginCapabilityRef>& refs)
|
|
{
|
|
std::vector<std::string> names;
|
|
for (const PluginCapabilityRef& ref : refs)
|
|
names.push_back(ref.capability_name);
|
|
return names;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
TEST_CASE("referenced_capabilities keeps only manifest entries an option points at", "[PluginResolver]")
|
|
{
|
|
// CapB is declared in the manifest but no option references it, so it is not in use.
|
|
const Preset preset = make_print_preset({"acme;;CapA", "acme;;CapB"}, {"CapA"});
|
|
|
|
CHECK(capability_names(referenced_capabilities(Preset::TYPE_PRINT, preset)) == std::vector<std::string>{"CapA"});
|
|
}
|
|
|
|
TEST_CASE("referenced_capabilities matches every value of a vector option", "[PluginResolver]")
|
|
{
|
|
const Preset preset = make_print_preset({"acme;;CapA", "acme;;CapB", "acme;;CapC"}, {"CapA", "CapC"});
|
|
|
|
CHECK(capability_names(referenced_capabilities(Preset::TYPE_PRINT, preset)) ==
|
|
std::vector<std::string>{"CapA", "CapC"});
|
|
}
|
|
|
|
TEST_CASE("referenced_capabilities is empty when the manifest is empty", "[PluginResolver]")
|
|
{
|
|
const Preset preset = make_print_preset({}, {"CapA"});
|
|
|
|
CHECK(referenced_capabilities(Preset::TYPE_PRINT, preset).empty());
|
|
}
|
|
|
|
TEST_CASE("referenced_capabilities ignores untracked preset types", "[PluginResolver]")
|
|
{
|
|
Preset preset = make_print_preset({"acme;;CapA"}, {"CapA"});
|
|
preset.type = Preset::TYPE_SLA_PRINT;
|
|
|
|
CHECK(referenced_capabilities(Preset::TYPE_SLA_PRINT, preset).empty());
|
|
}
|
|
|
|
TEST_CASE("referenced_capabilities skips malformed manifest entries", "[PluginResolver]")
|
|
{
|
|
// parse_capability_ref rejects entries that are not "name;uuid;capability".
|
|
const Preset preset = make_print_preset({"garbage", "acme;;CapA"}, {"CapA"});
|
|
|
|
CHECK(capability_names(referenced_capabilities(Preset::TYPE_PRINT, preset)) == std::vector<std::string>{"CapA"});
|
|
}
|