akr	2010-02-14 12:09:53 +0900 (Sun, 14 Feb 2010)

  New Revision: 26663

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26663

  Log:
    avoid method redefinition.

  Modified files:
    trunk/test/ruby/enc/test_utf16.rb
    trunk/test/ruby/test_econv.rb
    trunk/test/ruby/test_hash.rb
    trunk/test/ruby/test_proc.rb
    trunk/test/strscan/test_stringscanner.rb
    trunk/test/zlib/test_zlib.rb

Index: test/ruby/test_proc.rb
===================================================================
--- test/ruby/test_proc.rb	(revision 26662)
+++ test/ruby/test_proc.rb	(revision 26663)
@@ -620,7 +620,7 @@
     assert_equal [1, 2, 3, 4, 5, 6, Proc, :x], (pr.call(1, 2, 3, 4, 5, 6, 7){|x| x})
   end
 
-  def test_proc_args_opt_and_block
+  def test_proc_args_opt_and_block2
     pr = proc {|a,b,c=:c,d=:d,*e,&f|
       [a, b, c, d, e, f.class, f&&f.call(:x)]
     }
Index: test/ruby/enc/test_utf16.rb
===================================================================
--- test/ruby/enc/test_utf16.rb	(revision 26662)
+++ test/ruby/enc/test_utf16.rb	(revision 26663)
@@ -369,7 +369,7 @@
     assert(r =~ s, "#{encdump(r)} =~ #{encdump(s)}")
   end
 
-  def test_casecmp
+  def test_casecmp2
     assert_equal(0, "\0A".force_encoding("UTF-16BE").casecmp("\0a".force_encoding("UTF-16BE")))
     assert_not_equal(0, "\0A".force_encoding("UTF-16LE").casecmp("\0a".force_encoding("UTF-16LE")))
     assert_not_equal(0, "A\0".force_encoding("UTF-16BE").casecmp("a\0".force_encoding("UTF-16BE")))
Index: test/ruby/test_econv.rb
===================================================================
--- test/ruby/test_econv.rb	(revision 26662)
+++ test/ruby/test_econv.rb	(revision 26663)
@@ -886,7 +886,7 @@
                  Encoding::Converter.search_convpath("ISO-8859-1", "UTF-32BE", universal_newline: true))
   end
 
-  def test_invalid_replace
+  def test_invalid_replace2
     assert_raise(ArgumentError) {
       broken = "\x80".force_encoding("euc-jp")
       "".encode("euc-jp", :undef => :replace, :replace => broken)
Index: test/ruby/test_hash.rb
===================================================================
--- test/ruby/test_hash.rb	(revision 26662)
+++ test/ruby/test_hash.rb	(revision 26663)
@@ -376,7 +376,7 @@
     assert_equal('nil', @h.fetch(nil))
   end
 
-  def test_key?
+  def test_key2?
     assert(!@cls[].key?(1))
     assert(!@cls[].key?(nil))
     assert(@h.key?(nil))
@@ -648,7 +648,7 @@
     assert_equal(hb, h2)
   end
 
-  def test_value?
+  def test_value2?
     assert(!@cls[].value?(1))
     assert(!@cls[].value?(nil))
     assert(@h.value?(nil))
Index: test/zlib/test_zlib.rb
===================================================================
--- test/zlib/test_zlib.rb	(revision 26662)
+++ test/zlib/test_zlib.rb	(revision 26663)
@@ -535,7 +535,7 @@
       assert_equal("foobar".each_byte.to_a, a)
     end
 
-    def test_gets
+    def test_gets2
       t = Tempfile.new("test_zlib_gzip_reader")
       t.close
       Zlib::GzipWriter.open(t.path) {|gz| gz.print("foo\nbar\nbaz\n") }
Index: test/strscan/test_stringscanner.rb
===================================================================
--- test/strscan/test_stringscanner.rb	(revision 26662)
+++ test/strscan/test_stringscanner.rb	(revision 26663)
@@ -685,7 +685,7 @@
     s.scan(/ string/)
   end
 
-  def test_inspect
+  def test_inspect2
     s = StringScanner.new('test string test')
     s.scan(/test strin/)
     assert_equal('#<StringScanner 10/16 "...strin" @ "g tes...">', s.inspect)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/