Skip to content

VectorCraft: An open-source, vector art tool written by scratch in pure Rust

refactor(three-d): move tests_*.rs to tests/<topic>.rs

aiongg5a84d5a8e492
diff --git a/crates/three-d/src/lib.rs b/crates/three-d/src/lib.rs
index 8f6728b97..539c6ef80 100644
--- a/crates/three-d/src/lib.rs
+++ b/crates/three-d/src/lib.rs
@@ -15,10 +15,6 @@ pub use shading::{LightGradient, RgbGradient, ShadeGradient};
mod lights;
pub use lights::{Light, Lights, MAX_LIGHTS};
mod caps;
-#[cfg(test)]
-mod tests_lighting;
-#[cfg(test)]
-mod tests_multiple_lights;
use vectorcraft_geom::{BezPath, ParamCurve, PathData, Point, Rect, Vec2, kurbo::ParamCurveDeriv};
@@ -595,10 +591,6 @@ pub fn revolve(path: &PathData, bounds: Rect, options: Revolve) -> Result<Vec<Fa
Ok(faces)
}
-#[cfg(test)]
-mod tests_caps;
-#[cfg(test)]
-mod tests_smooth;
#[cfg(test)]
mod tests;
diff --git a/crates/three-d/src/tests.rs b/crates/three-d/src/tests.rs
index 6b38a5807..2be0d4555 100644
--- a/crates/three-d/src/tests.rs
+++ b/crates/three-d/src/tests.rs
@@ -1,4 +1,10 @@
use super::*;
+
+mod lighting;
+mod multiple_lights;
+mod caps;
+mod smooth;
+
#[test]
fn light_orbits_and_handle_projection_match_the_shading_direction_on_both_sides() {
for rotation in [-170.0f64, -45.0, 0.0, 83.0, 167.0] {
diff --git a/crates/three-d/src/tests_caps.rs b/crates/three-d/src/tests/caps.rs
similarity index 99%
rename from crates/three-d/src/tests_caps.rs
rename to crates/three-d/src/tests/caps.rs
index c8398ca0f..32fc5ac0b 100644
--- a/crates/three-d/src/tests_caps.rs
+++ b/crates/three-d/src/tests/caps.rs
@@ -1,4 +1,4 @@
-use super::*;
+use crate::*;
fn cylinder() -> (PathData, Rect) {
let mut path = BezPath::new();
diff --git a/crates/three-d/src/tests_lighting.rs b/crates/three-d/src/tests/lighting.rs
similarity index 99%
rename from crates/three-d/src/tests_lighting.rs
rename to crates/three-d/src/tests/lighting.rs
index 2c9608496..9b1ab94c4 100644
--- a/crates/three-d/src/tests_lighting.rs
+++ b/crates/three-d/src/tests/lighting.rs
@@ -1,4 +1,4 @@
-use super::*;
+use crate::*;
#[test]
fn color_combines_with_neutral_ambient_before_channel_clamping() {
diff --git a/crates/three-d/src/tests_multiple_lights.rs b/crates/three-d/src/tests/multiple_lights.rs
similarity index 99%
rename from crates/three-d/src/tests_multiple_lights.rs
rename to crates/three-d/src/tests/multiple_lights.rs
index fe2f434d3..79d28bc24 100644
--- a/crates/three-d/src/tests_multiple_lights.rs
+++ b/crates/three-d/src/tests/multiple_lights.rs
@@ -1,4 +1,4 @@
-use super::*;
+use crate::*;
#[test]
fn directional_lights_add_before_saturation_and_ambient_is_added_once() {
diff --git a/crates/three-d/src/tests_smooth.rs b/crates/three-d/src/tests/smooth.rs
similarity index 99%
rename from crates/three-d/src/tests_smooth.rs
rename to crates/three-d/src/tests/smooth.rs
index fd92bbada..c65172326 100644
--- a/crates/three-d/src/tests_smooth.rs
+++ b/crates/three-d/src/tests/smooth.rs
@@ -1,4 +1,4 @@
-use super::*;
+use crate::*;
fn path(d: &str) -> PathData {
PathData::from_bezpath(&BezPath::from_svg(d).unwrap())