Skip to content

EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust

refactor(script): move loose test files to src/tests/

aiongg48253ff5e115
diff --git a/crates/script/src/lib.rs b/crates/script/src/lib.rs
index 5c1f8cdbb..11d837677 100644
--- a/crates/script/src/lib.rs
+++ b/crates/script/src/lib.rs
@@ -88,28 +88,7 @@ pub fn run_code(s: &mut Session, code: &str, name: &str) -> Outcome {
#[cfg(test)]
mod tests;
-#[cfg(test)]
-mod tests_callable;
-#[cfg(test)]
-mod tests_ease_presets;
-#[cfg(test)]
-mod tests_include;
-#[cfg(test)]
-mod tests_panels;
-#[cfg(test)]
-mod tests_tasks;
-#[cfg(test)]
-mod tests_ui;
-#[cfg(test)]
-mod tests_ui_more;
// #760: `$.evalFile` and `BridgeTalk`.
-#[cfg(test)]
-mod tests_evalfile;
// `/browser/…` is the web editor's file table, an absolute path on wasm; on Windows it has no
// drive, so the script runtime resolves it under the current drive, where the host holds nothing.
-#[cfg(test)]
-#[cfg(not(windows))]
-mod tests_services;
-#[cfg(test)]
-mod tests_ui_mouse;
diff --git a/crates/script/src/tests.rs b/crates/script/src/tests.rs
index 82f8ad289..6105cc5e1 100644
--- a/crates/script/src/tests.rs
+++ b/crates/script/src/tests.rs
@@ -10,6 +10,18 @@ use serde_json::{Value, json};
use crate::{Outcome, run_code};
+mod callable;
+mod ease_presets;
+mod include;
+mod panels;
+mod tasks;
+mod ui;
+mod ui_more;
+mod evalfile;
+#[cfg(not(windows))]
+mod services;
+mod ui_mouse;
+
fn session() -> Session {
let mut s = Session { expr: Some(Arc::new(effectcraft_expr::Expressions)), expr_check: Some(effectcraft_expr::check_syntax), ..Default::default() };
crate::install(&mut s);
diff --git a/crates/script/src/tests_callable.rs b/crates/script/src/tests/callable.rs
similarity index 100%
rename from crates/script/src/tests_callable.rs
rename to crates/script/src/tests/callable.rs
diff --git a/crates/script/src/tests_ease_presets.rs b/crates/script/src/tests/ease_presets.rs
similarity index 100%
rename from crates/script/src/tests_ease_presets.rs
rename to crates/script/src/tests/ease_presets.rs
diff --git a/crates/script/src/tests_evalfile.rs b/crates/script/src/tests/evalfile.rs
similarity index 100%
rename from crates/script/src/tests_evalfile.rs
rename to crates/script/src/tests/evalfile.rs
diff --git a/crates/script/src/tests_include.rs b/crates/script/src/tests/include.rs
similarity index 100%
rename from crates/script/src/tests_include.rs
rename to crates/script/src/tests/include.rs
diff --git a/crates/script/src/tests_panels.rs b/crates/script/src/tests/panels.rs
similarity index 100%
rename from crates/script/src/tests_panels.rs
rename to crates/script/src/tests/panels.rs
diff --git a/crates/script/src/tests_services.rs b/crates/script/src/tests/services.rs
similarity index 100%
rename from crates/script/src/tests_services.rs
rename to crates/script/src/tests/services.rs
diff --git a/crates/script/src/tests_tasks.rs b/crates/script/src/tests/tasks.rs
similarity index 100%
rename from crates/script/src/tests_tasks.rs
rename to crates/script/src/tests/tasks.rs
diff --git a/crates/script/src/tests_ui.rs b/crates/script/src/tests/ui.rs
similarity index 100%
rename from crates/script/src/tests_ui.rs
rename to crates/script/src/tests/ui.rs
diff --git a/crates/script/src/tests_ui_more.rs b/crates/script/src/tests/ui_more.rs
similarity index 100%
rename from crates/script/src/tests_ui_more.rs
rename to crates/script/src/tests/ui_more.rs
diff --git a/crates/script/src/tests_ui_mouse.rs b/crates/script/src/tests/ui_mouse.rs
similarity index 100%
rename from crates/script/src/tests_ui_mouse.rs
rename to crates/script/src/tests/ui_mouse.rs