diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-07 01:23:07 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-07 01:23:07 +0000 |
commit | 298258891d2f8a80f8d1eac193c6609a256a3cf0 (patch) | |
tree | 0c7bac8b88d9d2b57e3aa9635f6839a8e97b1b35 /test/ruby | |
parent | b5ba059a0b21ba6a198d8dca864045c37ce3babb (diff) | |
download | ruby-298258891d2f8a80f8d1eac193c6609a256a3cf0.tar.gz |
use assert_equal, assert_match, and so on.
* test/fileutils/fileasserts.rb: use assert_equal, assert_match, and so on.
* test/ruby/enc/test_utf16.rb, test/ruby/enc/test_utf32.rb,
test/ruby/test_io_m17n.rb (assert_str_equal): ditto.
* test/rubygems/test_gem_remote_fetcher.rb
(assert_data_from_{server,proxy}): ditto.
* test/test_pstore.rb (test_thread_safe): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35553 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby')
-rw-r--r-- | test/ruby/enc/test_utf16.rb | 2 | ||||
-rw-r--r-- | test/ruby/enc/test_utf32.rb | 2 | ||||
-rw-r--r-- | test/ruby/test_env.rb | 6 | ||||
-rw-r--r-- | test/ruby/test_io_m17n.rb | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/test/ruby/enc/test_utf16.rb b/test/ruby/enc/test_utf16.rb index 90a8314067..7d2197da98 100644 --- a/test/ruby/enc/test_utf16.rb +++ b/test/ruby/enc/test_utf16.rb @@ -49,7 +49,7 @@ class TestUTF16 < Test::Unit::TestCase #{encdump expected} expected but not equal to #{encdump actual}. EOT - assert_block(full_message) { expected == actual } + assert_equal(expected, actual, full_message) end # tests start diff --git a/test/ruby/enc/test_utf32.rb b/test/ruby/enc/test_utf32.rb index 3d4a458512..29a2240598 100644 --- a/test/ruby/enc/test_utf32.rb +++ b/test/ruby/enc/test_utf32.rb @@ -15,7 +15,7 @@ class TestUTF32 < Test::Unit::TestCase #{encdump expected} expected but not equal to #{encdump actual}. EOT - assert_block(full_message) { expected == actual } + assert_equal(expected, actual, full_message) end def test_substr diff --git a/test/ruby/test_env.rb b/test/ruby/test_env.rb index 8baf762472..ced00c30cc 100644 --- a/test/ruby/test_env.rb +++ b/test/ruby/test_env.rb @@ -140,8 +140,7 @@ class TestEnv < Test::Unit::TestCase end def test_keys - a = nil - assert_block { a = ENV.keys } + a = ENV.keys assert_kind_of(Array, a) a.each {|k| assert_kind_of(String, k) } end @@ -151,8 +150,7 @@ class TestEnv < Test::Unit::TestCase end def test_values - a = nil - assert_block { a = ENV.values } + a = ENV.values assert_kind_of(Array, a) a.each {|k| assert_kind_of(String, k) } end diff --git a/test/ruby/test_io_m17n.rb b/test/ruby/test_io_m17n.rb index fcbe6e0519..719214d491 100644 --- a/test/ruby/test_io_m17n.rb +++ b/test/ruby/test_io_m17n.rb @@ -71,7 +71,7 @@ class TestIO_M17N < Test::Unit::TestCase #{encdump expected} expected but not equal to #{encdump actual}. EOT - assert_block(full_message) { expected == actual } + assert_equal(expected, actual, full_message) end def test_open_r |