1 files changed, 24 insertions, 37 deletions
diff --git a/test/t/math.rb b/test/t/math.rb
index a9c7e7fb7..40ae53438 100644
--- a/test/t/math.rb
+++ b/test/t/math.rb
@@ -1,25 +1,12 @@
 ##
 # Math Test
 
-##
-# Performs fuzzy check for equality on methods returning floats
-# on the basis of the Math::TOLERANCE constant.
-def check(a,b)
-  a = a.to_f
-  b = b.to_f
-  if a.finite? and b.finite?
-    (a-b).abs < Math::TOLERANCE
-  else
-    true
-  end
-end
-
 assert('Math.sin 0') do
-  check(Math.sin(0), 0)
+  check_float(Math.sin(0), 0)
 end
 
 assert('Math.sin PI/2') do
-  check(Math.sin(Math::PI / 2), 1)
+  check_float(Math.sin(Math::PI / 2), 1)
 end
 
 
@@ -32,61 +19,61 @@ assert('Fundamental trig identities') do
     s  = Math.sin(a)
     c  = Math.cos(a)
     t  = Math.tan(a)
-    result &= check(s, Math.cos(ca))
-    result &= check(t, 1 / Math.tan(ca))
-    result &= check(s ** 2 + c ** 2, 1)
-    result &= check(t ** 2 + 1, (1/c) ** 2)
-    result &= check((1/t) ** 2 + 1, (1/s) ** 2)
+    result &= check_float(s, Math.cos(ca))
+    result &= check_float(t, 1 / Math.tan(ca))
+    result &= check_float(s ** 2 + c ** 2, 1)
+    result &= check_float(t ** 2 + 1, (1/c) ** 2)
+    result &= check_float((1/t) ** 2 + 1, (1/s) ** 2)
   end
   result
 end  
 
 assert('Math.erf 0') do
-  check(Math.erf(0), 0)
+  check_float(Math.erf(0), 0)
 end
 
 assert('Math.exp 0') do
-  check(Math.exp(0), 1.0)
+  check_float(Math.exp(0), 1.0)
 end
 
 assert('Math.exp 1') do
-  check(Math.exp(1), 2.718281828459045)
+  check_float(Math.exp(1), 2.718281828459045)
 end
 
 assert('Math.exp 1.5') do
-  check(Math.exp(1.5), 4.4816890703380645)
+  check_float(Math.exp(1.5), 4.4816890703380645)
 end
 
 assert('Math.log 1') do
-  check(Math.log(1), 0)
+  check_float(Math.log(1), 0)
 end
 
 assert('Math.log E') do
-  check(Math.log(Math::E), 1.0)
+  check_float(Math.log(Math::E), 1.0)
 end
 
 assert('Math.log E**3') do
-  check(Math.log(Math::E**3), 3.0)
+  check_float(Math.log(Math::E**3), 3.0)
 end
 
 assert('Math.log2 1') do
-  check(Math.log2(1), 0.0)
+  check_float(Math.log2(1), 0.0)
 end
 
 assert('Math.log2 2') do
-  check(Math.log2(2), 1.0)
+  check_float(Math.log2(2), 1.0)
 end
 
 assert('Math.log10 1') do
-  check(Math.log10(1), 0.0)
+  check_float(Math.log10(1), 0.0)
 end
 
 assert('Math.log10 10') do
-  check(Math.log10(10), 1.0)
+  check_float(Math.log10(10), 1.0)
 end
 
 assert('Math.log10 10**100') do
-  check(Math.log10(10**100), 100.0)
+  check_float(Math.log10(10**100), 100.0)
 end
 
 assert('Math.cbrt') do
@@ -94,25 +81,25 @@ assert('Math.cbrt') do
   cub = [-8, -1, 0, 1, 8]
   result = true
   cub.each_with_index do |v,i|
-    result &= check(Math.cbrt(v), num[i])
+    result &= check_float(Math.cbrt(v), num[i])
   end
   result
 end
 
 assert('Math.hypot') do
-  check(Math.hypot(3, 4), 5.0)
+  check_float(Math.hypot(3, 4), 5.0)
 end
 
 assert('Math.frexp 1234') do
   n = 1234
   fraction, exponent = Math.frexp(n)
-  check(Math.ldexp(fraction, exponent), n)
+  check_float(Math.ldexp(fraction, exponent), n)
 end
 
 assert('Math.erf 1') do
-  check(Math.erf(1), 0.842700792949715)
+  check_float(Math.erf(1), 0.842700792949715)
 end
 
 assert('Math.erfc 1') do
-  check(Math.erfc(1), 0.157299207050285)
+  check_float(Math.erfc(1), 0.157299207050285)
 end