diff options
| author | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-19 13:13:32 +0000 |
|---|---|---|
| committer | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-19 13:13:32 +0000 |
| commit | b0e40509c3b60242c6a1b0e67276849eea505977 (patch) | |
| tree | ee51657c78f02d5d5d11bc8acd7ab394cd10305d /test | |
| parent | f4dbc7a3849988ebe75d3e1031aa50441347c497 (diff) | |
set encoding to ASCII for appropriate String#unpack modifiers
* pack.c (pack_unpack): set encoding of the
'H','h','B' and 'B' modifiers to US-ASCII.
* test/ruby/test_pack.rb: tests for the above.
[ruby-core:47653][Bug #7050]
* test/test_securerandom.rb: tests for SecureRandom.hex
from tenderlove. [ruby-core:46792][Bug #6799]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37269 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/test_pack.rb | 6 | ||||
| -rw-r--r-- | test/test_securerandom.rb | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/test/ruby/test_pack.rb b/test/ruby/test_pack.rb index 5a19cb3d56..1463bd035b 100644 --- a/test/ruby/test_pack.rb +++ b/test/ruby/test_pack.rb @@ -280,6 +280,9 @@ class TestPack < Test::Unit::TestCase assert_equal(["1"], "\x80".unpack("B1")) assert_equal(["10"], "\x80".unpack("B2")) assert_equal(["100"], "\x80".unpack("B3")) + + assert_equal(Encoding::US_ASCII, "\xff\x00".unpack("b*")[0].encoding) + assert_equal(Encoding::US_ASCII, "\xff\x00".unpack("B*")[0].encoding) end def test_pack_unpack_hH @@ -320,6 +323,9 @@ class TestPack < Test::Unit::TestCase assert_equal(["10e"], "\x10\xef".unpack("H3")) assert_equal(["10ef"], "\x10\xef".unpack("H4")) assert_equal(["10ef"], "\x10\xef".unpack("H5")) + + assert_equal(Encoding::US_ASCII, "\x10\xef".unpack("h*")[0].encoding) + assert_equal(Encoding::US_ASCII, "\x10\xef".unpack("H*")[0].encoding) end def test_pack_unpack_cC diff --git a/test/test_securerandom.rb b/test/test_securerandom.rb index f3e1bf0afc..f3c9a1af92 100644 --- a/test/test_securerandom.rb +++ b/test/test_securerandom.rb @@ -111,6 +111,10 @@ end end end + def test_hex_encoding + assert_equal(Encoding::US_ASCII, @it.hex.encoding) + end + def test_s_base64 assert_equal(16, @it.base64.unpack('m*')[0].size) 17.times do |idx| |