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_hash.rb | 68 +++++++++++++++++++++++++-------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

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

diff --git a/test/ruby/test_hash.rb b/test/ruby/test_hash.rb
index 562ac93dfc..22c694ef1f 100644
--- a/test/ruby/test_hash.rb
+++ b/test/ruby/test_hash.rb
@@ -6,10 +6,10 @@ class TestHash < Test::Unit::TestCase
   def test_hash
     $x = {1=>2, 2=>4, 3=>6}
     $y = {1, 2, 2, 4, 3, 6}
-    
-    assert_equal($x[1], 2)
-    
-    assert(begin   
+
+    assert_equal(2, $x[1])
+
+    assert(begin
          for k,v in $y
            raise if k*2 != v
          end
@@ -17,60 +17,60 @@ class TestHash < Test::Unit::TestCase
        rescue
          false
        end)
-    
-    assert_equal($x.length, 3)
+
+    assert_equal(3, $x.length)
     assert($x.has_key?(1))
     assert($x.has_value?(4))
-    assert_equal($x.values_at(2,3), [4,6])
-    assert_equal($x, {1=>2, 2=>4, 3=>6})
-    
+    assert_equal([4,6], $x.values_at(2,3))
+    assert_equal({1=>2, 2=>4, 3=>6}, $x)
+
     $z = $y.keys.join(":")
-    assert_equal($z, "1:2:3")
-    
+    assert_equal("1:2:3", $z)
+
     $z = $y.values.join(":")
-    assert_equal($z, "2:4:6")
+    assert_equal("2:4:6", $z)
     assert_equal($x, $y)
-    
+
     $y.shift
-    assert_equal($y.length, 2)
-    
+    assert_equal(2, $y.length)
+
     $z = [1,2]
     $y[$z] = 256
-    assert_equal($y[$z], 256)
-    
+    assert_equal(256, $y[$z])
+
     $x = Hash.new(0)
     $x[1] = 1
-    assert_equal($x[1], 1)
-    assert_equal($x[2], 0)
-    
+    assert_equal(1, $x[1])
+    assert_equal(0, $x[2])
+
     $x = Hash.new([])
-    assert_equal($x[22], [])
+    assert_equal([], $x[22])
     assert($x[22].equal?($x[22]))
-    
+
     $x = Hash.new{[]}
-    assert_equal($x[22], [])
+    assert_equal([], $x[22])
     assert(!$x[22].equal?($x[22]))
-    
+
     $x = Hash.new{|h,k| $z = k; h[k] = k*2}
     $z = 0
-    assert_equal($x[22], 44)
-    assert_equal($z, 22)
+    assert_equal(44, $x[22])
+    assert_equal(22, $z)
     $z = 0
-    assert_equal($x[22], 44)
-    assert_equal($z, 0)
+    assert_equal(44, $x[22])
+    assert_equal(0, $z)
     $x.default = 5
-    assert_equal($x[23], 5)
-    
+    assert_equal(5, $x[23])
+
     $x = Hash.new
     def $x.default(k)
       $z = k
       self[k] = k*2
     end
     $z = 0
-    assert_equal($x[22], 44)
-    assert_equal($z, 22)
+    assert_equal(44, $x[22])
+    assert_equal(22, $z)
     $z = 0
-    assert_equal($x[22], 44)
-    assert_equal($z, 0)
+    assert_equal(44, $x[22])
+    assert_equal(0, $z)
   end
 end
-- 
cgit v1.2.3