test/ruby: better assertions

* test/ruby: use better assertions instead of mere assert.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44173 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 36 insertions, 30 deletions

diff --git a/test/ruby/test_fixnum.rb b/test/ruby/test_fixnum.rb
index c016b2f4e0..c86cba3b7c 100644
--- a/test/ruby/test_fixnum.rb
+++ b/test/ruby/test_fixnum.rb
@@ -87,8 +87,14 @@ class TestFixnum < Test::Unit::TestCase
         next if b == 0
         q, r = a.divmod(b)
         assert_equal(a, b*q+r)
-        assert(r.abs < b.abs)
-        assert(0 < b ? (0 <= r && r < b) : (b < r && r <= 0))
+        assert_operator(r.abs, :<, b.abs)
+        if 0 < b
+          assert_operator(r, :>=, 0)
+          assert_operator(r, :<, b)
+        else
+          assert_operator(r, :>, b)
+          assert_operator(r, :<=, 0)
+        end
         assert_equal(q, a/b)
         assert_equal(q, a.div(b))
         assert_equal(r, a%b)
@@ -195,40 +201,40 @@ class TestFixnum < Test::Unit::TestCase
   end
 
   def test_cmp
-    assert(1 != nil)
+    assert_operator(1, :!=, nil)
 
     assert_equal(0, 1 <=> 1)
     assert_equal(-1, 1 <=> 4294967296)
     assert_equal(0, 1 <=> 1.0)
     assert_nil(1 <=> nil)
 
-    assert(1.send(:>, 0))
-    assert(!(1.send(:>, 1)))
-    assert(!(1.send(:>, 2)))
-    assert(!(1.send(:>, 4294967296)))
-    assert(1.send(:>, 0.0))
-    assert_raise(ArgumentError) { 1.send(:>, nil) }
-
-    assert(1.send(:>=, 0))
-    assert(1.send(:>=, 1))
-    assert(!(1.send(:>=, 2)))
-    assert(!(1.send(:>=, 4294967296)))
-    assert(1.send(:>=, 0.0))
-    assert_raise(ArgumentError) { 1.send(:>=, nil) }
-
-    assert(!(1.send(:<, 0)))
-    assert(!(1.send(:<, 1)))
-    assert(1.send(:<, 2))
-    assert(1.send(:<, 4294967296))
-    assert(!(1.send(:<, 0.0)))
-    assert_raise(ArgumentError) { 1.send(:<, nil) }
-
-    assert(!(1.send(:<=, 0)))
-    assert(1.send(:<=, 1))
-    assert(1.send(:<=, 2))
-    assert(1.send(:<=, 4294967296))
-    assert(!(1.send(:<=, 0.0)))
-    assert_raise(ArgumentError) { 1.send(:<=, nil) }
+    assert_operator(1, :>, 0)
+    assert_not_operator(1, :>, 1)
+    assert_not_operator(1, :>, 2)
+    assert_not_operator(1, :>, 4294967296)
+    assert_operator(1, :>, 0.0)
+    assert_raise(ArgumentError) { 1 > nil }
+
+    assert_operator(1, :>=, 0)
+    assert_operator(1, :>=, 1)
+    assert_not_operator(1, :>=, 2)
+    assert_not_operator(1, :>=, 4294967296)
+    assert_operator(1, :>=, 0.0)
+    assert_raise(ArgumentError) { 1 >= nil }
+
+    assert_not_operator(1, :<, 0)
+    assert_not_operator(1, :<, 1)
+    assert_operator(1, :<, 2)
+    assert_operator(1, :<, 4294967296)
+    assert_not_operator(1, :<, 0.0)
+    assert_raise(ArgumentError) { 1 < nil }
+
+    assert_not_operator(1, :<=, 0)
+    assert_operator(1, :<=, 1)
+    assert_operator(1, :<=, 2)
+    assert_operator(1, :<=, 4294967296)
+    assert_not_operator(1, :<=, 0.0)
+    assert_raise(ArgumentError) { 1 <= nil }
   end
 
   class DummyNumeric < Numeric