From 528a05304d03f059e6a8dead8ce53f5213bb00e9 Mon Sep 17 00:00:00 2001
From: gnxlxnxx <gnxlxnxx@web.de>
Date: Mon, 15 Jun 2020 09:17:38 +0200
Subject: [PATCH] Update tests

---
 tests/unit_test.rs | 52 +++++++++++-----------------------------------
 1 file changed, 12 insertions(+), 40 deletions(-)

diff --git a/tests/unit_test.rs b/tests/unit_test.rs
index 8fa74fd..bb7632f 100644
--- a/tests/unit_test.rs
+++ b/tests/unit_test.rs
@@ -1,34 +1,6 @@
 #[cfg(test)]
 mod tests {
     use dubins_path::*;
-    use euclid::approxeq::ApproxEq;
-
-    fn circle_in_error_margin(
-        result: CircleVector,
-        expected_result: CircleVector,
-    ) -> Result<(), ()> {
-        if !ApproxEq::approx_eq(&result.center, &expected_result.center)
-            || !ApproxEq::approx_eq(&result.radius, &expected_result.radius)
-            || !(ApproxEq::approx_eq(&result.angle, &expected_result.angle)
-                || ApproxEq::approx_eq(&result.angle.signed(), &expected_result.angle.signed()))
-        {
-            Err(())
-        } else {
-            Ok(())
-        }
-    }
-
-    fn vector_in_error_margin(result: Vector, expected_result: Vector) -> Result<(), ()> {
-        if !ApproxEq::approx_eq(&result.origin, &expected_result.origin)
-            || !ApproxEq::approx_eq(&result.magnitude, &expected_result.magnitude)
-            || !(ApproxEq::approx_eq(&result.angle, &expected_result.angle)
-                || ApproxEq::approx_eq(&result.angle.signed(), &expected_result.angle.signed()))
-        {
-            Err(())
-        } else {
-            Ok(())
-        }
-    }
 
     #[test]
     #[should_panic]
@@ -83,9 +55,9 @@ mod tests {
 
             let result_rsr = RouteCSC::rsr(test_point).unwrap();
 
-            circle_in_error_margin(result_rsr.start, expected_result_rsr.start).unwrap();
-            vector_in_error_margin(result_rsr.tangent, expected_result_rsr.tangent).unwrap();
-            circle_in_error_margin(result_rsr.end, expected_result_rsr.end).unwrap();
+            assert!(result_rsr.start.approx_eq(expected_result_rsr.start));
+            assert!(result_rsr.tangent.approx_eq(expected_result_rsr.tangent));
+            assert!(result_rsr.end.approx_eq(expected_result_rsr.end));
         }
     }
 
@@ -118,9 +90,9 @@ mod tests {
 
             let result_rsl = RouteCSC::rsl(test_point).unwrap();
 
-            circle_in_error_margin(result_rsl.start, expected_result_rsl.start).unwrap();
-            vector_in_error_margin(result_rsl.tangent, expected_result_rsl.tangent).unwrap();
-            circle_in_error_margin(result_rsl.end, expected_result_rsl.end).unwrap();
+            assert!(result_rsl.start.approx_eq(expected_result_rsl.start));
+            assert!(result_rsl.tangent.approx_eq(expected_result_rsl.tangent));
+            assert!(result_rsl.end.approx_eq(expected_result_rsl.end));
         }
     }
 
@@ -153,9 +125,9 @@ mod tests {
 
             let result_lsl = RouteCSC::lsl(test_point).unwrap();
 
-            circle_in_error_margin(result_lsl.start, expected_result_lsl.start).unwrap();
-            vector_in_error_margin(result_lsl.tangent, expected_result_lsl.tangent).unwrap();
-            circle_in_error_margin(result_lsl.end, expected_result_lsl.end).unwrap();
+            assert!(result_lsl.start.approx_eq(expected_result_lsl.start));
+            assert!(result_lsl.tangent.approx_eq(expected_result_lsl.tangent));
+            assert!(result_lsl.end.approx_eq(expected_result_lsl.end));
         }
     }
 
@@ -188,9 +160,9 @@ mod tests {
 
             let result_lsr = RouteCSC::lsr(test_point).unwrap();
 
-            circle_in_error_margin(result_lsr.start, expected_result_lsr.start).unwrap();
-            vector_in_error_margin(result_lsr.tangent, expected_result_lsr.tangent).unwrap();
-            circle_in_error_margin(result_lsr.end, expected_result_lsr.end).unwrap();
+            assert!(result_lsr.start.approx_eq(expected_result_lsr.start));
+            assert!(result_lsr.tangent.approx_eq(expected_result_lsr.tangent));
+            assert!(result_lsr.end.approx_eq(expected_result_lsr.end));
         }
     }
 }