From 9cc8a1c7658b2271210b65596bc82253e00f7253 Mon Sep 17 00:00:00 2001 From: aiongg Date: Mon, 26 Oct 2026 18:24:54 +0000 Subject: [PATCH] refactor(lightcraft-engine): move tests_*.rs to tests/ --- crates/engine/src/lib.rs | 87 +------------------ crates/engine/src/tests.rs | 47 ++++++++++ .../album_order.rs} | 0 .../album_remove.rs} | 0 .../albums_local.rs} | 0 .../src/{tests_color.rs => tests/color.rs} | 0 .../constrain_crop.rs} | 0 .../crop_angle.rs} | 0 .../crop_aspect.rs} | 0 .../{tests_denoise.rs => tests/denoise.rs} | 0 .../src/{tests_export.rs => tests/export.rs} | 0 .../face_models.rs} | 0 .../face_recognize.rs} | 0 .../face_tiles.rs} | 0 .../filesystem_history.rs} | 0 .../focus_scan.rs} | 0 .../{tests_folders.rs => tests/folders.rs} | 0 .../forget_local.rs} | 0 .../history_cursor.rs} | 0 .../hold_view.rs} | 0 .../ids_params.rs} | 0 .../src/{tests_import.rs => tests/import.rs} | 0 .../import_move.rs} | 0 .../keyword_list.rs} | 0 .../src/{tests_libops.rs => tests/libops.rs} | 0 .../{tests_library.rs => tests/library.rs} | 0 .../lightroom_folder.rs} | 0 .../mask_effects.rs} | 0 .../src/{tests_merge.rs => tests/merge.rs} | 0 .../move_to_share.rs} | 0 .../{tests_organize.rs => tests/organize.rs} | 0 .../{tests_persist.rs => tests/persist.rs} | 0 .../src/{tests_prefs.rs => tests/prefs.rs} | 0 .../presets_scale.rs} | 0 .../src/{tests_print.rs => tests/print.rs} | 0 .../{tests_process.rs => tests/process.rs} | 0 .../{tests_recheck.rs => tests/recheck.rs} | 0 .../{tests_segment.rs => tests/segment.rs} | 0 .../settings_files.rs} | 0 .../src/{tests_slide.rs => tests/slide.rs} | 0 .../slideshow_export.rs} | 0 .../src/{tests_spots.rs => tests/spots.rs} | 0 .../src/{tests_sync.rs => tests/sync.rs} | 0 .../view_follow.rs} | 0 .../engine/src/{tests_xmp.rs => tests/xmp.rs} | 0 45 files changed, 49 insertions(+), 85 deletions(-) rename crates/engine/src/{tests_album_order.rs => tests/album_order.rs} (100%) rename crates/engine/src/{tests_album_remove.rs => tests/album_remove.rs} (100%) rename crates/engine/src/{tests_albums_local.rs => tests/albums_local.rs} (100%) rename crates/engine/src/{tests_color.rs => tests/color.rs} (100%) rename crates/engine/src/{tests_constrain_crop.rs => tests/constrain_crop.rs} (100%) rename crates/engine/src/{tests_crop_angle.rs => tests/crop_angle.rs} (100%) rename crates/engine/src/{tests_crop_aspect.rs => tests/crop_aspect.rs} (100%) rename crates/engine/src/{tests_denoise.rs => tests/denoise.rs} (100%) rename crates/engine/src/{tests_export.rs => tests/export.rs} (100%) rename crates/engine/src/{tests_face_models.rs => tests/face_models.rs} (100%) rename crates/engine/src/{tests_face_recognize.rs => tests/face_recognize.rs} (100%) rename crates/engine/src/{tests_face_tiles.rs => tests/face_tiles.rs} (100%) rename crates/engine/src/{tests_filesystem_history.rs => tests/filesystem_history.rs} (100%) rename crates/engine/src/{tests_focus_scan.rs => tests/focus_scan.rs} (100%) rename crates/engine/src/{tests_folders.rs => tests/folders.rs} (100%) rename crates/engine/src/{tests_forget_local.rs => tests/forget_local.rs} (100%) rename crates/engine/src/{tests_history_cursor.rs => tests/history_cursor.rs} (100%) rename crates/engine/src/{tests_hold_view.rs => tests/hold_view.rs} (100%) rename crates/engine/src/{tests_ids_params.rs => tests/ids_params.rs} (100%) rename crates/engine/src/{tests_import.rs => tests/import.rs} (100%) rename crates/engine/src/{tests_import_move.rs => tests/import_move.rs} (100%) rename crates/engine/src/{tests_keyword_list.rs => tests/keyword_list.rs} (100%) rename crates/engine/src/{tests_libops.rs => tests/libops.rs} (100%) rename crates/engine/src/{tests_library.rs => tests/library.rs} (100%) rename crates/engine/src/{tests_lightroom_folder.rs => tests/lightroom_folder.rs} (100%) rename crates/engine/src/{tests_mask_effects.rs => tests/mask_effects.rs} (100%) rename crates/engine/src/{tests_merge.rs => tests/merge.rs} (100%) rename crates/engine/src/{tests_move_to_share.rs => tests/move_to_share.rs} (100%) rename crates/engine/src/{tests_organize.rs => tests/organize.rs} (100%) rename crates/engine/src/{tests_persist.rs => tests/persist.rs} (100%) rename crates/engine/src/{tests_prefs.rs => tests/prefs.rs} (100%) rename crates/engine/src/{tests_presets_scale.rs => tests/presets_scale.rs} (100%) rename crates/engine/src/{tests_print.rs => tests/print.rs} (100%) rename crates/engine/src/{tests_process.rs => tests/process.rs} (100%) rename crates/engine/src/{tests_recheck.rs => tests/recheck.rs} (100%) rename crates/engine/src/{tests_segment.rs => tests/segment.rs} (100%) rename crates/engine/src/{tests_settings_files.rs => tests/settings_files.rs} (100%) rename crates/engine/src/{tests_slide.rs => tests/slide.rs} (100%) rename crates/engine/src/{tests_slideshow_export.rs => tests/slideshow_export.rs} (100%) rename crates/engine/src/{tests_spots.rs => tests/spots.rs} (100%) rename crates/engine/src/{tests_sync.rs => tests/sync.rs} (100%) rename crates/engine/src/{tests_view_follow.rs => tests/view_follow.rs} (100%) rename crates/engine/src/{tests_xmp.rs => tests/xmp.rs} (100%) diff --git a/crates/engine/src/lib.rs b/crates/engine/src/lib.rs index ff2b972c0..acaa18070 100644 --- a/crates/engine/src/lib.rs +++ b/crates/engine/src/lib.rs @@ -1360,90 +1360,7 @@ pub fn json_delta(old: &Value, new: &Value) -> Option { #[cfg(test)] mod tests; #[cfg(test)] -mod tests_album_order; -#[cfg(test)] -mod tests_album_remove; -#[cfg(test)] -mod tests_albums_local; -#[cfg(test)] -mod tests_color; -#[cfg(test)] -mod tests_constrain_crop; -#[cfg(test)] -mod tests_crop_angle; -#[cfg(test)] -mod tests_crop_aspect; -#[cfg(test)] -mod tests_denoise; -#[cfg(test)] -mod tests_export; -#[cfg(test)] -mod tests_face_models; -#[cfg(test)] #[cfg(not(target_arch = "wasm32"))] -mod tests_face_recognize; +use tests::face_recognize as tests_face_recognize; #[cfg(test)] -#[cfg(not(target_arch = "wasm32"))] -mod tests_face_tiles; -#[cfg(test)] -mod tests_filesystem_history; -#[cfg(all(test, not(target_arch = "wasm32")))] -mod tests_focus_scan; -#[cfg(test)] -mod tests_folders; -#[cfg(test)] -mod tests_forget_local; -#[cfg(test)] -mod tests_history_cursor; -#[cfg(test)] -mod tests_hold_view; -#[cfg(test)] -mod tests_ids_params; -#[cfg(test)] -mod tests_import; -#[cfg(test)] -mod tests_import_move; -#[cfg(test)] -mod tests_keyword_list; -#[cfg(test)] -mod tests_libops; -#[cfg(test)] -mod tests_library; -#[cfg(test)] -mod tests_lightroom_folder; -#[cfg(test)] -mod tests_mask_effects; -#[cfg(test)] -mod tests_merge; -#[cfg(test)] -mod tests_move_to_share; -#[cfg(test)] -mod tests_organize; -#[cfg(test)] -mod tests_persist; -#[cfg(test)] -mod tests_prefs; -#[cfg(test)] -mod tests_presets_scale; -#[cfg(test)] -mod tests_print; -#[cfg(test)] -mod tests_process; -#[cfg(test)] -mod tests_recheck; -#[cfg(test)] -mod tests_segment; -#[cfg(test)] -mod tests_settings_files; -#[cfg(test)] -mod tests_slide; -#[cfg(test)] -mod tests_slideshow_export; -#[cfg(test)] -mod tests_spots; -#[cfg(test)] -mod tests_sync; -#[cfg(test)] -mod tests_view_follow; -#[cfg(test)] -mod tests_xmp; +use tests::xmp as tests_xmp; diff --git a/crates/engine/src/tests.rs b/crates/engine/src/tests.rs index 93f4e6adc..185c94f63 100644 --- a/crates/engine/src/tests.rs +++ b/crates/engine/src/tests.rs @@ -2,6 +2,53 @@ use serde_json::{Value, json}; use crate::{Selection, Session, command_specs}; +mod album_order; +mod album_remove; +mod albums_local; +mod color; +mod constrain_crop; +mod crop_angle; +mod crop_aspect; +mod denoise; +mod export; +mod face_models; +#[cfg(not(target_arch = "wasm32"))] +pub(super) mod face_recognize; +#[cfg(not(target_arch = "wasm32"))] +mod face_tiles; +mod filesystem_history; +#[cfg(all(test, not(target_arch = "wasm32")))] +mod focus_scan; +mod folders; +mod forget_local; +mod history_cursor; +mod hold_view; +mod ids_params; +mod import; +mod import_move; +mod keyword_list; +mod libops; +mod library; +mod lightroom_folder; +mod mask_effects; +mod merge; +mod move_to_share; +mod organize; +mod persist; +mod prefs; +mod presets_scale; +mod print; +mod process; +mod recheck; +mod segment; +mod settings_files; +mod slide; +mod slideshow_export; +mod spots; +mod sync; +mod view_follow; +pub(super) mod xmp; + fn demo() -> Session { Session::with_demo() } diff --git a/crates/engine/src/tests_album_order.rs b/crates/engine/src/tests/album_order.rs similarity index 100% rename from crates/engine/src/tests_album_order.rs rename to crates/engine/src/tests/album_order.rs diff --git a/crates/engine/src/tests_album_remove.rs b/crates/engine/src/tests/album_remove.rs similarity index 100% rename from crates/engine/src/tests_album_remove.rs rename to crates/engine/src/tests/album_remove.rs diff --git a/crates/engine/src/tests_albums_local.rs b/crates/engine/src/tests/albums_local.rs similarity index 100% rename from crates/engine/src/tests_albums_local.rs rename to crates/engine/src/tests/albums_local.rs diff --git a/crates/engine/src/tests_color.rs b/crates/engine/src/tests/color.rs similarity index 100% rename from crates/engine/src/tests_color.rs rename to crates/engine/src/tests/color.rs diff --git a/crates/engine/src/tests_constrain_crop.rs b/crates/engine/src/tests/constrain_crop.rs similarity index 100% rename from crates/engine/src/tests_constrain_crop.rs rename to crates/engine/src/tests/constrain_crop.rs diff --git a/crates/engine/src/tests_crop_angle.rs b/crates/engine/src/tests/crop_angle.rs similarity index 100% rename from crates/engine/src/tests_crop_angle.rs rename to crates/engine/src/tests/crop_angle.rs diff --git a/crates/engine/src/tests_crop_aspect.rs b/crates/engine/src/tests/crop_aspect.rs similarity index 100% rename from crates/engine/src/tests_crop_aspect.rs rename to crates/engine/src/tests/crop_aspect.rs diff --git a/crates/engine/src/tests_denoise.rs b/crates/engine/src/tests/denoise.rs similarity index 100% rename from crates/engine/src/tests_denoise.rs rename to crates/engine/src/tests/denoise.rs diff --git a/crates/engine/src/tests_export.rs b/crates/engine/src/tests/export.rs similarity index 100% rename from crates/engine/src/tests_export.rs rename to crates/engine/src/tests/export.rs diff --git a/crates/engine/src/tests_face_models.rs b/crates/engine/src/tests/face_models.rs similarity index 100% rename from crates/engine/src/tests_face_models.rs rename to crates/engine/src/tests/face_models.rs diff --git a/crates/engine/src/tests_face_recognize.rs b/crates/engine/src/tests/face_recognize.rs similarity index 100% rename from crates/engine/src/tests_face_recognize.rs rename to crates/engine/src/tests/face_recognize.rs diff --git a/crates/engine/src/tests_face_tiles.rs b/crates/engine/src/tests/face_tiles.rs similarity index 100% rename from crates/engine/src/tests_face_tiles.rs rename to crates/engine/src/tests/face_tiles.rs diff --git a/crates/engine/src/tests_filesystem_history.rs b/crates/engine/src/tests/filesystem_history.rs similarity index 100% rename from crates/engine/src/tests_filesystem_history.rs rename to crates/engine/src/tests/filesystem_history.rs diff --git a/crates/engine/src/tests_focus_scan.rs b/crates/engine/src/tests/focus_scan.rs similarity index 100% rename from crates/engine/src/tests_focus_scan.rs rename to crates/engine/src/tests/focus_scan.rs diff --git a/crates/engine/src/tests_folders.rs b/crates/engine/src/tests/folders.rs similarity index 100% rename from crates/engine/src/tests_folders.rs rename to crates/engine/src/tests/folders.rs diff --git a/crates/engine/src/tests_forget_local.rs b/crates/engine/src/tests/forget_local.rs similarity index 100% rename from crates/engine/src/tests_forget_local.rs rename to crates/engine/src/tests/forget_local.rs diff --git a/crates/engine/src/tests_history_cursor.rs b/crates/engine/src/tests/history_cursor.rs similarity index 100% rename from crates/engine/src/tests_history_cursor.rs rename to crates/engine/src/tests/history_cursor.rs diff --git a/crates/engine/src/tests_hold_view.rs b/crates/engine/src/tests/hold_view.rs similarity index 100% rename from crates/engine/src/tests_hold_view.rs rename to crates/engine/src/tests/hold_view.rs diff --git a/crates/engine/src/tests_ids_params.rs b/crates/engine/src/tests/ids_params.rs similarity index 100% rename from crates/engine/src/tests_ids_params.rs rename to crates/engine/src/tests/ids_params.rs diff --git a/crates/engine/src/tests_import.rs b/crates/engine/src/tests/import.rs similarity index 100% rename from crates/engine/src/tests_import.rs rename to crates/engine/src/tests/import.rs diff --git a/crates/engine/src/tests_import_move.rs b/crates/engine/src/tests/import_move.rs similarity index 100% rename from crates/engine/src/tests_import_move.rs rename to crates/engine/src/tests/import_move.rs diff --git a/crates/engine/src/tests_keyword_list.rs b/crates/engine/src/tests/keyword_list.rs similarity index 100% rename from crates/engine/src/tests_keyword_list.rs rename to crates/engine/src/tests/keyword_list.rs diff --git a/crates/engine/src/tests_libops.rs b/crates/engine/src/tests/libops.rs similarity index 100% rename from crates/engine/src/tests_libops.rs rename to crates/engine/src/tests/libops.rs diff --git a/crates/engine/src/tests_library.rs b/crates/engine/src/tests/library.rs similarity index 100% rename from crates/engine/src/tests_library.rs rename to crates/engine/src/tests/library.rs diff --git a/crates/engine/src/tests_lightroom_folder.rs b/crates/engine/src/tests/lightroom_folder.rs similarity index 100% rename from crates/engine/src/tests_lightroom_folder.rs rename to crates/engine/src/tests/lightroom_folder.rs diff --git a/crates/engine/src/tests_mask_effects.rs b/crates/engine/src/tests/mask_effects.rs similarity index 100% rename from crates/engine/src/tests_mask_effects.rs rename to crates/engine/src/tests/mask_effects.rs diff --git a/crates/engine/src/tests_merge.rs b/crates/engine/src/tests/merge.rs similarity index 100% rename from crates/engine/src/tests_merge.rs rename to crates/engine/src/tests/merge.rs diff --git a/crates/engine/src/tests_move_to_share.rs b/crates/engine/src/tests/move_to_share.rs similarity index 100% rename from crates/engine/src/tests_move_to_share.rs rename to crates/engine/src/tests/move_to_share.rs diff --git a/crates/engine/src/tests_organize.rs b/crates/engine/src/tests/organize.rs similarity index 100% rename from crates/engine/src/tests_organize.rs rename to crates/engine/src/tests/organize.rs diff --git a/crates/engine/src/tests_persist.rs b/crates/engine/src/tests/persist.rs similarity index 100% rename from crates/engine/src/tests_persist.rs rename to crates/engine/src/tests/persist.rs diff --git a/crates/engine/src/tests_prefs.rs b/crates/engine/src/tests/prefs.rs similarity index 100% rename from crates/engine/src/tests_prefs.rs rename to crates/engine/src/tests/prefs.rs diff --git a/crates/engine/src/tests_presets_scale.rs b/crates/engine/src/tests/presets_scale.rs similarity index 100% rename from crates/engine/src/tests_presets_scale.rs rename to crates/engine/src/tests/presets_scale.rs diff --git a/crates/engine/src/tests_print.rs b/crates/engine/src/tests/print.rs similarity index 100% rename from crates/engine/src/tests_print.rs rename to crates/engine/src/tests/print.rs diff --git a/crates/engine/src/tests_process.rs b/crates/engine/src/tests/process.rs similarity index 100% rename from crates/engine/src/tests_process.rs rename to crates/engine/src/tests/process.rs diff --git a/crates/engine/src/tests_recheck.rs b/crates/engine/src/tests/recheck.rs similarity index 100% rename from crates/engine/src/tests_recheck.rs rename to crates/engine/src/tests/recheck.rs diff --git a/crates/engine/src/tests_segment.rs b/crates/engine/src/tests/segment.rs similarity index 100% rename from crates/engine/src/tests_segment.rs rename to crates/engine/src/tests/segment.rs diff --git a/crates/engine/src/tests_settings_files.rs b/crates/engine/src/tests/settings_files.rs similarity index 100% rename from crates/engine/src/tests_settings_files.rs rename to crates/engine/src/tests/settings_files.rs diff --git a/crates/engine/src/tests_slide.rs b/crates/engine/src/tests/slide.rs similarity index 100% rename from crates/engine/src/tests_slide.rs rename to crates/engine/src/tests/slide.rs diff --git a/crates/engine/src/tests_slideshow_export.rs b/crates/engine/src/tests/slideshow_export.rs similarity index 100% rename from crates/engine/src/tests_slideshow_export.rs rename to crates/engine/src/tests/slideshow_export.rs diff --git a/crates/engine/src/tests_spots.rs b/crates/engine/src/tests/spots.rs similarity index 100% rename from crates/engine/src/tests_spots.rs rename to crates/engine/src/tests/spots.rs diff --git a/crates/engine/src/tests_sync.rs b/crates/engine/src/tests/sync.rs similarity index 100% rename from crates/engine/src/tests_sync.rs rename to crates/engine/src/tests/sync.rs diff --git a/crates/engine/src/tests_view_follow.rs b/crates/engine/src/tests/view_follow.rs similarity index 100% rename from crates/engine/src/tests_view_follow.rs rename to crates/engine/src/tests/view_follow.rs diff --git a/crates/engine/src/tests_xmp.rs b/crates/engine/src/tests/xmp.rs similarity index 100% rename from crates/engine/src/tests_xmp.rs rename to crates/engine/src/tests/xmp.rs