Centralize legacy brush package export

tests/CMakeLists.txt

@@ -288,6 +288,16 @@ add_test(NAME pp_app_core_brush_ui_tests COMMAND pp_app_core_brush_ui_tests)
 set_tests_properties(pp_app_core_brush_ui_tests PROPERTIES
     LABELS "app;paint;desktop-fast;fuzz")
 
+add_executable(pp_app_core_brush_package_export_tests
+    app_core/brush_package_export_tests.cpp)
+target_link_libraries(pp_app_core_brush_package_export_tests PRIVATE
+    pp_app_core
+    pp_test_harness)
+
+add_test(NAME pp_app_core_brush_package_export_tests COMMAND pp_app_core_brush_package_export_tests)
+set_tests_properties(pp_app_core_brush_package_export_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
@@ -877,6 +887,37 @@ 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_export_smoke
+        COMMAND pano_cli plan-brush-package-export
+            --path D:/Paint/clouds.ppbr
+            --author Artist
+            --email artist@example.test
+            --url https://example.test/brushes
+            --description "Cloud brush set"
+            --dest-path D:/Paint/BrushPreviews
+            --export-data
+            --header-image)
+    set_tests_properties(pano_cli_plan_brush_package_export_smoke PROPERTIES
+        LABELS "app;paint;assets;integration;desktop-fast"
+        PASS_REGULAR_EXPRESSION "\"command\":\"plan-brush-package-export\".*\"path\":\"D:/Paint/clouds.ppbr\".*\"author\":\"Artist\".*\"destPath\":\"D:/Paint/BrushPreviews\".*\"exportData\":true.*\"hasHeaderImage\":true.*\"dispatches\":1")
+
+    add_test(NAME pano_cli_plan_brush_package_export_rejects_empty_path
+        COMMAND "${CMAKE_COMMAND}"
+            -DPANO_CLI=$<TARGET_FILE:pano_cli>
+            "-DEXPECTED_OUTPUT=brush package export path must not be empty"
+            -P "${CMAKE_CURRENT_SOURCE_DIR}/cmake/expect_pano_cli_plan_brush_package_export_failure.cmake")
+    set_tests_properties(pano_cli_plan_brush_package_export_rejects_empty_path PROPERTIES
+        LABELS "app;paint;assets;integration;desktop-fast;fuzz")
+
+    add_test(NAME pano_cli_plan_brush_package_export_dest_without_data_smoke
+        COMMAND pano_cli plan-brush-package-export
+            --path D:/Paint/clouds.ppbr
+            --dest-path D:/Paint/BrushPreviews
+            --no-export-data)
+    set_tests_properties(pano_cli_plan_brush_package_export_dest_without_data_smoke PROPERTIES
+        LABELS "app;paint;assets;integration;desktop-fast;fuzz"
+        PASS_REGULAR_EXPRESSION "\"command\":\"plan-brush-package-export\".*\"destPath\":\"D:/Paint/BrushPreviews\".*\"exportData\":false.*\"dispatches\":1")
+
     add_test(NAME pano_cli_plan_tools_menu_shortcuts_smoke
         COMMAND pano_cli plan-tools-menu --command shortcuts)
     set_tests_properties(pano_cli_plan_tools_menu_shortcuts_smoke PROPERTIES

tests/app_core/brush_package_export_tests.cpp

@@ -0,0 +1,94 @@
+#include "app_core/brush_package_export.h"
+#include "test_harness.h"
+
+#include <string>
+#include <string_view>
+
+namespace {
+
+class FakeBrushPackageExportServices final : public pp::app::BrushPackageExportServices {
+public:
+    void export_brush_package(std::string_view path, const pp::app::BrushPackageExportRequest& request) override
+    {
+        exports += 1;
+        last_path = std::string(path);
+        last_request = request;
+    }
+
+    int exports = 0;
+    std::string last_path;
+    pp::app::BrushPackageExportRequest last_request;
+};
+
+void validates_path_and_preserves_metadata_edges(pp::tests::Harness& harness)
+{
+    pp::app::BrushPackageExportRequest request;
+    request.author = "Pano Artist";
+    request.email = "artist@example.test";
+    request.url = "https://example.test/brushes";
+    request.description = "Cloud brushes";
+    request.export_data = true;
+    request.destination_path = "D:/Paint/BrushPreviews";
+    request.has_header_image = true;
+
+    PP_EXPECT(harness, pp::app::validate_brush_package_export_request("D:/Paint/clouds.ppbr", request).ok());
+    PP_EXPECT(harness, !pp::app::validate_brush_package_export_request("", request).ok());
+
+    request.export_data = false;
+    PP_EXPECT(harness, pp::app::validate_brush_package_export_request("D:/Paint/clouds.ppbr", request).ok());
+
+    request.destination_path.clear();
+    PP_EXPECT(harness, pp::app::validate_brush_package_export_request("D:/Paint/clouds.ppbr", request).ok());
+}
+
+void executor_dispatches_export_request(pp::tests::Harness& harness)
+{
+    FakeBrushPackageExportServices services;
+    pp::app::BrushPackageExportRequest request;
+    request.author = "Pano Artist";
+    request.email = "artist@example.test";
+    request.url = "https://example.test/brushes";
+    request.description = "Cloud brushes";
+    request.export_data = true;
+    request.destination_path = "D:/Paint/BrushPreviews";
+    request.has_header_image = true;
+
+    const auto status = pp::app::execute_brush_package_export("D:/Paint/clouds.ppbr", request, services);
+    PP_EXPECT(harness, status.ok());
+    PP_EXPECT(harness, services.exports == 1);
+    PP_EXPECT(harness, services.last_path == "D:/Paint/clouds.ppbr");
+    PP_EXPECT(harness, services.last_request.author == "Pano Artist");
+    PP_EXPECT(harness, services.last_request.email == "artist@example.test");
+    PP_EXPECT(harness, services.last_request.url == "https://example.test/brushes");
+    PP_EXPECT(harness, services.last_request.description == "Cloud brushes");
+    PP_EXPECT(harness, services.last_request.destination_path == "D:/Paint/BrushPreviews");
+    PP_EXPECT(harness, services.last_request.export_data);
+    PP_EXPECT(harness, services.last_request.has_header_image);
+}
+
+void executor_rejects_malformed_requests_before_dispatch(pp::tests::Harness& harness)
+{
+    FakeBrushPackageExportServices services;
+    pp::app::BrushPackageExportRequest empty_path_request;
+    PP_EXPECT(harness, !pp::app::execute_brush_package_export("", empty_path_request, services).ok());
+    PP_EXPECT(harness, services.exports == 0);
+
+    pp::app::BrushPackageExportRequest legacy_flexible_request;
+    legacy_flexible_request.destination_path = "D:/Paint/BrushPreviews";
+    legacy_flexible_request.export_data = false;
+    PP_EXPECT(
+        harness,
+        pp::app::execute_brush_package_export("D:/Paint/clouds.ppbr", legacy_flexible_request, services).ok());
+    PP_EXPECT(harness, services.exports == 1);
+}
+
+} // namespace
+
+int main()
+{
+    pp::tests::Harness harness;
+    harness.run("validates path and preserves metadata edges", validates_path_and_preserves_metadata_edges);
+    harness.run("executor dispatches export request", executor_dispatches_export_request);
+    harness.run("executor rejects malformed requests before dispatch", executor_rejects_malformed_requests_before_dispatch);
+    return harness.finish();
+}

tests/cmake/expect_pano_cli_plan_brush_package_export_failure.cmake

@@ -0,0 +1,24 @@
+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()
+
+execute_process(
+    COMMAND "${PANO_CLI}" plan-brush-package-export
+    RESULT_VARIABLE result
+    OUTPUT_VARIABLE output
+    ERROR_VARIABLE error)
+
+if(result EQUAL 0)
+    message(FATAL_ERROR "Expected pano_cli plan-brush-package-export 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()