Skip to content

Commit 006209c

Browse files
Firestar99Keavon
Firestar99
authored and
Keavon
committed
Put all #[test] in a mod tests (#2728)
workspace: put all `#[test]` in a `mod tests`
1 parent 579bedd commit 006209c

File tree

12 files changed

+738
-686
lines changed

12 files changed

+738
-686
lines changed

‎editor/src/messages/portfolio/document/graph_operation/transform_utils.rs‎

Lines changed: 42 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -91,44 +91,48 @@ pub fn get_current_normalized_pivot(inputs: &[NodeInput]) -> DVec2 {
9191
if let Some(&TaggedValue::DVec2(pivot)) = inputs[5].as_value() { pivot } else { DVec2::splat(0.5) }
9292
}
9393

94-
/// ![](https://files.keavon.com/-/OptimisticSpotlessTinamou/capture.png)
95-
///
96-
/// Source:
97-
/// ```tex
98-
/// \begin{bmatrix}
99-
/// S_{x}\cos(\theta)-S_{y}\sin(\theta)H_{y} & S_{x}\cos(\theta)H_{x}-S_{y}\sin(\theta) & T_{x}\\
100-
/// S_{x}\sin(\theta)+S_{y}\cos(\theta)H_{y} & S_{x}\sin(\theta)H_{x}+S_{y}\cos(\theta) & T_{y}\\
101-
/// 0 & 0 & 1
102-
/// \end{bmatrix}
103-
/// ```
104-
#[test]
105-
fn derive_transform() {
106-
for shear_x in -10..=10 {
107-
let shear_x = (shear_x as f64) / 2.;
108-
for angle in (0..=360).step_by(15) {
109-
let angle = (angle as f64).to_radians();
110-
for scale_x in 1..10 {
111-
let scale_x = (scale_x as f64) / 5.;
112-
for scale_y in 1..10 {
113-
let scale_y = (scale_y as f64) / 5.;
114-
115-
let shear = DVec2::new(shear_x, 0.);
116-
let scale = DVec2::new(scale_x, scale_y);
117-
let translate = DVec2::new(5666., 644.);
118-
119-
let original_transform = DAffine2::from_cols(
120-
DVec2::new(scale.x * angle.cos() - scale.y * angle.sin() * shear.y, scale.x * angle.sin() + scale.y * angle.cos() * shear.y),
121-
DVec2::new(scale.x * angle.cos() * shear.x - scale.y * angle.sin(), scale.x * angle.sin() * shear.x + scale.y * angle.cos()),
122-
translate,
123-
);
124-
125-
let (new_scale, new_angle, new_translation, new_shear) = compute_scale_angle_translation_shear(original_transform);
126-
let new_transform = DAffine2::from_scale_angle_translation(new_scale, new_angle, new_translation) * DAffine2::from_cols_array(&[1., new_shear.y, new_shear.x, 1., 0., 0.]);
127-
128-
assert!(
129-
new_transform.abs_diff_eq(original_transform, 1e-10),
130-
"original_transform {original_transform} new_transform {new_transform} / scale {scale} new_scale {new_scale} / angle {angle} new_angle {new_angle} / shear {shear} / new_shear {new_shear}",
131-
);
94+
#[cfg(test)]
95+
mod tests {
96+
use super::*;
97+
/// ![](https://files.keavon.com/-/OptimisticSpotlessTinamou/capture.png)
98+
///
99+
/// Source:
100+
/// ```tex
101+
/// \begin{bmatrix}
102+
/// S_{x}\cos(\theta)-S_{y}\sin(\theta)H_{y} & S_{x}\cos(\theta)H_{x}-S_{y}\sin(\theta) & T_{x}\\
103+
/// S_{x}\sin(\theta)+S_{y}\cos(\theta)H_{y} & S_{x}\sin(\theta)H_{x}+S_{y}\cos(\theta) & T_{y}\\
104+
/// 0 & 0 & 1
105+
/// \end{bmatrix}
106+
/// ```
107+
#[test]
108+
fn derive_transform() {
109+
for shear_x in -10..=10 {
110+
let shear_x = (shear_x as f64) / 2.;
111+
for angle in (0..=360).step_by(15) {
112+
let angle = (angle as f64).to_radians();
113+
for scale_x in 1..10 {
114+
let scale_x = (scale_x as f64) / 5.;
115+
for scale_y in 1..10 {
116+
let scale_y = (scale_y as f64) / 5.;
117+
118+
let shear = DVec2::new(shear_x, 0.);
119+
let scale = DVec2::new(scale_x, scale_y);
120+
let translate = DVec2::new(5666., 644.);
121+
122+
let original_transform = DAffine2::from_cols(
123+
DVec2::new(scale.x * angle.cos() - scale.y * angle.sin() * shear.y, scale.x * angle.sin() + scale.y * angle.cos() * shear.y),
124+
DVec2::new(scale.x * angle.cos() * shear.x - scale.y * angle.sin(), scale.x * angle.sin() * shear.x + scale.y * angle.cos()),
125+
translate,
126+
);
127+
128+
let (new_scale, new_angle, new_translation, new_shear) = compute_scale_angle_translation_shear(original_transform);
129+
let new_transform = DAffine2::from_scale_angle_translation(new_scale, new_angle, new_translation) * DAffine2::from_cols_array(&[1., new_shear.y, new_shear.x, 1., 0., 0.]);
130+
131+
assert!(
132+
new_transform.abs_diff_eq(original_transform, 1e-10),
133+
"original_transform {original_transform} new_transform {new_transform} / scale {scale} new_scale {new_scale} / angle {angle} new_angle {new_angle} / shear {shear} / new_shear {new_shear}",
134+
);
135+
}
132136
}
133137
}
134138
}

‎editor/src/messages/portfolio/document/utility_types/document_metadata.rs‎

Lines changed: 49 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -522,49 +522,53 @@ pub struct NodeRelations {
522522
// Helper functions
523523
// ================
524524

525-
#[test]
526-
fn test_tree() {
527-
let mut metadata = DocumentMetadata::default();
528-
let root = LayerNodeIdentifier::ROOT_PARENT;
529-
let metadata = &mut metadata;
530-
root.push_child(metadata, LayerNodeIdentifier::new_unchecked(NodeId(3)));
531-
assert_eq!(root.children(metadata).collect::<Vec<_>>(), vec![LayerNodeIdentifier::new_unchecked(NodeId(3))]);
532-
root.push_child(metadata, LayerNodeIdentifier::new_unchecked(NodeId(6)));
533-
assert_eq!(root.children(metadata).map(LayerNodeIdentifier::to_node).collect::<Vec<_>>(), vec![NodeId(3), NodeId(6)]);
534-
assert_eq!(root.descendants(metadata).map(LayerNodeIdentifier::to_node).collect::<Vec<_>>(), vec![NodeId(3), NodeId(6)]);
535-
LayerNodeIdentifier::new_unchecked(NodeId(3)).add_after(metadata, LayerNodeIdentifier::new_unchecked(NodeId(4)));
536-
LayerNodeIdentifier::new_unchecked(NodeId(3)).add_before(metadata, LayerNodeIdentifier::new_unchecked(NodeId(2)));
537-
LayerNodeIdentifier::new_unchecked(NodeId(6)).add_before(metadata, LayerNodeIdentifier::new_unchecked(NodeId(5)));
538-
LayerNodeIdentifier::new_unchecked(NodeId(6)).add_after(metadata, LayerNodeIdentifier::new_unchecked(NodeId(9)));
539-
LayerNodeIdentifier::new_unchecked(NodeId(6)).push_child(metadata, LayerNodeIdentifier::new_unchecked(NodeId(8)));
540-
LayerNodeIdentifier::new_unchecked(NodeId(6)).push_front_child(metadata, LayerNodeIdentifier::new_unchecked(NodeId(7)));
541-
root.push_front_child(metadata, LayerNodeIdentifier::new_unchecked(NodeId(1)));
542-
assert_eq!(
543-
root.children(metadata).map(LayerNodeIdentifier::to_node).collect::<Vec<_>>(),
544-
vec![NodeId(1), NodeId(2), NodeId(3), NodeId(4), NodeId(5), NodeId(6), NodeId(9)]
545-
);
546-
assert_eq!(
547-
root.descendants(metadata).map(LayerNodeIdentifier::to_node).collect::<Vec<_>>(),
548-
vec![NodeId(1), NodeId(2), NodeId(3), NodeId(4), NodeId(5), NodeId(6), NodeId(7), NodeId(8), NodeId(9)]
549-
);
550-
assert_eq!(
551-
root.descendants(metadata).map(LayerNodeIdentifier::to_node).rev().collect::<Vec<_>>(),
552-
vec![NodeId(9), NodeId(8), NodeId(7), NodeId(6), NodeId(5), NodeId(4), NodeId(3), NodeId(2), NodeId(1)]
553-
);
554-
assert!(root.children(metadata).all(|child| child.parent(metadata) == Some(root)));
555-
LayerNodeIdentifier::new_unchecked(NodeId(6)).delete(metadata);
556-
LayerNodeIdentifier::new_unchecked(NodeId(1)).delete(metadata);
557-
LayerNodeIdentifier::new_unchecked(NodeId(9)).push_child(metadata, LayerNodeIdentifier::new_unchecked(NodeId(10)));
558-
assert_eq!(
559-
root.children(metadata).map(LayerNodeIdentifier::to_node).collect::<Vec<_>>(),
560-
vec![NodeId(2), NodeId(3), NodeId(4), NodeId(5), NodeId(9)]
561-
);
562-
assert_eq!(
563-
root.descendants(metadata).map(LayerNodeIdentifier::to_node).collect::<Vec<_>>(),
564-
vec![NodeId(2), NodeId(3), NodeId(4), NodeId(5), NodeId(9), NodeId(10)]
565-
);
566-
assert_eq!(
567-
root.descendants(metadata).map(LayerNodeIdentifier::to_node).rev().collect::<Vec<_>>(),
568-
vec![NodeId(10), NodeId(9), NodeId(5), NodeId(4), NodeId(3), NodeId(2)]
569-
);
525+
#[cfg(test)]
526+
mod tests {
527+
use super::*;
528+
#[test]
529+
fn test_tree() {
530+
let mut metadata = DocumentMetadata::default();
531+
let root = LayerNodeIdentifier::ROOT_PARENT;
532+
let metadata = &mut metadata;
533+
root.push_child(metadata, LayerNodeIdentifier::new_unchecked(NodeId(3)));
534+
assert_eq!(root.children(metadata).collect::<Vec<_>>(), vec![LayerNodeIdentifier::new_unchecked(NodeId(3))]);
535+
root.push_child(metadata, LayerNodeIdentifier::new_unchecked(NodeId(6)));
536+
assert_eq!(root.children(metadata).map(LayerNodeIdentifier::to_node).collect::<Vec<_>>(), vec![NodeId(3), NodeId(6)]);
537+
assert_eq!(root.descendants(metadata).map(LayerNodeIdentifier::to_node).collect::<Vec<_>>(), vec![NodeId(3), NodeId(6)]);
538+
LayerNodeIdentifier::new_unchecked(NodeId(3)).add_after(metadata, LayerNodeIdentifier::new_unchecked(NodeId(4)));
539+
LayerNodeIdentifier::new_unchecked(NodeId(3)).add_before(metadata, LayerNodeIdentifier::new_unchecked(NodeId(2)));
540+
LayerNodeIdentifier::new_unchecked(NodeId(6)).add_before(metadata, LayerNodeIdentifier::new_unchecked(NodeId(5)));
541+
LayerNodeIdentifier::new_unchecked(NodeId(6)).add_after(metadata, LayerNodeIdentifier::new_unchecked(NodeId(9)));
542+
LayerNodeIdentifier::new_unchecked(NodeId(6)).push_child(metadata, LayerNodeIdentifier::new_unchecked(NodeId(8)));
543+
LayerNodeIdentifier::new_unchecked(NodeId(6)).push_front_child(metadata, LayerNodeIdentifier::new_unchecked(NodeId(7)));
544+
root.push_front_child(metadata, LayerNodeIdentifier::new_unchecked(NodeId(1)));
545+
assert_eq!(
546+
root.children(metadata).map(LayerNodeIdentifier::to_node).collect::<Vec<_>>(),
547+
vec![NodeId(1), NodeId(2), NodeId(3), NodeId(4), NodeId(5), NodeId(6), NodeId(9)]
548+
);
549+
assert_eq!(
550+
root.descendants(metadata).map(LayerNodeIdentifier::to_node).collect::<Vec<_>>(),
551+
vec![NodeId(1), NodeId(2), NodeId(3), NodeId(4), NodeId(5), NodeId(6), NodeId(7), NodeId(8), NodeId(9)]
552+
);
553+
assert_eq!(
554+
root.descendants(metadata).map(LayerNodeIdentifier::to_node).rev().collect::<Vec<_>>(),
555+
vec![NodeId(9), NodeId(8), NodeId(7), NodeId(6), NodeId(5), NodeId(4), NodeId(3), NodeId(2), NodeId(1)]
556+
);
557+
assert!(root.children(metadata).all(|child| child.parent(metadata) == Some(root)));
558+
LayerNodeIdentifier::new_unchecked(NodeId(6)).delete(metadata);
559+
LayerNodeIdentifier::new_unchecked(NodeId(1)).delete(metadata);
560+
LayerNodeIdentifier::new_unchecked(NodeId(9)).push_child(metadata, LayerNodeIdentifier::new_unchecked(NodeId(10)));
561+
assert_eq!(
562+
root.children(metadata).map(LayerNodeIdentifier::to_node).collect::<Vec<_>>(),
563+
vec![NodeId(2), NodeId(3), NodeId(4), NodeId(5), NodeId(9)]
564+
);
565+
assert_eq!(
566+
root.descendants(metadata).map(LayerNodeIdentifier::to_node).collect::<Vec<_>>(),
567+
vec![NodeId(2), NodeId(3), NodeId(4), NodeId(5), NodeId(9), NodeId(10)]
568+
);
569+
assert_eq!(
570+
root.descendants(metadata).map(LayerNodeIdentifier::to_node).rev().collect::<Vec<_>>(),
571+
vec![NodeId(10), NodeId(9), NodeId(5), NodeId(4), NodeId(3), NodeId(2)]
572+
);
573+
}
570574
}

0 commit comments

Comments
 (0)