* test/ruby/test_*.rb: replace 'assert(a == b)' with assert_equal(a, b)'

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

1 files changed, 44 insertions, 42 deletions

diff --git a/test/ruby/test_stringchar.rb b/test/ruby/test_stringchar.rb
index 498300f379..78ec39d56c 100644
--- a/test/ruby/test_stringchar.rb
+++ b/test/ruby/test_stringchar.rb
@@ -3,18 +3,18 @@ require 'test/unit'
 $KCODE = 'none'
 
 class TestStringchar < Test::Unit::TestCase
-  def test_stringchar
-    assert("abcd" == "abcd")
+  def test_string
+    assert_equal("abcd", "abcd")
     assert("abcd" =~ /abcd/)
     assert("abcd" === "abcd")
     # compile time string concatenation
-    assert("ab" "cd" == "abcd")
-    assert("#{22}aa" "cd#{44}" == "22aacd44")
-    assert("#{22}aa" "cd#{44}" "55" "#{66}" == "22aacd445566")
+    assert_equal("ab" "cd", "abcd")
+    assert_equal("#{22}aa" "cd#{44}", "22aacd44")
+    assert_equal("#{22}aa" "cd#{44}" "55" "#{66}", "22aacd445566")
     assert("abc" !~ /^$/)
     assert("abc\n" !~ /^$/)
     assert("abc" !~ /^d*$/)
-    assert(("abc" =~ /d*$/) == 3)
+    assert_equal(("abc" =~ /d*$/), 3)
     assert("" =~ /^$/)
     assert("\n" =~ /^$/)
     assert("a\n\n" =~ /^$/)
@@ -37,46 +37,48 @@ ABCD
 ABCD
 END
     $x.gsub!(/((.|\n)*?)B((.|\n)*?)D/){$1+$3}
-    assert($x == "AC\nAC\n")
+    assert_equal($x, "AC\nAC\n")
     
     assert("foobar" =~ /foo(?=(bar)|(baz))/)
     assert("foobaz" =~ /foo(?=(bar)|(baz))/)
     
     $foo = "abc"
-    assert("#$foo = abc" == "abc = abc")
-    assert("#{$foo} = abc" == "abc = abc")
+    assert_equal("#$foo = abc", "abc = abc")
+    assert_equal("#{$foo} = abc", "abc = abc")
     
     foo = "abc"
-    assert("#{foo} = abc" == "abc = abc")
+    assert_equal("#{foo} = abc", "abc = abc")
     
-    assert('-' * 5 == '-----')
-    assert('-' * 1 == '-')
-    assert('-' * 0 == '')
+    assert_equal('-' * 5, '-----')
+    assert_equal('-' * 1, '-')
+    assert_equal('-' * 0, '')
     
     foo = '-'
-    assert(foo * 5 == '-----')
-    assert(foo * 1 == '-')
-    assert(foo * 0 == '')
+    assert_equal(foo * 5, '-----')
+    assert_equal(foo * 1, '-')
+    assert_equal(foo * 0, '')
     
     $x = "a.gif"
-    assert($x.sub(/.*\.([^\.]+)$/, '\1') == "gif")
-    assert($x.sub(/.*\.([^\.]+)$/, 'b.\1') == "b.gif")
-    assert($x.sub(/.*\.([^\.]+)$/, '\2') == "")
-    assert($x.sub(/.*\.([^\.]+)$/, 'a\2b') == "ab")
-    assert($x.sub(/.*\.([^\.]+)$/, '<\&>') == "<a.gif>")
-    
+    assert_equal($x.sub(/.*\.([^\.]+)$/, '\1'), "gif")
+    assert_equal($x.sub(/.*\.([^\.]+)$/, 'b.\1'), "b.gif")
+    assert_equal($x.sub(/.*\.([^\.]+)$/, '\2'), "")
+    assert_equal($x.sub(/.*\.([^\.]+)$/, 'a\2b'), "ab")
+    assert_equal($x.sub(/.*\.([^\.]+)$/, '<\&>'), "<a.gif>")
+  end
+
+  def test_char
     # character constants(assumes ASCII)
-    assert("a"[0] == ?a)
-    assert(?a == ?a)
-    assert(?\C-a == 1)
-    assert(?\M-a == 225)
-    assert(?\M-\C-a == 129)
-    assert("a".upcase![0] == ?A)
-    assert("A".downcase![0] == ?a)
-    assert("abc".tr!("a-z", "A-Z") == "ABC")
-    assert("aabbcccc".tr_s!("a-z", "A-Z") == "ABC")
-    assert("abcc".squeeze!("a-z") == "abc")
-    assert("abcd".delete!("bc") == "ad")
+    assert_equal("a"[0], ?a)
+    assert_equal(?a, ?a)
+    assert_equal(?\C-a, 1)
+    assert_equal(?\M-a, 225)
+    assert_equal(?\M-\C-a, 129)
+    assert_equal("a".upcase![0], ?A)
+    assert_equal("A".downcase![0], ?a)
+    assert_equal("abc".tr!("a-z", "A-Z"), "ABC")
+    assert_equal("aabbcccc".tr_s!("a-z", "A-Z"), "ABC")
+    assert_equal("abcc".squeeze!("a-z"), "abc")
+    assert_equal("abcd".delete!("bc"), "ad")
     
     $x = "abcdef"
     $y = [ ?a, ?b, ?c, ?d, ?e, ?f ]
@@ -91,26 +93,26 @@ END
     
     s = "a string"
     s[0..s.size]="another string"
-    assert(s == "another string")
+    assert_equal(s, "another string")
     
     s = <<EOS
 #{
 [1,2,3].join(",")
 }
 EOS
-    assert(s == "1,2,3\n")
-    assert("Just".to_i(36) == 926381)
-    assert("-another".to_i(36) == -23200231779)
-    assert(1299022.to_s(36) == "ruby")
-    assert(-1045307475.to_s(36) == "-hacker")
-    assert("Just_another_Ruby_hacker".to_i(36) == 265419172580680477752431643787347)
-    assert(-265419172580680477752431643787347.to_s(36) == "-justanotherrubyhacker")
+    assert_equal(s, "1,2,3\n")
+    assert_equal("Just".to_i(36), 926381)
+    assert_equal("-another".to_i(36), -23200231779)
+    assert_equal(1299022.to_s(36), "ruby")
+    assert_equal(-1045307475.to_s(36), "-hacker")
+    assert_equal("Just_another_Ruby_hacker".to_i(36), 265419172580680477752431643787347)
+    assert_equal(-265419172580680477752431643787347.to_s(36), "-justanotherrubyhacker")
     
     a = []
     (0..255).each {|n|
       ch = [n].pack("C")                     
       a.push ch if /a#{Regexp.quote ch}b/x =~ "ab" 
     }
-    assert(a.size == 0)
+    assert_equal(a.size, 0)
   end
 end