From f83a2eee050cc00872ccd4ba776e4d7902f85bca Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 24 Jul 2012 02:36:15 +0000 Subject: [PATCH] * test/ruby/test_pack.rb (test_pack_unpack_M): was redefined accidentally. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36512 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/ruby/test_pack.rb | 21 +++++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92972ebd88..0eea1bfef0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jul 24 11:35:20 2012 NAKAMURA Usaku + + * test/ruby/test_pack.rb (test_pack_unpack_M): was redefined + accidentally. + Tue Jul 24 09:31:18 2012 Eric Hodel * lib/rubygems: Updated to RubyGems 1.8.24, a bugfix release. diff --git a/test/ruby/test_pack.rb b/test/ruby/test_pack.rb index c72035c2e7..3f383afa2a 100644 --- a/test/ruby/test_pack.rb +++ b/test/ruby/test_pack.rb @@ -576,6 +576,15 @@ EXPECTED assert_equal([""], "=\r\n".unpack("M")) assert_equal([""], "=\r\n".unpack("M")) assert_equal(["\xC6\xF7"], "=C6=F7".unpack('M*')) + + assert_equal(["pre123after"], "pre=31=32=33after".unpack("M")) + assert_equal(["preafter"], "pre=\nafter".unpack("M")) + assert_equal(["preafter"], "pre=\r\nafter".unpack("M")) + assert_equal(["pre="], "pre=".unpack("M")) + assert_equal(["pre=\r"], "pre=\r".unpack("M")) + assert_equal(["pre=hoge"], "pre=hoge".unpack("M")) + assert_equal(["pre==31after"], "pre==31after".unpack("M")) + assert_equal(["pre===31after"], "pre===31after".unpack("M")) end def test_pack_unpack_P2 @@ -616,18 +625,6 @@ EXPECTED assert_equal([0x100000000], "\220\200\200\200\000".unpack("w"), [0x100000000]) end - - def test_pack_unpack_M - assert_equal(["pre123after"], "pre=31=32=33after".unpack("M")) - assert_equal(["preafter"], "pre=\nafter".unpack("M")) - assert_equal(["preafter"], "pre=\r\nafter".unpack("M")) - assert_equal(["pre="], "pre=".unpack("M")) - assert_equal(["pre=\r"], "pre=\r".unpack("M")) - assert_equal(["pre=hoge"], "pre=hoge".unpack("M")) - assert_equal(["pre==31after"], "pre==31after".unpack("M")) - assert_equal(["pre===31after"], "pre===31after".unpack("M")) - end - def test_modify_under_safe4 s = "foo" assert_raise(SecurityError) do