From f4a5d9064c884b83f2fc0a6630191e11ba53b686 Mon Sep 17 00:00:00 2001 From: Hanno Braun Date: Wed, 29 May 2024 14:40:27 +0200 Subject: [PATCH] Use more targeted test conditions --- .../validation/checks/multiple_references.rs | 46 +++++++++++-------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/crates/fj-core/src/validation/checks/multiple_references.rs b/crates/fj-core/src/validation/checks/multiple_references.rs index c8d69949b..8cef7ec61 100644 --- a/crates/fj-core/src/validation/checks/multiple_references.rs +++ b/crates/fj-core/src/validation/checks/multiple_references.rs @@ -305,12 +305,13 @@ mod tests { }, &mut core, ); - - assert_contains_err!( - core, - invalid, - ValidationError::MultipleReferencesToFace(_) - ); + assert!(MultipleReferencesToObject::< + Face, + Shell + >::check_and_return_first_error( + &invalid, + &core.layers.geometry, + ).is_err()); // Ignore remaining validation errors. let _ = core.layers.validation.take_errors(); @@ -352,12 +353,13 @@ mod tests { }, &mut core, ); - - assert_contains_err!( - core, - invalid, - ValidationError::MultipleReferencesToRegion(_) - ); + assert!(MultipleReferencesToObject::< + Region, + Face + >::check_and_return_first_error( + &invalid, + &core.layers.geometry, + ).is_err()); // Ignore remaining validation errors. let _ = core.layers.validation.take_errors(); @@ -410,6 +412,13 @@ mod tests { }, &mut core, ); + assert!(MultipleReferencesToObject::< + Cycle, + Region + >::check_and_return_first_error( + &invalid, + &core.layers.geometry, + ).is_err()); assert_contains_err!( core, @@ -476,12 +485,13 @@ mod tests { }, &mut core, ); - - assert_contains_err!( - core, - invalid, - ValidationError::MultipleReferencesToHalfEdge(_) - ); + assert!(MultipleReferencesToObject::< + HalfEdge, + Cycle + >::check_and_return_first_error( + &invalid, + &core.layers.geometry, + ).is_err()); // Ignore remaining validation errors. let _ = core.layers.validation.take_errors();