VectorCraft: An open-source, vector art tool written by scratch in pure Rust
refactor(ui-egui): move tests_*.rs to tests/<topic>.rs
aiongge5451f157959
diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rsindex 4efc27211..1e1c1c4b8 100644--- a/crates/ui-egui/src/lib.rs+++ b/crates/ui-egui/src/lib.rs@@ -73,113 +73,9 @@ pub mod workspaces;mod document_drag;#[cfg(test)]-mod tests_adjust;+use tests::{background as tests_background, labels as tests_labels, picks as tests_picks, removeanchors as tests_removeanchors, svg as tests_svg, synthetic as tests_synthetic, sysclip as tests_sysclip};#[cfg(test)]-mod tests_aisave;-#[cfg(test)]-mod tests_automation;-#[cfg(test)]-mod tests_background;-#[cfg(test)]-mod tests_clipboard;-#[cfg(test)]-mod tests_contextmenu;-#[cfg(test)]-mod tests_cut;-#[cfg(test)]-mod tests_distortkeys;-#[cfg(test)]-mod tests_docsetup;-#[cfg(test)]-mod tests_document_drag;-#[cfg(test)]-mod tests_font_menu;-#[cfg(test)]-mod tests_fonts;-#[cfg(test)]-mod tests_guide_escape;-#[cfg(test)]-mod tests_home;-#[cfg(test)]-mod tests_labels;-#[cfg(test)]-mod tests_lifecycle;-#[cfg(test)]-mod tests_nativemenu;-#[cfg(test)]-mod tests_nativeoptions;-#[cfg(test)]-mod tests_numfields;-#[cfg(test)]-mod tests_overprint;-#[cfg(test)]-mod tests_paintchips;-#[cfg(test)]-mod tests_pastechords;-#[cfg(test)]-mod tests_pathtype;-#[cfg(test)]-mod tests_pdfoutput;-#[cfg(test)]-mod tests_picks;-#[cfg(test)]-mod tests_place;-#[cfg(test)]-mod tests_plugin_runs;-#[cfg(test)]-mod tests_plugins;-#[cfg(test)]-mod tests_printps;-#[cfg(test)]-mod tests_printtiling;-#[cfg(test)]-mod tests_puppetwarp;-#[cfg(test)]-mod tests_recolor;-#[cfg(test)]-mod tests_recovery;-#[cfg(test)]-mod tests_removeanchors;-#[cfg(test)]-mod tests_rotateview;-#[cfg(test)]-mod tests_ruler_origin;-#[cfg(test)]-mod tests_save;-#[cfg(test)]-mod tests_saveext;-#[cfg(test)]-mod tests_screenmode;-#[cfg(test)]-mod tests_screenshots;-#[cfg(test)]-mod tests_script_check;-#[cfg(test)]-mod tests_scrub;-#[cfg(test)]-mod tests_selectall;-#[cfg(test)]-mod tests_slices;-#[cfg(test)]-mod tests_svg;-#[cfg(test)]-mod tests_svgsave;-#[cfg(test)]-mod tests_synthetic;-#[cfg(test)]-mod tests_sysclip;-#[cfg(test)]-mod tests_sysclip_emf;-#[cfg(test)]-mod tests_sysclip_probe;-#[cfg(test)]-mod tests_tab_overflow;-#[cfg(test)]-mod tests_taskbar;-#[cfg(test)]-mod tests_transparencygrid;-#[cfg(test)]-mod tests_widthtool;+mod tests;use std::sync::atomic::{AtomicBool, Ordering};use std::sync::mpsc::{Receiver, Sender};diff --git a/crates/ui-egui/src/tests.rs b/crates/ui-egui/src/tests.rsnew file mode 100644index 000000000..fc3a59d43--- /dev/null+++ b/crates/ui-egui/src/tests.rs@@ -0,0 +1,54 @@+mod adjust;+mod aisave;+mod automation;+pub(super) mod background;+mod clipboard;+mod contextmenu;+mod cut;+mod distortkeys;+mod docsetup;+mod document_drag;+mod font_menu;+mod fonts;+mod guide_escape;+mod home;+pub(super) mod labels;+mod lifecycle;+mod nativemenu;+mod nativeoptions;+mod numfields;+mod overprint;+mod paintchips;+mod pastechords;+mod pathtype;+mod pdfoutput;+pub(super) mod picks;+mod place;+mod plugin_runs;+mod plugins;+mod printps;+mod printtiling;+mod puppetwarp;+mod recolor;+mod recovery;+pub(super) mod removeanchors;+mod rotateview;+mod ruler_origin;+mod save;+mod saveext;+mod screenmode;+mod screenshots;+mod script_check;+mod scrub;+mod selectall;+mod slices;+pub(super) mod svg;+mod svgsave;+pub(super) mod synthetic;+pub(super) mod sysclip;+mod sysclip_emf;+mod sysclip_probe;+mod tab_overflow;+mod taskbar;+mod transparencygrid;+mod widthtool;diff --git a/crates/ui-egui/src/tests_adjust.rs b/crates/ui-egui/src/tests/adjust.rssimilarity index 100%rename from crates/ui-egui/src/tests_adjust.rsrename to crates/ui-egui/src/tests/adjust.rsdiff --git a/crates/ui-egui/src/tests_aisave.rs b/crates/ui-egui/src/tests/aisave.rssimilarity index 100%rename from crates/ui-egui/src/tests_aisave.rsrename to crates/ui-egui/src/tests/aisave.rsdiff --git a/crates/ui-egui/src/tests_automation.rs b/crates/ui-egui/src/tests/automation.rssimilarity index 100%rename from crates/ui-egui/src/tests_automation.rsrename to crates/ui-egui/src/tests/automation.rsdiff --git a/crates/ui-egui/src/tests_background.rs b/crates/ui-egui/src/tests/background.rssimilarity index 98%rename from crates/ui-egui/src/tests_background.rsrename to crates/ui-egui/src/tests/background.rsindex bc0f67735..add53156e 100644--- a/crates/ui-egui/src/tests_background.rs+++ b/crates/ui-egui/src/tests/background.rs@@ -12,17 +12,17 @@ use vectorcraft_geom::{Rect, shapes};use crate::control::ControlRequest;use crate::{Services, VectorcraftApp, background, io};-pub(super) type Files = Arc<Mutex<Vec<(String, Vec<u8>)>>>;+pub(crate) type Files = Arc<Mutex<Vec<(String, Vec<u8>)>>>;/// Holds the background writer until opened.#[derive(Clone, Default)]-pub(super) struct Gate(Arc<AtomicBool>);+pub(crate) struct Gate(Arc<AtomicBool>);impl Gate {- pub(super) fn open(&self) {+ pub(crate) fn open(&self) {self.0.store(true, Ordering::SeqCst);}- pub(super) fn wait(&self) {+ pub(crate) fn wait(&self) {while !self.0.load(Ordering::SeqCst) {std::thread::sleep(std::time::Duration::from_millis(1));}@@ -57,7 +57,7 @@ fn paths(n: usize) -> Document {d}-pub(super) fn written(files: &Files) -> Vec<String> {+pub(crate) fn written(files: &Files) -> Vec<String> {files.lock().unwrap().iter().map(|(p, _)| p.clone()).collect()}diff --git a/crates/ui-egui/src/tests_clipboard.rs b/crates/ui-egui/src/tests/clipboard.rssimilarity index 100%rename from crates/ui-egui/src/tests_clipboard.rsrename to crates/ui-egui/src/tests/clipboard.rsdiff --git a/crates/ui-egui/src/tests_contextmenu.rs b/crates/ui-egui/src/tests/contextmenu.rssimilarity index 100%rename from crates/ui-egui/src/tests_contextmenu.rsrename to crates/ui-egui/src/tests/contextmenu.rsdiff --git a/crates/ui-egui/src/tests_cut.rs b/crates/ui-egui/src/tests/cut.rssimilarity index 100%rename from crates/ui-egui/src/tests_cut.rsrename to crates/ui-egui/src/tests/cut.rsdiff --git a/crates/ui-egui/src/tests_distortkeys.rs b/crates/ui-egui/src/tests/distortkeys.rssimilarity index 100%rename from crates/ui-egui/src/tests_distortkeys.rsrename to crates/ui-egui/src/tests/distortkeys.rsdiff --git a/crates/ui-egui/src/tests_docsetup.rs b/crates/ui-egui/src/tests/docsetup.rssimilarity index 100%rename from crates/ui-egui/src/tests_docsetup.rsrename to crates/ui-egui/src/tests/docsetup.rsdiff --git a/crates/ui-egui/src/tests_document_drag.rs b/crates/ui-egui/src/tests/document_drag.rssimilarity index 100%rename from crates/ui-egui/src/tests_document_drag.rsrename to crates/ui-egui/src/tests/document_drag.rsdiff --git a/crates/ui-egui/src/tests_font_menu.rs b/crates/ui-egui/src/tests/font_menu.rssimilarity index 100%rename from crates/ui-egui/src/tests_font_menu.rsrename to crates/ui-egui/src/tests/font_menu.rsdiff --git a/crates/ui-egui/src/tests_fonts.rs b/crates/ui-egui/src/tests/fonts.rssimilarity index 100%rename from crates/ui-egui/src/tests_fonts.rsrename to crates/ui-egui/src/tests/fonts.rsdiff --git a/crates/ui-egui/src/tests_guide_escape.rs b/crates/ui-egui/src/tests/guide_escape.rssimilarity index 100%rename from crates/ui-egui/src/tests_guide_escape.rsrename to crates/ui-egui/src/tests/guide_escape.rsdiff --git a/crates/ui-egui/src/tests_home.rs b/crates/ui-egui/src/tests/home.rssimilarity index 100%rename from crates/ui-egui/src/tests_home.rsrename to crates/ui-egui/src/tests/home.rsdiff --git a/crates/ui-egui/src/tests_labels.rs b/crates/ui-egui/src/tests/labels.rssimilarity index 100%rename from crates/ui-egui/src/tests_labels.rsrename to crates/ui-egui/src/tests/labels.rsdiff --git a/crates/ui-egui/src/tests_lifecycle.rs b/crates/ui-egui/src/tests/lifecycle.rssimilarity index 100%rename from crates/ui-egui/src/tests_lifecycle.rsrename to crates/ui-egui/src/tests/lifecycle.rsdiff --git a/crates/ui-egui/src/tests_nativemenu.rs b/crates/ui-egui/src/tests/nativemenu.rssimilarity index 100%rename from crates/ui-egui/src/tests_nativemenu.rsrename to crates/ui-egui/src/tests/nativemenu.rsdiff --git a/crates/ui-egui/src/tests_nativeoptions.rs b/crates/ui-egui/src/tests/nativeoptions.rssimilarity index 100%rename from crates/ui-egui/src/tests_nativeoptions.rsrename to crates/ui-egui/src/tests/nativeoptions.rsdiff --git a/crates/ui-egui/src/tests_numfields.rs b/crates/ui-egui/src/tests/numfields.rssimilarity index 100%rename from crates/ui-egui/src/tests_numfields.rsrename to crates/ui-egui/src/tests/numfields.rsdiff --git a/crates/ui-egui/src/tests_overprint.rs b/crates/ui-egui/src/tests/overprint.rssimilarity index 100%rename from crates/ui-egui/src/tests_overprint.rsrename to crates/ui-egui/src/tests/overprint.rsdiff --git a/crates/ui-egui/src/tests_paintchips.rs b/crates/ui-egui/src/tests/paintchips.rssimilarity index 100%rename from crates/ui-egui/src/tests_paintchips.rsrename to crates/ui-egui/src/tests/paintchips.rsdiff --git a/crates/ui-egui/src/tests_pastechords.rs b/crates/ui-egui/src/tests/pastechords.rssimilarity index 100%rename from crates/ui-egui/src/tests_pastechords.rsrename to crates/ui-egui/src/tests/pastechords.rsdiff --git a/crates/ui-egui/src/tests_pathtype.rs b/crates/ui-egui/src/tests/pathtype.rssimilarity index 100%rename from crates/ui-egui/src/tests_pathtype.rsrename to crates/ui-egui/src/tests/pathtype.rsdiff --git a/crates/ui-egui/src/tests_pdfoutput.rs b/crates/ui-egui/src/tests/pdfoutput.rssimilarity index 100%rename from crates/ui-egui/src/tests_pdfoutput.rsrename to crates/ui-egui/src/tests/pdfoutput.rsdiff --git a/crates/ui-egui/src/tests_picks.rs b/crates/ui-egui/src/tests/picks.rssimilarity index 100%rename from crates/ui-egui/src/tests_picks.rsrename to crates/ui-egui/src/tests/picks.rsdiff --git a/crates/ui-egui/src/tests_place.rs b/crates/ui-egui/src/tests/place.rssimilarity index 100%rename from crates/ui-egui/src/tests_place.rsrename to crates/ui-egui/src/tests/place.rsdiff --git a/crates/ui-egui/src/tests_plugin_runs.rs b/crates/ui-egui/src/tests/plugin_runs.rssimilarity index 100%rename from crates/ui-egui/src/tests_plugin_runs.rsrename to crates/ui-egui/src/tests/plugin_runs.rsdiff --git a/crates/ui-egui/src/tests_plugins.rs b/crates/ui-egui/src/tests/plugins.rssimilarity index 98%rename from crates/ui-egui/src/tests_plugins.rsrename to crates/ui-egui/src/tests/plugins.rsindex c934ef672..3bd693afa 100644--- a/crates/ui-egui/src/tests_plugins.rs+++ b/crates/ui-egui/src/tests/plugins.rs@@ -9,7 +9,7 @@ use vectorcraft_plugins::wat as tpl;use crate::state::Dialog;use crate::{VectorcraftApp, dialogs, io, menus, theme};-const DESATURATE: &[u8] = include_bytes!("../../plugins/tests/fixtures/desaturate.wasm");+const DESATURATE: &[u8] = include_bytes!("../../../plugins/tests/fixtures/desaturate.wasm");const DESATURATE_ID: &str = "org.vectorcraft.example.desaturate";fn app() -> VectorcraftApp {diff --git a/crates/ui-egui/src/tests_printps.rs b/crates/ui-egui/src/tests/printps.rssimilarity index 100%rename from crates/ui-egui/src/tests_printps.rsrename to crates/ui-egui/src/tests/printps.rsdiff --git a/crates/ui-egui/src/tests_printtiling.rs b/crates/ui-egui/src/tests/printtiling.rssimilarity index 100%rename from crates/ui-egui/src/tests_printtiling.rsrename to crates/ui-egui/src/tests/printtiling.rsdiff --git a/crates/ui-egui/src/tests_puppetwarp.rs b/crates/ui-egui/src/tests/puppetwarp.rssimilarity index 100%rename from crates/ui-egui/src/tests_puppetwarp.rsrename to crates/ui-egui/src/tests/puppetwarp.rsdiff --git a/crates/ui-egui/src/tests_recolor.rs b/crates/ui-egui/src/tests/recolor.rssimilarity index 100%rename from crates/ui-egui/src/tests_recolor.rsrename to crates/ui-egui/src/tests/recolor.rsdiff --git a/crates/ui-egui/src/tests_recovery.rs b/crates/ui-egui/src/tests/recovery.rssimilarity index 100%rename from crates/ui-egui/src/tests_recovery.rsrename to crates/ui-egui/src/tests/recovery.rsdiff --git a/crates/ui-egui/src/tests_removeanchors.rs b/crates/ui-egui/src/tests/removeanchors.rssimilarity index 100%rename from crates/ui-egui/src/tests_removeanchors.rsrename to crates/ui-egui/src/tests/removeanchors.rsdiff --git a/crates/ui-egui/src/tests_rotateview.rs b/crates/ui-egui/src/tests/rotateview.rssimilarity index 100%rename from crates/ui-egui/src/tests_rotateview.rsrename to crates/ui-egui/src/tests/rotateview.rsdiff --git a/crates/ui-egui/src/tests_ruler_origin.rs b/crates/ui-egui/src/tests/ruler_origin.rssimilarity index 100%rename from crates/ui-egui/src/tests_ruler_origin.rsrename to crates/ui-egui/src/tests/ruler_origin.rsdiff --git a/crates/ui-egui/src/tests_save.rs b/crates/ui-egui/src/tests/save.rssimilarity index 100%rename from crates/ui-egui/src/tests_save.rsrename to crates/ui-egui/src/tests/save.rsdiff --git a/crates/ui-egui/src/tests_saveext.rs b/crates/ui-egui/src/tests/saveext.rssimilarity index 100%rename from crates/ui-egui/src/tests_saveext.rsrename to crates/ui-egui/src/tests/saveext.rsdiff --git a/crates/ui-egui/src/tests_screenmode.rs b/crates/ui-egui/src/tests/screenmode.rssimilarity index 100%rename from crates/ui-egui/src/tests_screenmode.rsrename to crates/ui-egui/src/tests/screenmode.rsdiff --git a/crates/ui-egui/src/tests_screenshots.rs b/crates/ui-egui/src/tests/screenshots.rssimilarity index 100%rename from crates/ui-egui/src/tests_screenshots.rsrename to crates/ui-egui/src/tests/screenshots.rsdiff --git a/crates/ui-egui/src/tests_script_check.rs b/crates/ui-egui/src/tests/script_check.rssimilarity index 100%rename from crates/ui-egui/src/tests_script_check.rsrename to crates/ui-egui/src/tests/script_check.rsdiff --git a/crates/ui-egui/src/tests_scrub.rs b/crates/ui-egui/src/tests/scrub.rssimilarity index 100%rename from crates/ui-egui/src/tests_scrub.rsrename to crates/ui-egui/src/tests/scrub.rsdiff --git a/crates/ui-egui/src/tests_selectall.rs b/crates/ui-egui/src/tests/selectall.rssimilarity index 100%rename from crates/ui-egui/src/tests_selectall.rsrename to crates/ui-egui/src/tests/selectall.rsdiff --git a/crates/ui-egui/src/tests_slices.rs b/crates/ui-egui/src/tests/slices.rssimilarity index 100%rename from crates/ui-egui/src/tests_slices.rsrename to crates/ui-egui/src/tests/slices.rsdiff --git a/crates/ui-egui/src/tests_svg.rs b/crates/ui-egui/src/tests/svg.rssimilarity index 100%rename from crates/ui-egui/src/tests_svg.rsrename to crates/ui-egui/src/tests/svg.rsdiff --git a/crates/ui-egui/src/tests_svgsave.rs b/crates/ui-egui/src/tests/svgsave.rssimilarity index 100%rename from crates/ui-egui/src/tests_svgsave.rsrename to crates/ui-egui/src/tests/svgsave.rsdiff --git a/crates/ui-egui/src/tests_synthetic.rs b/crates/ui-egui/src/tests/synthetic.rssimilarity index 100%rename from crates/ui-egui/src/tests_synthetic.rsrename to crates/ui-egui/src/tests/synthetic.rsdiff --git a/crates/ui-egui/src/tests_sysclip.rs b/crates/ui-egui/src/tests/sysclip.rssimilarity index 99%rename from crates/ui-egui/src/tests_sysclip.rsrename to crates/ui-egui/src/tests/sysclip.rsindex 38e08fbf7..2e2197481 100644--- a/crates/ui-egui/src/tests_sysclip.rs+++ b/crates/ui-egui/src/tests/sysclip.rs@@ -143,7 +143,7 @@ fn text_and_image_paste_events_paste_once_as_text() {}/// A 4 × 2 px blue PNG.-pub(super) fn blue_png() -> Vec<u8> {+pub(crate) fn blue_png() -> Vec<u8> {let img = image::RgbaImage::from_pixel(4, 2, image::Rgba([0, 0, 255, 255]));let mut png = vec![];img.write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).unwrap();diff --git a/crates/ui-egui/src/tests_sysclip_emf.rs b/crates/ui-egui/src/tests/sysclip_emf.rssimilarity index 100%rename from crates/ui-egui/src/tests_sysclip_emf.rsrename to crates/ui-egui/src/tests/sysclip_emf.rsdiff --git a/crates/ui-egui/src/tests_sysclip_probe.rs b/crates/ui-egui/src/tests/sysclip_probe.rssimilarity index 100%rename from crates/ui-egui/src/tests_sysclip_probe.rsrename to crates/ui-egui/src/tests/sysclip_probe.rsdiff --git a/crates/ui-egui/src/tests_tab_overflow.rs b/crates/ui-egui/src/tests/tab_overflow.rssimilarity index 100%rename from crates/ui-egui/src/tests_tab_overflow.rsrename to crates/ui-egui/src/tests/tab_overflow.rsdiff --git a/crates/ui-egui/src/tests_taskbar.rs b/crates/ui-egui/src/tests/taskbar.rssimilarity index 100%rename from crates/ui-egui/src/tests_taskbar.rsrename to crates/ui-egui/src/tests/taskbar.rsdiff --git a/crates/ui-egui/src/tests_transparencygrid.rs b/crates/ui-egui/src/tests/transparencygrid.rssimilarity index 100%rename from crates/ui-egui/src/tests_transparencygrid.rsrename to crates/ui-egui/src/tests/transparencygrid.rsdiff --git a/crates/ui-egui/src/tests_widthtool.rs b/crates/ui-egui/src/tests/widthtool.rssimilarity index 100%rename from crates/ui-egui/src/tests_widthtool.rsrename to crates/ui-egui/src/tests/widthtool.rs