omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Centralize legacy brush package import

Browse Source
This commit is contained in:
omigamedev
2026-06-04 14:49:22 +02:00
parent 78185b8fd5
commit 6ab64ccc82
13 changed files with 415 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
tests/CMakeLists.txt
View File

@@ -298,6 +298,16 @@ add_test(NAME pp_app_core_brush_package_export_tests COMMAND pp_app_core_brush_p
set_tests_properties(pp_app_core_brush_package_export_tests PROPERTIES
LABELS "app;paint;assets;desktop-fast;fuzz")
add_executable(pp_app_core_brush_package_import_tests
app_core/brush_package_import_tests.cpp)
target_link_libraries(pp_app_core_brush_package_import_tests PRIVATE
pp_app_core
pp_test_harness)
add_test(NAME pp_app_core_brush_package_import_tests COMMAND pp_app_core_brush_package_import_tests)
set_tests_properties(pp_app_core_brush_package_import_tests PROPERTIES
LABELS "app;paint;assets;desktop-fast;fuzz")
add_executable(pp_app_core_canvas_tool_ui_tests
app_core/canvas_tool_ui_tests.cpp)
target_link_libraries(pp_app_core_canvas_tool_ui_tests PRIVATE
@@ -887,6 +897,39 @@ if(TARGET pano_cli)
WILL_FAIL TRUE
PASS_REGULAR_EXPRESSION "\"command\":\"plan-app-startup\".*\"message\":\"run counter must not be negative\"")
add_test(NAME pano_cli_plan_brush_package_import_ppbr_smoke
COMMAND pano_cli plan-brush-package-import
--kind ppbr
--path D:/Paint/Brushes/clouds.ppbr)
set_tests_properties(pano_cli_plan_brush_package_import_ppbr_smoke PROPERTIES
LABELS "app;paint;assets;integration;desktop-fast"
PASS_REGULAR_EXPRESSION "\"command\":\"plan-brush-package-import\".*\"kind\":\"ppbr\".*\"path\":\"D:/Paint/Brushes/clouds.ppbr\".*\"dispatches\":1")
add_test(NAME pano_cli_plan_brush_package_import_abr_smoke
COMMAND pano_cli plan-brush-package-import
--kind abr
--path D:/Paint/Brushes/clouds.abr)
set_tests_properties(pano_cli_plan_brush_package_import_abr_smoke PROPERTIES
LABELS "app;paint;assets;integration;desktop-fast"
PASS_REGULAR_EXPRESSION "\"command\":\"plan-brush-package-import\".*\"kind\":\"abr\".*\"path\":\"D:/Paint/Brushes/clouds.abr\".*\"dispatches\":1")
add_test(NAME pano_cli_plan_brush_package_import_rejects_empty_path
COMMAND "${CMAKE_COMMAND}"
-DPANO_CLI=$<TARGET_FILE:pano_cli>
"-DEXPECTED_OUTPUT=brush package import path must not be empty"
-P "${CMAKE_CURRENT_SOURCE_DIR}/cmake/expect_pano_cli_plan_brush_package_import_failure.cmake")
set_tests_properties(pano_cli_plan_brush_package_import_rejects_empty_path PROPERTIES
LABELS "app;paint;assets;integration;desktop-fast;fuzz")
add_test(NAME pano_cli_plan_brush_package_import_rejects_unknown_kind
COMMAND "${CMAKE_COMMAND}"
-DPANO_CLI=$<TARGET_FILE:pano_cli>
-DEXPECT_UNKNOWN_KIND=ON
"-DEXPECTED_OUTPUT=unknown brush package import kind"
-P "${CMAKE_CURRENT_SOURCE_DIR}/cmake/expect_pano_cli_plan_brush_package_import_failure.cmake")
set_tests_properties(pano_cli_plan_brush_package_import_rejects_unknown_kind PROPERTIES
LABELS "app;paint;assets;integration;desktop-fast;fuzz")
add_test(NAME pano_cli_plan_brush_package_export_smoke
COMMAND pano_cli plan-brush-package-export
--path D:/Paint/clouds.ppbr

73
tests/app_core/brush_package_import_tests.cpp Normal file
View File

@@ -0,0 +1,73 @@
#include "app_core/brush_package_import.h"
#include "test_harness.h"
#include <string>
#include <string_view>
namespace {
class FakeBrushPackageImportServices final : public pp::app::BrushPackageImportServices {
public:
void import_brush_package(pp::app::BrushPackageImportKind kind, std::string_view path) override
{
imports += 1;
last_kind = kind;
last_path = std::string(path);
}
int imports = 0;
pp::app::BrushPackageImportKind last_kind = pp::app::BrushPackageImportKind::abr;
std::string last_path;
};
void names_import_kinds(pp::tests::Harness& harness)
{
PP_EXPECT(harness, std::string_view(pp::app::brush_package_import_kind_name(pp::app::BrushPackageImportKind::abr)) == "abr");
PP_EXPECT(harness, std::string_view(pp::app::brush_package_import_kind_name(pp::app::BrushPackageImportKind::ppbr)) == "ppbr");
}
void executor_dispatches_abr_and_ppbr(pp::tests::Harness& harness)
{
FakeBrushPackageImportServices services;
PP_EXPECT(
harness,
pp::app::execute_brush_package_import(
pp::app::BrushPackageImportKind::abr,
"D:/Paint/Brushes/clouds.abr",
services).ok());
PP_EXPECT(harness, services.imports == 1);
PP_EXPECT(harness, services.last_kind == pp::app::BrushPackageImportKind::abr);
PP_EXPECT(harness, services.last_path == "D:/Paint/Brushes/clouds.abr");
PP_EXPECT(
harness,
pp::app::execute_brush_package_import(
pp::app::BrushPackageImportKind::ppbr,
"D:/Paint/Brushes/clouds.ppbr",
services).ok());
PP_EXPECT(harness, services.imports == 2);
PP_EXPECT(harness, services.last_kind == pp::app::BrushPackageImportKind::ppbr);
PP_EXPECT(harness, services.last_path == "D:/Paint/Brushes/clouds.ppbr");
}
void executor_rejects_empty_paths_before_dispatch(pp::tests::Harness& harness)
{
FakeBrushPackageImportServices services;
PP_EXPECT(
harness,
!pp::app::execute_brush_package_import(pp::app::BrushPackageImportKind::abr, "", services).ok());
PP_EXPECT(harness, services.imports == 0);
}
} // namespace
int main()
{
pp::tests::Harness harness;
harness.run("names import kinds", names_import_kinds);
harness.run("executor dispatches abr and ppbr", executor_dispatches_abr_and_ppbr);
harness.run("executor rejects empty paths before dispatch", executor_rejects_empty_paths_before_dispatch);
return harness.finish();
}

39
tests/cmake/expect_pano_cli_plan_brush_package_import_failure.cmake Normal file
View File

@@ -0,0 +1,39 @@
if(NOT DEFINED PANO_CLI)
message(FATAL_ERROR "PANO_CLI must be set")
endif()
if(NOT DEFINED EXPECTED_OUTPUT)
message(FATAL_ERROR "EXPECTED_OUTPUT must be set")
endif()
if(NOT DEFINED EXPECT_UNKNOWN_KIND)
set(EXPECT_UNKNOWN_KIND OFF)
endif()
if(EXPECT_UNKNOWN_KIND)
execute_process(
COMMAND "${PANO_CLI}" plan-brush-package-import
--kind zip
--path D:/Paint/Brushes/clouds.zip
RESULT_VARIABLE result
OUTPUT_VARIABLE output
ERROR_VARIABLE error)
else()
execute_process(
COMMAND "${PANO_CLI}" plan-brush-package-import
--kind ppbr
RESULT_VARIABLE result
OUTPUT_VARIABLE output
ERROR_VARIABLE error)
endif()
if(result EQUAL 0)
message(FATAL_ERROR "Expected pano_cli plan-brush-package-import to fail, but it exited 0")
endif()
set(combined_output "${output}${error}")
string(FIND "${combined_output}" "${EXPECTED_OUTPUT}" expected_index)
if(expected_index LESS 0)
message(FATAL_ERROR
"Expected output to contain '${EXPECTED_OUTPUT}', got: ${combined_output}")
endif()