diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-11 11:00:47 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-11 11:00:47 +0000 |
| commit | c27dc8973410aff44edf8ff118fbbbbbc2a01e3a (patch) | |
| tree | d0d20424e895ddba98ac46b396dbd8be7f5f5439 /test/dbm | |
| parent | 90fe776136d634bd4cbec392937440d50e5372d9 (diff) | |
merges r20146 from trunk into ruby_1_9_1.
* ext/dbm/dbm.c (fdbm_index): make #index warn like Hash.
* ext/dbm/dbm.c (fdbm_key): new method.
* ext/sdbm/init.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20194 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/dbm')
| -rw-r--r-- | test/dbm/test_dbm.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/dbm/test_dbm.rb b/test/dbm/test_dbm.rb index 546e969e58..5cf8acb68c 100644 --- a/test/dbm/test_dbm.rb +++ b/test/dbm/test_dbm.rb @@ -160,9 +160,9 @@ if defined? DBM } end - def test_index + def test_key assert_equal('bar', @dbm['foo'] = 'bar') - assert_equal('foo', @dbm.index('bar')) + assert_equal('foo', @dbm.key('bar')) assert_nil(@dbm['bar']) end @@ -217,7 +217,7 @@ if defined? DBM n = 0 ret = @dbm.each_pair {|key, val| - assert_not_nil(i = keys.index(key)) + assert_not_nil(i = keys.key(key)) assert_equal(val, values[i]) n += 1 @@ -238,8 +238,8 @@ if defined? DBM n = 0 ret = @dbm.each_value {|val| - assert_not_nil(key = @dbm.index(val)) - assert_not_nil(i = keys.index(key)) + assert_not_nil(key = @dbm.key(val)) + assert_not_nil(i = keys.key(key)) assert_equal(val, values[i]) n += 1 @@ -260,7 +260,7 @@ if defined? DBM n = 0 ret = @dbm.each_key {|key| - assert_not_nil(i = keys.index(key)) + assert_not_nil(i = keys.key(key)) assert_equal(@dbm[key], values[i]) n += 1 |