diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | test/ruby/test_marshal.rb | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Wed Nov 2 00:14:15 2011 Shugo Maeda <shugo@ruby-lang.org> + + * test/ruby/test_marshal.rb: renamed methods duplicated with those + of marshaltestlib.rb. + Tue Nov 1 22:08:27 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in: reject llvm-gcc. diff --git a/test/ruby/test_marshal.rb b/test/ruby/test_marshal.rb index 3eebbfafca..4b72e371bf 100644 --- a/test/ruby/test_marshal.rb +++ b/test/ruby/test_marshal.rb @@ -263,7 +263,7 @@ class TestMarshal < Test::Unit::TestCase 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 @@ class TestMarshal < Test::Unit::TestCase 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")) |