From 0d2c46dd43de373faaee08c07855a5e715493dc9 Mon Sep 17 00:00:00 2001
From: Hanno Braun <hello@hannobraun.com>
Date: Fri, 17 May 2024 14:42:21 +0200
Subject: [PATCH] Refactor to simplify

---
 .../checks/curve_geometry_mismatch.rs           | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/crates/fj-core/src/validation/checks/curve_geometry_mismatch.rs b/crates/fj-core/src/validation/checks/curve_geometry_mismatch.rs
index 5a0d8f5be..6b23093fb 100644
--- a/crates/fj-core/src/validation/checks/curve_geometry_mismatch.rs
+++ b/crates/fj-core/src/validation/checks/curve_geometry_mismatch.rs
@@ -132,7 +132,6 @@ impl ValidationCheck<Shell> for CurveGeometryMismatch {
 #[cfg(test)]
 mod tests {
     use crate::{
-        assert_contains_err,
         operations::{
             build::BuildShell,
             geometry::UpdateHalfEdgeGeometry,
@@ -140,10 +139,7 @@ mod tests {
             update::{UpdateCycle, UpdateFace, UpdateRegion, UpdateShell},
         },
         topology::{HalfEdge, Shell},
-        validate::Validate,
-        validation::{
-            checks::CurveGeometryMismatch, ValidationCheck, ValidationError,
-        },
+        validation::{checks::CurveGeometryMismatch, ValidationCheck},
         Core,
     };
 
@@ -199,12 +195,11 @@ mod tests {
             },
             &mut core,
         );
-
-        assert_contains_err!(
-            core,
-            invalid,
-            ValidationError::CurveGeometryMismatch(..)
-        );
+        assert!(CurveGeometryMismatch::check_and_return_first_error(
+            &invalid,
+            &core.layers.geometry,
+        )
+        .is_err());
 
         Ok(())
     }