Compact ensure clause and rename variables to fix alignment

This commit is contained in:
Kazuhiro NISHIYAMA 2019-08-01 09:12:08 +09:00
parent 31ec475ad8
commit 67f7e5a224
No known key found for this signature in database
GPG Key ID: 262ED8DBB4222F7A

View File

@ -117,23 +117,23 @@ class TestIO < Test::Unit::TestCase
EnvUtil.with_default_internal(Encoding::UTF_8) do EnvUtil.with_default_internal(Encoding::UTF_8) do
EnvUtil.with_default_external(Encoding::UTF_8) do EnvUtil.with_default_external(Encoding::UTF_8) do
begin begin
reader, writer = IO.pipe reader0, writer0 = IO.pipe
reader.binmode reader0.binmode
writer.binmode writer0.binmode
reader1, writer1 = IO.pipe reader1, writer1 = IO.pipe
reader2, writer2 = IO.pipe(binmode: true) reader2, writer2 = IO.pipe(binmode: true)
assert_predicate writer, :binmode? assert_predicate writer0, :binmode?
assert_predicate writer2, :binmode? assert_predicate writer2, :binmode?
assert_equal writer.binmode?, writer2.binmode? assert_equal writer0.binmode?, writer2.binmode?
assert_equal writer.external_encoding, writer2.external_encoding assert_equal writer0.external_encoding, writer2.external_encoding
assert_equal writer.internal_encoding, writer2.internal_encoding assert_equal writer0.internal_encoding, writer2.internal_encoding
assert_predicate reader, :binmode? assert_predicate reader0, :binmode?
assert_predicate reader2, :binmode? assert_predicate reader2, :binmode?
assert_equal reader.binmode?, reader2.binmode? assert_equal reader0.binmode?, reader2.binmode?
assert_equal reader.external_encoding, reader2.external_encoding assert_equal reader0.external_encoding, reader2.external_encoding
assert_equal reader.internal_encoding, reader2.internal_encoding assert_equal reader0.internal_encoding, reader2.internal_encoding
reader3, writer3 = IO.pipe("UTF-8:UTF-8", binmode: true) reader3, writer3 = IO.pipe("UTF-8:UTF-8", binmode: true)
assert_predicate writer3, :binmode? assert_predicate writer3, :binmode?
@ -159,18 +159,14 @@ class TestIO < Test::Unit::TestCase
assert_equal reader1.external_encoding, reader5.external_encoding assert_equal reader1.external_encoding, reader5.external_encoding
assert_equal reader1.internal_encoding, reader5.internal_encoding assert_equal reader1.internal_encoding, reader5.internal_encoding
ensure ensure
reader.close if reader [
writer.close if writer reader0, writer0,
reader1.close if reader1 reader1, writer1,
writer1.close if writer1 reader2, writer2,
reader2.close if reader2 reader3, writer3,
writer2.close if writer2 reader4, writer4,
reader3.close if reader3 reader5, writer5,
writer3.close if writer3 ].compact.map(&:close)
reader4.close if reader4
writer4.close if writer4
reader5.close if reader5
writer5.close if writer5
end end
end end
end end