From da805d34187aba4cacbb792155a11ab4201f6ad4 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 22 Oct 2008 05:55:22 +0000 Subject: * string.c (rb_external_str_new_with_enc): no implicit strlen call. [ruby-dev:36854] * string.c (rb_external_str_new_cstr): new function to create string from external NUL terminated C string. * string.c (rb_locale_str_new_cstr): ditto. * ext/readline/readline.c: now use rb_locale_str_new_cstr(). * test/sdbm/test_sdbm.rb (TestSDBM#test_delete_with_block): deleted key to the block may be a copy of specified key. * test/dbm/test_dbm.rb (TestDBM#test_delete_with_block): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19885 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/dbm/test_dbm.rb | 7 ++----- test/sdbm/test_sdbm.rb | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'test') diff --git a/test/dbm/test_dbm.rb b/test/dbm/test_dbm.rb index dc02d30c7..546e969e5 100644 --- a/test/dbm/test_dbm.rb +++ b/test/dbm/test_dbm.rb @@ -334,14 +334,11 @@ if defined? DBM def test_delete_with_block key = 'no called block' @dbm[key] = 'foo' - assert_equal('foo', @dbm.delete(key) {|k| k.replace 'called block'}) - assert_equal('no called block', key) + assert_equal('foo', @dbm.delete(key) {|k| k.replace 'called block'; :blockval}) assert_equal(0, @dbm.size) key = 'no called block' - assert_equal(:blockval, - @dbm.delete(key) {|k| k.replace 'called block'; :blockval}) - assert_equal('called block', key) + assert_equal(:blockval, @dbm.delete(key) {|k| k.replace 'called block'; :blockval}) assert_equal(0, @dbm.size) end diff --git a/test/sdbm/test_sdbm.rb b/test/sdbm/test_sdbm.rb index 0c6df66fb..b7e849830 100644 --- a/test/sdbm/test_sdbm.rb +++ b/test/sdbm/test_sdbm.rb @@ -365,14 +365,11 @@ class TestSDBM < Test::Unit::TestCase def test_delete_with_block key = 'no called block' @sdbm[key] = 'foo' - assert_equal('foo', @sdbm.delete(key) {|k| k.replace 'called block'}) - assert_equal('no called block', key) + assert_equal('foo', @sdbm.delete(key) {|k| k.replace 'called block'; :blockval}) assert_equal(0, @sdbm.size) key = 'no called block' - assert_equal(:blockval, - @sdbm.delete(key) {|k| k.replace 'called block'; :blockval}) - assert_equal('called block', key) + assert_equal(:blockval, @sdbm.delete(key) {|k| k.replace 'called block'; :blockval}) assert_equal(0, @sdbm.size) end -- cgit