From 44785befeabd09d5d34f33b33783c0ec54f06a1f Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 5 Sep 2003 15:15:43 +0000
Subject: * lib/optparse.rb (OptionParser#order, #permute, #parse): allow an  
 array as argument.

* test/ruby/test_*.rb: moved invariants to left side in
  assert_equal, and use assert_nil, assert_raises and so on.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4516 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_eval.rb | 68 +++++++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

(limited to 'test/ruby/test_eval.rb')

diff --git a/test/ruby/test_eval.rb b/test/ruby/test_eval.rb
index 35cbbfd7d6..c64741df33 100644
--- a/test/ruby/test_eval.rb
+++ b/test/ruby/test_eval.rb
@@ -13,35 +13,35 @@ class TestEval < Test::Unit::TestCase
   end
 
   def test_eval
-    assert_equal(eval(""), nil)
+    assert_nil(eval(""))
     $bad=false
     eval 'while false; $bad = true; print "foo\n" end'
     assert(!$bad)
-    
+
     assert(eval('TRUE'))
     assert(eval('true'))
     assert(!eval('NIL'))
     assert(!eval('nil'))
     assert(!eval('FALSE'))
     assert(!eval('false'))
-    
+
     $foo = 'assert(true)'
     begin
       eval $foo
     rescue
       assert(false)
     end
-    
-    assert_equal(eval("$foo"), 'assert(true)')
-    assert_equal(eval("true"), true)
+
+    assert_equal('assert(true)', eval("$foo"))
+    assert_equal(true, eval("true"))
     i = 5
     assert(eval("i == 5"))
-    assert_equal(eval("i"), 5)
+    assert_equal(5, eval("i"))
     assert(eval("defined? i"))
-    
+
     $x = test_ev
-    assert_equal(eval("local1", $x), "local1") # normal local var
-    assert_equal(eval("local2", $x), "local2") # nested local var
+    assert_equal("local1", eval("local1", $x)) # normal local var
+    assert_equal("local2", eval("local2", $x)) # nested local var
     $bad = true
     begin
       p eval("local1")
@@ -49,7 +49,7 @@ class TestEval < Test::Unit::TestCase
       $bad = false
     end
     assert(!$bad)
-    
+
     # !! use class_eval to avoid nested definition
     self.class.class_eval %q(
       module EvTest
@@ -58,8 +58,8 @@ class TestEval < Test::Unit::TestCase
 	$x = binding
       end
     )
-    assert_equal(eval("EVTEST1", $x), 25)	# constant in module
-    assert_equal(eval("evtest2", $x), 125)	# local var in module
+    assert_equal(25, eval("EVTEST1", $x))	# constant in module
+    assert_equal(125, eval("evtest2", $x))	# local var in module
     $bad = true
     begin
       eval("EVTEST1")
@@ -67,58 +67,58 @@ class TestEval < Test::Unit::TestCase
       $bad = false
     end
     assert(!$bad)
-    
+
     x = proc{}
     eval "i4 = 1", x
-    assert_equal(eval("i4", x), 1)
+    assert_equal(1, eval("i4", x))
     x = proc{proc{}}.call
     eval "i4 = 22", x
-    assert_equal(eval("i4", x), 22)
+    assert_equal(22, eval("i4", x))
     $x = []
     x = proc{proc{}}.call
     eval "(0..9).each{|i5| $x[i5] = proc{i5*2}}", x
-    assert_equal($x[4].call, 8)
-    
+    assert_equal(8, $x[4].call)
+
     x = binding
     eval "i = 1", x
-    assert_equal(eval("i", x), 1)
+    assert_equal(1, eval("i", x))
     x = proc{binding}.call
     eval "i = 22", x
-    assert_equal(eval("i", x), 22)
+    assert_equal(22, eval("i", x))
     $x = []
     x = proc{binding}.call
     eval "(0..9).each{|i5| $x[i5] = proc{i5*2}}", x
-    assert_equal($x[4].call, 8)
+    assert_equal(8, $x[4].call)
     x = proc{binding}.call
     eval "for i6 in 1..1; j6=i6; end", x
     assert(eval("defined? i6", x))
     assert(eval("defined? j6", x))
-    
+
     proc {
       p = binding
       eval "foo11 = 1", p
       foo22 = 5
       proc{foo11=22}.call
       proc{foo22=55}.call
-      assert_equal(eval("foo11", p), eval("foo11"))
-      assert_equal(eval("foo11"), 1)
-      assert_equal(eval("foo22", p), eval("foo22"))
-      assert_equal(eval("foo22"), 55)
+      assert_equal(eval("foo11"), eval("foo11", p))
+      assert_equal(1, eval("foo11"))
+      assert_equal(eval("foo22"), eval("foo22", p))
+      assert_equal(55, eval("foo22"))
     }.call
-    
+
     p1 = proc{i7 = 0; proc{i7}}.call
-    assert_equal(p1.call, 0)
+    assert_equal(0, p1.call)
     eval "i7=5", p1
-    assert_equal(p1.call, 5)
+    assert_equal(5, p1.call)
     assert(!defined?(i7))
-    
+
     p1 = proc{i7 = 0; proc{i7}}.call
     i7 = nil
-    assert_equal(p1.call, 0)
+    assert_equal(0, p1.call)
     eval "i7=1", p1
-    assert_equal(p1.call, 1)
+    assert_equal(1, p1.call)
     eval "i7=5", p1
-    assert_equal(p1.call, 5)
-    assert_equal(i7, nil)
+    assert_equal(5, p1.call)
+    assert_nil(i7)
   end
 end
-- 
cgit v1.2.3