1 files changed, 24 insertions, 24 deletions

diff --git a/test/ruby/test_eval.rb b/test/ruby/test_eval.rb
index 8de359b8dd..35cbbfd7d6 100644
--- a/test/ruby/test_eval.rb
+++ b/test/ruby/test_eval.rb
@@ -13,7 +13,7 @@ class TestEval < Test::Unit::TestCase
   end
 
   def test_eval
-    assert(eval("") == nil)
+    assert_equal(eval(""), nil)
     $bad=false
     eval 'while false; $bad = true; print "foo\n" end'
     assert(!$bad)
@@ -32,16 +32,16 @@ class TestEval < Test::Unit::TestCase
       assert(false)
     end
     
-    assert(eval("$foo") == 'assert(true)')
-    assert(eval("true") == true)
+    assert_equal(eval("$foo"), 'assert(true)')
+    assert_equal(eval("true"), true)
     i = 5
     assert(eval("i == 5"))
-    assert(eval("i") == 5)
+    assert_equal(eval("i"), 5)
     assert(eval("defined? i"))
     
     $x = test_ev
-    assert(eval("local1", $x) == "local1") # normal local var
-    assert(eval("local2", $x) == "local2") # nested local var
+    assert_equal(eval("local1", $x), "local1") # normal local var
+    assert_equal(eval("local2", $x), "local2") # nested local var
     $bad = true
     begin
       p eval("local1")
@@ -58,8 +58,8 @@ class TestEval < Test::Unit::TestCase
 	$x = binding
       end
     )
-    assert(eval("EVTEST1", $x) == 25)	# constant in module
-    assert(eval("evtest2", $x) == 125)	# local var in module
+    assert_equal(eval("EVTEST1", $x), 25)	# constant in module
+    assert_equal(eval("evtest2", $x), 125)	# local var in module
     $bad = true
     begin
       eval("EVTEST1")
@@ -70,25 +70,25 @@ class TestEval < Test::Unit::TestCase
     
     x = proc{}
     eval "i4 = 1", x
-    assert(eval("i4", x) == 1)
+    assert_equal(eval("i4", x), 1)
     x = proc{proc{}}.call
     eval "i4 = 22", x
-    assert(eval("i4", x) == 22)
+    assert_equal(eval("i4", x), 22)
     $x = []
     x = proc{proc{}}.call
     eval "(0..9).each{|i5| $x[i5] = proc{i5*2}}", x
-    assert($x[4].call == 8)
+    assert_equal($x[4].call, 8)
     
     x = binding
     eval "i = 1", x
-    assert(eval("i", x) == 1)
+    assert_equal(eval("i", x), 1)
     x = proc{binding}.call
     eval "i = 22", x
-    assert(eval("i", x) == 22)
+    assert_equal(eval("i", x), 22)
     $x = []
     x = proc{binding}.call
     eval "(0..9).each{|i5| $x[i5] = proc{i5*2}}", x
-    assert($x[4].call == 8)
+    assert_equal($x[4].call, 8)
     x = proc{binding}.call
     eval "for i6 in 1..1; j6=i6; end", x
     assert(eval("defined? i6", x))
@@ -100,25 +100,25 @@ class TestEval < Test::Unit::TestCase
       foo22 = 5
       proc{foo11=22}.call
       proc{foo22=55}.call
-      assert(eval("foo11", p) == eval("foo11"))
-      assert(eval("foo11") == 1)
-      assert(eval("foo22", p) == eval("foo22"))
-      assert(eval("foo22") == 55)
+      assert_equal(eval("foo11", p), eval("foo11"))
+      assert_equal(eval("foo11"), 1)
+      assert_equal(eval("foo22", p), eval("foo22"))
+      assert_equal(eval("foo22"), 55)
     }.call
     
     p1 = proc{i7 = 0; proc{i7}}.call
-    assert(p1.call == 0)
+    assert_equal(p1.call, 0)
     eval "i7=5", p1
-    assert(p1.call == 5)
+    assert_equal(p1.call, 5)
     assert(!defined?(i7))
     
     p1 = proc{i7 = 0; proc{i7}}.call
     i7 = nil
-    assert(p1.call == 0)
+    assert_equal(p1.call, 0)
     eval "i7=1", p1
-    assert(p1.call == 1)
+    assert_equal(p1.call, 1)
     eval "i7=5", p1
-    assert(p1.call == 5)
-    assert(i7 == nil)
+    assert_equal(p1.call, 5)
+    assert_equal(i7, nil)
   end
 end