- Fixed assert_in_epsilon when both args are negative. (tamc)

[git-p4: depot-paths = "//src/minitest/dev/": change = 7105]

lib/minitest/unit.rb

@@ -233,7 +233,7 @@ def assert_in_delta exp, act, delta = 0.001, msg = nil
     # error less than +epsilon+.
 
     def assert_in_epsilon a, b, epsilon = 0.001, msg = nil
-      assert_in_delta a, b, [a, b].min * epsilon, msg
+      assert_in_delta a, b, [a.abs, b.abs].min * epsilon, msg
     end
 
     ##

test/test_minitest_unit.rb

@@ -661,6 +661,8 @@ def util_expand_bt bt
 end
 
 class TestMiniTestUnitTestCase < MiniTest::Unit::TestCase
+  RUBY18 = ! defined? Encoding
+
   def setup
     super
 
@@ -847,7 +849,7 @@ def test_assert_in_delta_triggered
   end
 
   def test_assert_in_epsilon
-    @assertion_count = 8
+    @assertion_count = 10
 
     @tc.assert_in_epsilon 10000, 9991
     @tc.assert_in_epsilon 9991, 10000
@@ -858,6 +860,9 @@ def test_assert_in_epsilon
     @tc.assert_in_epsilon 9999.1, 10000, 0.0001
     @tc.assert_in_epsilon 1.0, 1.0001, 0.0001
     @tc.assert_in_epsilon 1.0001, 1.0, 0.0001
+
+    @tc.assert_in_epsilon(-1, -1)
+    @tc.assert_in_epsilon(-10000, -9991)
   end
 
   def test_assert_in_epsilon_triggered
@@ -866,6 +871,13 @@ def test_assert_in_epsilon_triggered
     end
   end
 
+  def test_assert_in_epsilon_triggered_negative_case
+    x = RUBY18 ? "0.1" : "0.10000000000000009"
+    util_assert_triggered "Expected |-1.1 - -1| (#{x}) to be < 0.1." do
+      @tc.assert_in_epsilon(-1.1, -1, 0.1)
+    end
+  end
+
   def test_assert_includes
     @assertion_count = 2