Revert "Merge pull request #4200 from storytold/fix/sonar-s2208-engine-tests"

This reverts commit d7a2591dc0, reversing
changes made to e63c26ff15.

crates/engine/src/cmd/globaledit.rs

@@ -51,7 +51,7 @@ use vectorcraft_doc::{Appearance, AppearanceItem, Document, FillLayer, Node, Nod
 use vectorcraft_geom::{Affine, BezPath, PathData, Point, Rect, Shape};
 
 use super::wand::{fill_of, stroke_of};
-use super::{CommandSpec, Result, Session, bad, bool_or, has_doc};
+use super::*;
 
 const C: &str = "select.globalEdit";
 const OPTIONS: &str = "select.globalEditOptions";

crates/engine/src/cmd/symbollib.rs

@@ -20,7 +20,7 @@ use super::clipboard::Clipboard;
 use super::clipboard::resources::SwatchChoices;
 use super::swatch::str_list;
 use super::swatchlib::{FileData, LibraryFile, LibraryInfo, stem};
-use super::{CommandSpec, Result, Session, always, bad, bool_or, has_doc, number_or, str_param};
+use super::*;
 
 /// The extension of saved symbol libraries: native documents.
 pub const SYMBOLS_EXT: &str = vectorcraft_format::EXTENSION;

crates/engine/src/tests_colourfonts.rs

@@ -5,7 +5,7 @@ use serde_json::{Value, json};
 use vectorcraft_doc::NodeKind;
 use vectorcraft_text::test_fonts::{SVG_CHAR, source_sans_gid, svg_font};
 
-use super::{NodeId, Session};
+use super::*;
 
 fn session() -> Session {
     let mut s = Session::new();

crates/engine/src/tests_compoundpaint.rs

@@ -4,7 +4,7 @@
 use serde_json::{Value, json};
 use vectorcraft_color::Paint;
 
-use super::{NodeId, Session};
+use super::*;
 
 fn run(s: &mut Session, id: &str, p: Value) -> Value {
     s.execute(id, &p).unwrap()

crates/engine/src/tests_constrain_new.rs

@@ -8,7 +8,7 @@ use vectorcraft_doc::{LiveShape, NodeKind, TextKind};
 use vectorcraft_geom::{PathData, Point, Rect};
 use vectorcraft_tools::{Mods, PointerEvent, PointerKind};
 
-use super::{NodeId, Session, ViewInfo, constrain_click};
+use super::*;
 
 use PointerKind::{Down, Drag, Up};
 

crates/engine/src/tests_constrain_tools.rs

@@ -7,7 +7,7 @@ use vectorcraft_doc::{LiveShape, NodeKind};
 use vectorcraft_geom::{Point, Vec2};
 use vectorcraft_tools::{Mods, PointerEvent, PointerKind, ToolKey};
 
-use super::{NodeId, Session, ViewInfo};
+use super::*;
 
 fn new_doc() -> Session {
     let mut s = Session::new();

crates/engine/src/tests_globaledit.rs

@@ -6,7 +6,7 @@ use serde_json::{Value, json};
 use vectorcraft_doc::{Node, NodeKind};
 use vectorcraft_geom::{Affine, PathData, Rect};
 
-use super::{EngineError, NodeId, Session};
+use super::*;
 
 fn session() -> Session {
     let mut s = Session::new();

crates/engine/src/tests_simplify_part.rs

@@ -10,7 +10,7 @@ use vectorcraft_doc::NodeKind;
 use vectorcraft_geom::kurbo::ParamCurveNearest;
 use vectorcraft_geom::{ParamCurve, PathData, SubPath};
 
-use super::{NodeId, Session};
+use super::*;
 
 fn session() -> Session {
     let mut s = Session::new();

crates/engine/src/tests_symbollib.rs

@@ -6,7 +6,7 @@
 use serde_json::{Value, json};
 use vectorcraft_doc::{NodeId, NodeKind, SymbolRegistration};
 
-use super::{Session, cmd};
+use super::*;
 
 fn session() -> Session {
     let mut s = Session::new();

crates/engine/src/tests_transformfx.rs

@@ -5,7 +5,7 @@
 use serde_json::{Value, json};
 use vectorcraft_doc::Node;
 
-use super::{NodeId, Session};
+use super::*;
 
 fn session() -> Session {
     let mut s = Session::new();

crates/engine/src/tests_trap.rs

@@ -5,7 +5,7 @@ use vectorcraft_color::{Color, Paint};
 use vectorcraft_doc::{Node, NodeKind};
 use vectorcraft_geom::Rect;
 
-use super::{NodeId, Session};
+use super::*;
 
 const YELLOW: Color = Color::Cmyk { c: 0.0, m: 0.0, y: 1.0, k: 0.0 };
 const BLUE: Color = Color::Cmyk { c: 1.0, m: 0.6, y: 0.0, k: 0.0 };