VectorCraft: An open-source, vector art tool written by scratch in pure Rust
refactor(render): move tests_*.rs to tests/<topic>.rs
aionggc21beabf9728
diff --git a/crates/render/src/lib.rs b/crates/render/src/lib.rsindex 83b0f74c4..01c753867 100644--- a/crates/render/src/lib.rs+++ b/crates/render/src/lib.rs@@ -2848,54 +2848,6 @@ thread_local! {}#[cfg(test)]-mod tests;-#[cfg(test)]-mod tests_adjust;-#[cfg(test)]-mod tests_alternate;-#[cfg(test)]-mod tests_bitmapglyphs;-#[cfg(test)]-mod tests_blend;-#[cfg(test)]-mod tests_changed;-#[cfg(test)]-mod tests_charstroke;-#[cfg(test)]-mod tests_clip;-#[cfg(test)]-mod tests_cmykblend;-#[cfg(test)]-mod tests_colrglyphs;-#[cfg(test)]-mod tests_container;-#[cfg(test)]-mod tests_dither;-#[cfg(test)]-mod tests_fontchange;+use tests::fontchange as tests_fontchange;#[cfg(test)]-mod tests_freeform;-#[cfg(test)]-mod tests_fxzoom;-#[cfg(test)]-mod tests_isolation;-#[cfg(test)]-mod tests_knockout;-#[cfg(test)]-mod tests_layeropts;-#[cfg(test)]-mod tests_memory;-#[cfg(test)]-mod tests_objectfx;-#[cfg(test)]-mod tests_placed_document;-#[cfg(test)]-mod tests_rasterize;-#[cfg(test)]-mod tests_setup;-#[cfg(test)]-mod tests_strokegradient;-#[cfg(test)]-mod tests_tileedge;-#[cfg(test)]-mod tests_viewraster;+mod tests;diff --git a/crates/render/src/tests.rs b/crates/render/src/tests.rsindex 721634839..9502ef3ff 100644--- a/crates/render/src/tests.rs+++ b/crates/render/src/tests.rs@@ -3,6 +3,32 @@ use vectorcraft_color::{Color, Gradient, GradientPaint, Paint};use vectorcraft_doc::{Appearance, Node};use vectorcraft_geom::shapes;+mod adjust;+mod alternate;+mod bitmapglyphs;+mod blend;+mod changed;+mod charstroke;+mod clip;+mod cmykblend;+mod colrglyphs;+mod container;+mod dither;+pub(super) mod fontchange;+mod freeform;+mod fxzoom;+mod isolation;+mod knockout;+mod layeropts;+mod memory;+mod objectfx;+mod placed_document;+mod rasterize;+mod setup;+mod strokegradient;+mod tileedge;+mod viewraster;+fn rect_node(d: &mut Document, r: Rect, fill: Paint, stroke: Paint, w: f64) -> Node {let id = d.alloc_id();Node::path(id, shapes::rectangle(r), Appearance::basic(fill, stroke, w))diff --git a/crates/render/src/tests_adjust.rs b/crates/render/src/tests/adjust.rssimilarity index 99%rename from crates/render/src/tests_adjust.rsrename to crates/render/src/tests/adjust.rsindex 1457c4df5..f3e930dca 100644--- a/crates/render/src/tests_adjust.rs+++ b/crates/render/src/tests/adjust.rs@@ -9,7 +9,7 @@ use vectorcraft_doc::text::{CharStyle, TextObject};use vectorcraft_doc::{Appearance, Effect, ImageBlob, ImageObject, Node, NodeKind, Symbol};use vectorcraft_geom::{Point, shapes};-use super::*;+use crate::*;fn fx(id: &str, params: Value) -> Effect {Effect { id: id.into(), params, visible: true }diff --git a/crates/render/src/tests_alternate.rs b/crates/render/src/tests/alternate.rssimilarity index 99%rename from crates/render/src/tests_alternate.rsrename to crates/render/src/tests/alternate.rsindex 4459f37db..ad39ed065 100644--- a/crates/render/src/tests_alternate.rs+++ b/crates/render/src/tests/alternate.rs@@ -2,7 +2,7 @@//! cell behind them on screen when the preference is on. Preferences › Type › Highlight//! Substituted Fonts does the same for text drawn in a substitute for a missing font.-use super::*;+use crate::*;/// Highlight Substituted Fonts follows the preference passed in [`RenderOptions`] for every/// document, whatever a document's own setup stored: on, type in a missing font has pink behinddiff --git a/crates/render/src/tests_bitmapglyphs.rs b/crates/render/src/tests/bitmapglyphs.rssimilarity index 99%rename from crates/render/src/tests_bitmapglyphs.rsrename to crates/render/src/tests/bitmapglyphs.rsindex eddff0c36..184b92bcf 100644--- a/crates/render/src/tests_bitmapglyphs.rs+++ b/crates/render/src/tests/bitmapglyphs.rs@@ -6,7 +6,7 @@ use vectorcraft_doc::{Node, NodeKind};use vectorcraft_geom::Point;use vectorcraft_text::test_fonts::{COLOUR_CHAR, COLOUR_LARGE, colour_bitmap_family, colour_bitmap_font};-use super::*;+use crate::*;/// 100 pt [`COLOUR_CHAR`] in the colour bitmap test font (`sbix` or `CBDT`), filled blue, its/// baseline at (20, 120), on a white 160×160 page.diff --git a/crates/render/src/tests_blend.rs b/crates/render/src/tests/blend.rssimilarity index 99%rename from crates/render/src/tests_blend.rsrename to crates/render/src/tests/blend.rsindex 986dd43ed..48ebb2665 100644--- a/crates/render/src/tests_blend.rs+++ b/crates/render/src/tests/blend.rs@@ -1,7 +1,7 @@//! Blend-mode accuracy: every mode matches the reference formulas ([`blend_rgb`]) within 1/255//! (see [`tolerance`]), whether it is an object's blend mode, a fill's or a group's.-use super::*;+use crate::*;use vectorcraft_color::blend::blend_rgb;use vectorcraft_color::{BlendMode as Blend, Color, Paint};use vectorcraft_doc::{Appearance, Node};diff --git a/crates/render/src/tests_changed.rs b/crates/render/src/tests/changed.rssimilarity index 99%rename from crates/render/src/tests_changed.rsrename to crates/render/src/tests/changed.rsindex 108e7604e..675ea52ee 100644--- a/crates/render/src/tests_changed.rs+++ b/crates/render/src/tests/changed.rs@@ -1,6 +1,6 @@//! Drawing again only what an edit changed gives the pixels of drawing it all again.-use super::*;+use crate::*;use vectorcraft_color::{Color, Paint};use vectorcraft_doc::Appearance;use vectorcraft_geom::{Point, shapes};diff --git a/crates/render/src/tests_charstroke.rs b/crates/render/src/tests/charstroke.rssimilarity index 99%rename from crates/render/src/tests_charstroke.rsrename to crates/render/src/tests/charstroke.rsindex 1b78eebe2..45daab916 100644--- a/crates/render/src/tests_charstroke.rs+++ b/crates/render/src/tests/charstroke.rs@@ -6,7 +6,7 @@ use vectorcraft_doc::text::{CharStyle, TextObject};use vectorcraft_doc::{AppearanceItem, Dash, LineJoin, Node, NodeKind};use vectorcraft_geom::Point;-use super::*;+use crate::*;use crate::tests_fontchange::fonts_steady;const SIZE: u32 = 200;diff --git a/crates/render/src/tests_clip.rs b/crates/render/src/tests/clip.rssimilarity index 99%rename from crates/render/src/tests_clip.rsrename to crates/render/src/tests/clip.rsindex 1f72f8ca9..7b04c02e2 100644--- a/crates/render/src/tests_clip.rs+++ b/crates/render/src/tests/clip.rs@@ -1,7 +1,7 @@//! Clip groups clip by any clipping path (M3.26): compound holes, even-odd fills, the union of a//! group's members, text outlines; with nothing to clip by the clipped art is hidden.-use super::*;+use crate::*;use vectorcraft_color::{Color, Paint};use vectorcraft_doc::{Appearance, CharStyle};use vectorcraft_geom::{PathData, Point, SubPath, shapes};diff --git a/crates/render/src/tests_cmykblend.rs b/crates/render/src/tests/cmykblend.rssimilarity index 99%rename from crates/render/src/tests_cmykblend.rsrename to crates/render/src/tests/cmykblend.rsindex 6a603842a..a6ed64ff9 100644--- a/crates/render/src/tests_cmykblend.rs+++ b/crates/render/src/tests/cmykblend.rs@@ -1,6 +1,6 @@//! Blending in CMYK documents ([`crate::ink`]): blend modes and opacity composite inks.-use super::*;+use crate::*;use vectorcraft_color::blend::MASK_LUM;use vectorcraft_color::{BlendMode as Blend, Color, Gradient, GradientKind, GradientPaint, GradientStop, Paint};use vectorcraft_doc::{Appearance, ColorMode, ImageBlob, ImageObject, Node, OpacityMask};diff --git a/crates/render/src/tests_colrglyphs.rs b/crates/render/src/tests/colrglyphs.rssimilarity index 99%rename from crates/render/src/tests_colrglyphs.rsrename to crates/render/src/tests/colrglyphs.rsindex 38f07f888..be0b040a9 100644--- a/crates/render/src/tests_colrglyphs.rs+++ b/crates/render/src/tests/colrglyphs.rs@@ -7,7 +7,7 @@ use vectorcraft_doc::{Node, NodeKind};use vectorcraft_geom::Point;use vectorcraft_text::test_fonts::{COLOUR_CHAR, COLR_SWEEP_CHAR, colr_family, colr_font};-use super::*;+use crate::*;/// 100 pt `text` in the COLR test font (v1 or v0), filled magenta, its baseline at (20, 120)/// turned by `turn` about there, on a white 160×160 page.diff --git a/crates/render/src/tests_container.rs b/crates/render/src/tests/container.rssimilarity index 99%rename from crates/render/src/tests_container.rsrename to crates/render/src/tests/container.rsindex 0bb071147..89126cf2a 100644--- a/crates/render/src/tests_container.rs+++ b/crates/render/src/tests/container.rs@@ -11,7 +11,7 @@ use vectorcraft_doc::text::{CharStyle, TextObject};use vectorcraft_doc::{Appearance, AppearanceItem, Document, Effect, FillLayer, ImageBlob, ImageObject, Knockout, Node, NodeKind, StrokeLayer};use vectorcraft_geom::{Point, shapes};-use super::*;+use crate::*;fn fx(id: &str, params: Value) -> Effect {Effect { id: id.into(), params, visible: true }diff --git a/crates/render/src/tests_dither.rs b/crates/render/src/tests/dither.rssimilarity index 99%rename from crates/render/src/tests_dither.rsrename to crates/render/src/tests/dither.rsindex 55e70e88e..425d48ea8 100644--- a/crates/render/src/tests_dither.rs+++ b/crates/render/src/tests/dither.rs@@ -1,7 +1,7 @@//! Dithered gradient fills: fine noise instead of bands, the same colours on average, the same//! pixels on every render, and nothing changed without dither or on strokes.-use super::*;+use crate::*;use vectorcraft_color::{Color, Gradient, GradientKind, GradientPaint, GradientStop, Paint};use vectorcraft_doc::{Appearance, Node};use vectorcraft_geom::shapes;diff --git a/crates/render/src/tests_fontchange.rs b/crates/render/src/tests/fontchange.rssimilarity index 99%rename from crates/render/src/tests_fontchange.rsrename to crates/render/src/tests/fontchange.rsindex 5b23eb959..70e6554d3 100644--- a/crates/render/src/tests_fontchange.rs+++ b/crates/render/src/tests/fontchange.rs@@ -7,7 +7,7 @@ use vectorcraft_doc::text::{CharStyle, TextObject};use vectorcraft_doc::{Node, NodeKind};use vectorcraft_geom::Point;-use super::*;+use crate::*;/// Taken to add fonts, or to look up an installed one by name (`FontDb::face` loads it, which/// changes the fonts too). Renderers lay type out again when the fonts change, so tests of what@@ -28,7 +28,7 @@ pub(crate) fn adding_fonts() -> RwLockWriteGuard<'static, ()> {/// The bundled Source Serif 4 renamed `family` (as long as the original name).fn serif_as(family: &str) -> Vec<u8> {- let mut data = include_bytes!("../../../assets/fonts/SourceSerif4-Regular.ttf").to_vec();+ let mut data = include_bytes!("../../../../assets/fonts/SourceSerif4-Regular.ttf").to_vec();let utf16 = |s: &str| s.encode_utf16().flat_map(u16::to_be_bytes).collect::<Vec<u8>>();for (from, to) in [(utf16("Source Serif 4"), utf16(family)), (b"Source Serif 4".to_vec(), family.as_bytes().to_vec())] {assert_eq!(from.len(), to.len());diff --git a/crates/render/src/tests_freeform.rs b/crates/render/src/tests/freeform.rssimilarity index 99%rename from crates/render/src/tests_freeform.rsrename to crates/render/src/tests/freeform.rsindex 621e04f87..44db363c7 100644--- a/crates/render/src/tests_freeform.rs+++ b/crates/render/src/tests/freeform.rs@@ -1,6 +1,6 @@//! Freeform gradients: the rendered colour grid against the colour field.-use super::*;+use crate::*;use vectorcraft_color::freeform::spread_scale;use vectorcraft_color::{Color, Freeform, FreeformPoint, Gradient, GradientKind, GradientPaint, Paint};use vectorcraft_doc::{Appearance, Node};diff --git a/crates/render/src/tests_fxzoom.rs b/crates/render/src/tests/fxzoom.rssimilarity index 99%rename from crates/render/src/tests_fxzoom.rsrename to crates/render/src/tests/fxzoom.rsindex a34726671..f1b10001f 100644--- a/crates/render/src/tests_fxzoom.rs+++ b/crates/render/src/tests/fxzoom.rs@@ -6,7 +6,7 @@ use vectorcraft_doc::text::{CharStyle, TextObject};use vectorcraft_doc::{Appearance, Effect, Node, NodeKind};use vectorcraft_geom::{Point, shapes};-use super::*;+use crate::*;/// Type blurred by `radius` points (Gaussian Blur, or Feather when `feather`) over a rectangle/// that overlays at half opacity; without the type when `radius` is `None`.diff --git a/crates/render/src/tests_isolation.rs b/crates/render/src/tests/isolation.rssimilarity index 99%rename from crates/render/src/tests_isolation.rsrename to crates/render/src/tests/isolation.rsindex d4d05b48a..ac71592c3 100644--- a/crates/render/src/tests_isolation.rs+++ b/crates/render/src/tests/isolation.rs@@ -1,7 +1,7 @@//! Non-isolated transparency groups: blending inside a group with opacity or a blend mode reaches//! the art below the group unless Isolate Blending is on (checked against the reference formulas).-use super::*;+use crate::*;use vectorcraft_color::blend::{blend_rgb, composite};use vectorcraft_color::{BlendMode as Blend, Color, Paint};use vectorcraft_doc::{Appearance, Knockout, Node};diff --git a/crates/render/src/tests_knockout.rs b/crates/render/src/tests/knockout.rssimilarity index 99%rename from crates/render/src/tests_knockout.rsrename to crates/render/src/tests/knockout.rsindex 1fbb67f7a..a32f0de9e 100644--- a/crates/render/src/tests_knockout.rs+++ b/crates/render/src/tests/knockout.rs@@ -1,6 +1,6 @@//! Knockout groups, the knockout shape and the page group (Transparency panel).-use super::*;+use crate::*;use vectorcraft_color::{BlendMode as Blend, Color, Paint};use vectorcraft_doc::{Appearance, Knockout, Node};use vectorcraft_geom::shapes;diff --git a/crates/render/src/tests_layeropts.rs b/crates/render/src/tests/layeropts.rssimilarity index 99%rename from crates/render/src/tests_layeropts.rsrename to crates/render/src/tests/layeropts.rsindex 7c76f4c31..bfa7910f1 100644--- a/crates/render/src/tests_layeropts.rs+++ b/crates/render/src/tests/layeropts.rs@@ -5,7 +5,7 @@ use vectorcraft_color::{Color, Paint};use vectorcraft_doc::{Appearance, ImageBlob, ImageObject, Node, NodeId, NodeKind};use vectorcraft_geom::shapes;-use super::*;+use crate::*;/// A red square (10..40) and a 30×30 red image at (50, 10), on one layer set up by `layer`.fn doc(layer: impl FnOnce(&mut NodeKind)) -> Document {diff --git a/crates/render/src/tests_memory.rs b/crates/render/src/tests/memory.rssimilarity index 99%rename from crates/render/src/tests_memory.rsrename to crates/render/src/tests/memory.rsindex 156edb765..844d983b4 100644--- a/crates/render/src/tests_memory.rs+++ b/crates/render/src/tests/memory.rs@@ -6,7 +6,7 @@use vectorcraft_color::{Color, Paint};use vectorcraft_doc::{Document, ImageBlob, ImageObject, Node, NodeKind};-use super::*;+use crate::*;use crate::tests_fontchange::fonts_steady;/// A `w`×`h` PNG whose pixels depend on `seed` (each test its own image: the store is shared bydiff --git a/crates/render/src/tests_objectfx.rs b/crates/render/src/tests/objectfx.rssimilarity index 99%rename from crates/render/src/tests_objectfx.rsrename to crates/render/src/tests/objectfx.rsindex 799de969d..97170f9f0 100644--- a/crates/render/src/tests_objectfx.rs+++ b/crates/render/src/tests/objectfx.rs@@ -11,7 +11,7 @@ use vectorcraft_doc::text::{CharStyle, TextObject};use vectorcraft_doc::{Appearance, AppearanceItem, Effect, FillLayer, ImageBlob, ImageObject, Node, NodeKind, StrokeLayer, Symbol};use vectorcraft_geom::{Point, shapes};-use super::*;+use crate::*;fn fx(id: &str, params: Value) -> Effect {Effect { id: id.into(), params, visible: true }diff --git a/crates/render/src/tests_placed_document.rs b/crates/render/src/tests/placed_document.rssimilarity index 99%rename from crates/render/src/tests_placed_document.rsrename to crates/render/src/tests/placed_document.rsindex add7e3998..60e08a6a5 100644--- a/crates/render/src/tests_placed_document.rs+++ b/crates/render/src/tests/placed_document.rs@@ -5,7 +5,7 @@ use vectorcraft_color::{Color, Paint};use vectorcraft_doc::{Appearance, ImageBlob, LinkInfo, Node, NodeId, NodeKind, PlacedDocument};use vectorcraft_geom::shapes;-use super::*;+use crate::*;/// Every file reads as a 40×20 artboard filled blue; a file whose bytes start with `loop` also/// places itself (the same key) in its middle, and one whose bytes start with `bad` can't be read.diff --git a/crates/render/src/tests_rasterize.rs b/crates/render/src/tests/rasterize.rssimilarity index 99%rename from crates/render/src/tests_rasterize.rsrename to crates/render/src/tests/rasterize.rsindex d317cb507..798d2f6d5 100644--- a/crates/render/src/tests_rasterize.rs+++ b/crates/render/src/tests/rasterize.rs@@ -6,7 +6,7 @@ use vectorcraft_color::{Color, Paint};use vectorcraft_doc::{Appearance, Effect, Node};use vectorcraft_geom::{Anchor, PathData, Point, SubPath, shapes};-use super::*;+use crate::*;/// A red shape (`path`, over 10..30 pt) with the effects `fx` (id, params), in a document whose/// raster effects resolution is `ppi`.diff --git a/crates/render/src/tests_setup.rs b/crates/render/src/tests/setup.rssimilarity index 99%rename from crates/render/src/tests_setup.rsrename to crates/render/src/tests/setup.rsindex a03130c5f..e80e807e4 100644--- a/crates/render/src/tests_setup.rs+++ b/crates/render/src/tests/setup.rs@@ -2,7 +2,7 @@use vectorcraft_doc::{Document, ImageBlob, ImageObject, Node, NodeKind};-use super::*;+use crate::*;fn doc_with_red_image() -> Document {let mut d = Document::new(40.0, 40.0);diff --git a/crates/render/src/tests_strokegradient.rs b/crates/render/src/tests/strokegradient.rssimilarity index 99%rename from crates/render/src/tests_strokegradient.rsrename to crates/render/src/tests/strokegradient.rsindex 4742c5401..961f18590 100644--- a/crates/render/src/tests_strokegradient.rs+++ b/crates/render/src/tests/strokegradient.rs@@ -5,7 +5,7 @@ use vectorcraft_color::{Gradient, GradientPaint, Paint};use vectorcraft_doc::{Appearance, AppearanceItem, Node, StrokeGradientMode, StrokeLayer};use vectorcraft_geom::PathData;-use super::*;+use crate::*;const SIZE: u32 = 200;diff --git a/crates/render/src/tests_tileedge.rs b/crates/render/src/tests/tileedge.rssimilarity index 99%rename from crates/render/src/tests_tileedge.rsrename to crates/render/src/tests/tileedge.rsindex 06b27fe16..a20432ec2 100644--- a/crates/render/src/tests_tileedge.rs+++ b/crates/render/src/tests/tileedge.rs@@ -1,6 +1,6 @@//! Pattern editing mode: the tile edge in the Tile Edge Color, and Show Swatch Bounds.-use super::*;+use crate::*;use vectorcraft_color::{Color, Paint};use vectorcraft_doc::pattern::{PatternDef, PatternEdit, TileType};use vectorcraft_doc::{Appearance, Node};diff --git a/crates/render/src/tests_viewraster.rs b/crates/render/src/tests/viewraster.rssimilarity index 100%rename from crates/render/src/tests_viewraster.rsrename to crates/render/src/tests/viewraster.rs