From 87e4233383777e3f5950cda2019cfa2639ea1298 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmat@mail.ru>
Date: Thu, 26 Nov 2020 02:39:04 +0700
Subject: [PATCH] fix tests

---
 untests/vmath_tests.hpp         | 15 ++++-----------
 untests/vmath_vec_fun_tests.cpp |  2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/untests/vmath_tests.hpp b/untests/vmath_tests.hpp
index 5c50b21..c57ce5f 100644
--- a/untests/vmath_tests.hpp
+++ b/untests/vmath_tests.hpp
@@ -22,8 +22,7 @@ namespace vmath_tests
         explicit constexpr approx(T v) : value(v) {}
 
         friend constexpr bool operator==(const T& l, const approx& r) {
-            return (r.value < l + epsilon<T>)
-                && (l < r.value + epsilon<T>);
+            return equal_to(l, r.value, epsilon<T>);
         }
     };
 
@@ -35,8 +34,7 @@ namespace vmath_tests
         constexpr explicit approx2(const vec<T, 2>& v) : value(v) {}
 
         friend constexpr bool operator==(const vec<T, 2>& l, const approx2& r) {
-            return l[0] == approx(r.value[0])
-                && l[1] == approx(r.value[1]);
+            return all(equal_to(l, r.value, epsilon<T>));
         }
     };
 
@@ -48,9 +46,7 @@ namespace vmath_tests
         constexpr explicit approx3(const vec<T, 3>& v) : value(v) {}
 
         friend constexpr bool operator==(const vec<T, 3>& l, const approx3& r) {
-            return l[0] == approx(r.value[0])
-                && l[1] == approx(r.value[1])
-                && l[2] == approx(r.value[2]);
+            return all(equal_to(l, r.value, epsilon<T>));
         }
     };
 
@@ -62,10 +58,7 @@ namespace vmath_tests
         constexpr explicit approx4(const vec<T, 4>& v) : value(v) {}
 
         friend constexpr bool operator==(const vec<T, 4>& l, const approx4& r) {
-            return l[0] == approx(r.value[0])
-                && l[1] == approx(r.value[1])
-                && l[2] == approx(r.value[2])
-                && l[3] == approx(r.value[3]);
+            return all(equal_to(l, r.value, epsilon<T>));
         }
     };
 
diff --git a/untests/vmath_vec_fun_tests.cpp b/untests/vmath_vec_fun_tests.cpp
index 8b4cb5b..3991383 100644
--- a/untests/vmath_vec_fun_tests.cpp
+++ b/untests/vmath_vec_fun_tests.cpp
@@ -145,7 +145,7 @@ TEST_CASE("vmath/vec_fun") {
         REQUIRE_FALSE(isinf(float2(1.f)).x);
         REQUIRE(isfinite(float2(1.f)).x);
         REQUIRE(isnormal(float2(1.f)).x);
-        REQUIRE(issubnormal(float2(1.f)).x);
+        REQUIRE_FALSE(issubnormal(float2(1.f)).x);
 
         REQUIRE_FALSE(fma(float2(2.f), float2(3.f), float2(4.f)).x == Approx(12.f));