From f1fabce5da583ef6e8f6899293be930aa97d1a10 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Thu, 13 Oct 2022 17:08:09 +0200 Subject: [PATCH] Fix `SurfaceVertex` duplication in test code --- crates/fj-kernel/src/algorithms/sweep/edge.rs | 33 ++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/crates/fj-kernel/src/algorithms/sweep/edge.rs b/crates/fj-kernel/src/algorithms/sweep/edge.rs index a9490e883..ceac38a01 100644 --- a/crates/fj-kernel/src/algorithms/sweep/edge.rs +++ b/crates/fj-kernel/src/algorithms/sweep/edge.rs @@ -181,8 +181,9 @@ mod tests { use crate::{ algorithms::{reverse::Reverse, sweep::Sweep}, - objects::{Cycle, Face, HalfEdge, Objects}, + objects::{Cycle, Face, HalfEdge, Objects, SurfaceVertex, Vertex}, partial::HasPartial, + storage::Handle, }; #[test] @@ -205,16 +206,40 @@ mod tests { .build(&objects); let side_up = HalfEdge::partial() .with_surface(Some(surface.clone())) - .as_line_segment_from_points([[1., 0.], [1., 1.]]) + .with_back_vertex(Some(Vertex::partial().with_surface_form( + Some(bottom.front().surface_form().clone()), + ))) + .with_front_vertex(Some( + Vertex::partial().with_surface_form(Some( + Handle::::partial() + .with_position(Some([1., 1.])), + )), + )) + .as_line_segment() .build(&objects); let top = HalfEdge::partial() .with_surface(Some(surface.clone())) - .as_line_segment_from_points([[0., 1.], [1., 1.]]) + .with_back_vertex(Some( + Vertex::partial().with_surface_form(Some( + Handle::::partial() + .with_position(Some([0., 1.])), + )), + )) + .with_front_vertex(Some(Vertex::partial().with_surface_form( + Some(side_up.front().surface_form().clone()), + ))) + .as_line_segment() .build(&objects) .reverse(); let side_down = HalfEdge::partial() .with_surface(Some(surface.clone())) - .as_line_segment_from_points([[0., 0.], [0., 1.]]) + .with_back_vertex(Some(Vertex::partial().with_surface_form( + Some(bottom.back().surface_form().clone()), + ))) + .with_front_vertex(Some(Vertex::partial().with_surface_form( + Some(top.front().surface_form().clone()), + ))) + .as_line_segment() .build(&objects) .reverse();