shugo	2011-11-02 00:21:50 +0900 (Wed, 02 Nov 2011)

  New Revision: 33608

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

  Log:
    * test/ruby/test_marshal.rb: renamed methods duplicated with those
      of marshaltestlib.rb.

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/test_marshal.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33607)
+++ ChangeLog	(revision 33608)
@@ -1,3 +1,8 @@
+Wed Nov  2 00:14:15 2011  Shugo Maeda  <shugo@r...>
+
+	* test/ruby/test_marshal.rb: renamed methods duplicated with those
+	  of marshaltestlib.rb.
+
 Tue Nov  1 22:08:27 2011  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in: reject llvm-gcc.
Index: test/ruby/test_marshal.rb
===================================================================
--- test/ruby/test_marshal.rb	(revision 33607)
+++ test/ruby/test_marshal.rb	(revision 33608)
@@ -263,7 +263,7 @@
     assert_equal(true, y.first.first.untrusted?)
   end
 
-  def test_symbol
+  def test_symbol2
     [:ruby, :"\u{7d05}\u{7389}"].each do |sym|
       assert_equal(sym, Marshal.load(Marshal.dump(sym)), '[ruby-core:24788]')
     end
@@ -321,7 +321,7 @@
     end
   end
 
-  def test_regexp
+  def test_regexp2
     assert_equal(/\\u/, Marshal.load("\004\b/\b\\\\u\000"))
     assert_equal(/u/, Marshal.load("\004\b/\a\\u\000"))
     assert_equal(/u/, Marshal.load("\004\bI/\a\\u\000\006:\016@encoding\"\vEUC-JP"))

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