From 3fc04d9361549d5bb15f869c22d7ce9591a0ac8c Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 27 Feb 2002 04:52:21 +0000 Subject: * ext/dbm/dbm.c (fdbm_select): 1.7 behavior. * ext/gdbm/gdbm.c (fgdbm_select): ditto. * ext/sdbm/sdbm.c (fsdbm_select): ditto. * ext/dbm/dbm.c (fdbm_delete): adopt Hash#delete behavior. * ext/sdbm/sdbm.c (fsdbm_delete): ditto. * ext/gdbm/gdbm.c: need not to dup key to the block. * ext/sdbm/sdbm.c : replace RuntimeError with SDBMError. * eval.c (rb_f_missing): NoMethod error messages for true, false, nil must respond visibility like for other objects. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2145 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/dbm/testdbm.rb | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) (limited to 'ext/dbm/testdbm.rb') diff --git a/ext/dbm/testdbm.rb b/ext/dbm/testdbm.rb index c6b26e0cdf..0be627d346 100644 --- a/ext/dbm/testdbm.rb +++ b/ext/dbm/testdbm.rb @@ -165,7 +165,7 @@ class TestDBM < RUNIT::TestCase assert_nil(dbm.close) # closed DBM file - assert_exception(RuntimeError) { dbm.close } + assert_exception(DBMError) { dbm.close } end def test_aref @@ -245,6 +245,25 @@ class TestDBM < RUNIT::TestCase assert_equals(values.reverse, @dbm.indexes(*keys.reverse)) end + def test_select + keys = %w(foo bar baz) + values = %w(FOO BAR BAZ) + @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values + assert_equals(values.reverse, @dbm.select(*keys.reverse)) + end + + def test_select_with_block + keys = %w(foo bar baz) + values = %w(FOO BAR BAZ) + @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values + ret = @dbm.select {|k,v| + assert_equals(k.upcase, v) + k != "bar" + } + assert_equals([['baz', 'BAZ'], ['foo', 'FOO']], + ret.sort) + end + def test_length num = 10 assert_equals(0, @dbm.size) @@ -377,7 +396,7 @@ class TestDBM < RUNIT::TestCase @dbm[keys[0]], @dbm[keys[1]], @dbm[keys[2]] = values - assert_equals(@dbm, @dbm.delete(key)) + assert_equals('BAR', @dbm.delete(key)) assert_nil(@dbm[key]) assert_equals(2, @dbm.size) @@ -394,12 +413,13 @@ class TestDBM < RUNIT::TestCase def test_delete_with_block key = 'no called block' @dbm[key] = 'foo' - assert_equals(@dbm, @dbm.delete(key) {|k| k.replace 'called block'}) + assert_equals('foo', @dbm.delete(key) {|k| k.replace 'called block'}) assert_equals('no called block', key) assert_equals(0, @dbm.size) key = 'no called block' - assert_nil(@dbm.delete(key) {|k| k.replace 'called block'}) + assert_equals(:blockval, + @dbm.delete(key) {|k| k.replace 'called block'; :blockval}) assert_equals('called block', key) assert_equals(0, @dbm.size) end -- cgit v1.2.3