kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* test/socket/test_socket.rb: update not to use 1.8 assignment to

Browse source 
external local variable in the block parameters.  [ruby-dev:32251]

* test/strscan/test_stringscanner.rb: avoid $KCODE, and use
  String#force_encoding().  [ruby-dev:32251]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2007-11-14 07:03:39 +00:00
parent e81b38e378
commit 326659c0bf
3 changed files with 24 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Wed Nov 14 15:39:24 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* test/socket/test_socket.rb: update not to use 1.8 assignment to
external local variable in the block parameters. [ruby-dev:32251]
* test/strscan/test_stringscanner.rb: avoid $KCODE, and use
String#force_encoding(). [ruby-dev:32251]
Wed Nov 14 14:04:42 2007 Tanaka Akira <akr@fsij.org> Wed Nov 14 14:04:42 2007 Tanaka Akira <akr@fsij.org>
* common.mk, Makefile.in: rename prelude.c to miniprelude.c. * common.mk, Makefile.in: rename prelude.c to miniprelude.c.

9
test/socket/test_socket.rb
View file

@ -38,7 +38,8 @@ class TestBasicSocket < Test::Unit::TestCase
s.close s.close
linger linger
} }
inet_stream do |s| inet_stream do |sock|
s = sock
assert_equal(0, s.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, linger)) assert_equal(0, s.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, linger))
assert_raise(IOError) { assert_raise(IOError) {
@ -51,7 +52,8 @@ class TestBasicSocket < Test::Unit::TestCase
s.close s.close
Socket::SO_LINGER Socket::SO_LINGER
} }
inet_stream do |s| inet_stream do |sock|
s = sock
assert_raise(IOError) { assert_raise(IOError) {
s.setsockopt(Socket::SOL_SOCKET, val, linger) s.setsockopt(Socket::SOL_SOCKET, val, linger)
} }
@ -65,7 +67,8 @@ class TestBasicSocket < Test::Unit::TestCase
s.close s.close
2 2
} }
inet_stream do |s| inet_stream do |sock|
s = sock
assert_raise(IOError) { assert_raise(IOError) {
s.listen(log) s.listen(log)
} }

25
test/strscan/test_stringscanner.rb
View file

@ -288,15 +288,9 @@ class TestStringScanner < Test::Unit::TestCase
assert_equal true, s.getch.tainted? assert_equal true, s.getch.tainted?
assert_nil s.getch assert_nil s.getch
kc_backup = $KCODE s = StringScanner.new("\244\242".force_encoding("euc-jp"))
begin
$KCODE = 'EUC'
s = StringScanner.new("\244\242")
assert_equal "\244\242", s.getch assert_equal "\244\242", s.getch
assert_nil s.getch assert_nil s.getch
ensure
$KCODE = kc_backup
end
s = StringScanner.new('test') s = StringScanner.new('test')
s.scan(/te/) s.scan(/te/)
@ -322,16 +316,10 @@ class TestStringScanner < Test::Unit::TestCase
assert_equal true, s.get_byte.tainted? assert_equal true, s.get_byte.tainted?
assert_nil s.get_byte assert_nil s.get_byte
kc_backup = $KCODE s = StringScanner.new("\244\242".force_encoding("euc-jp"))
begin
$KCODE = 'EUC'
s = StringScanner.new("\244\242")
assert_equal "\244", s.get_byte assert_equal "\244", s.get_byte
assert_equal "\242", s.get_byte assert_equal "\242", s.get_byte
assert_nil s.get_byte assert_nil s.get_byte
ensure
$KCODE = kc_backup
end
s = StringScanner.new('test') s = StringScanner.new('test')
s.scan(/te/) s.scan(/te/)
@ -424,16 +412,9 @@ class TestStringScanner < Test::Unit::TestCase
assert_nil s[0] assert_nil s[0]
kc_backup = $KCODE s = StringScanner.new("\244\242".force_encoding("euc-jp"))
begin
$KCODE = 'EUC'
s = StringScanner.new("\244\242")
s.getch s.getch
assert_equal "\244\242", s[0] assert_equal "\244\242", s[0]
ensure
$KCODE = kc_backup
end
str = 'test' str = 'test'
str.taint str.taint