yugui	2008-11-11 20:02:15 +0900 (Tue, 11 Nov 2008)

  New Revision: 20204

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20204

  Log:
    merges r20170 from trunk into ruby_1_9-1.
    * test/sdbm/test_sdbm.rb (TestSDBM#test_index): Reflect the method
      name change from #index to #key and remove a duplicated test
      method.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/test/sdbm/test_sdbm.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20203)
+++ ruby_1_9_1/ChangeLog	(revision 20204)
@@ -1,3 +1,9 @@
+Mon Nov 10 17:34:50 2008  Akinori MUSHA  <knu@i...>
+
+	* test/sdbm/test_sdbm.rb (TestSDBM#test_index): Reflect the method
+	  name change from #index to #key and remove a duplicated test
+	  method.
+
 Mon Nov 10 10:50:43 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* lib/delegate.rb (Delegator.delegating_block): should not refer
Index: ruby_1_9_1/test/sdbm/test_sdbm.rb
===================================================================
--- ruby_1_9_1/test/sdbm/test_sdbm.rb	(revision 20203)
+++ ruby_1_9_1/test/sdbm/test_sdbm.rb	(revision 20204)
@@ -199,9 +199,9 @@
     }
   end
 
-  def test_index
+  def test_key
     assert_equal('bar', @sdbm['foo'] = 'bar')
-    assert_equal('foo', @sdbm.index('bar'))
+    assert_equal('foo', @sdbm.key('bar'))
     assert_nil(@sdbm['bar'])
   end
 
@@ -277,7 +277,7 @@
 
     n = 0
     ret = @sdbm.each_value {|val|
-      assert_not_nil(key = @sdbm.index(val))
+      assert_not_nil(key = @sdbm.key(val))
       assert_not_nil(i = keys.index(key))
       assert_equal(val, values[i])
 
@@ -530,12 +530,6 @@
     @sdbm = SDBM.new(@path)
   end
 
-  def test_index
-    assert_equal(nil, @sdbm.index("foo"))
-    @sdbm["bar"] = "foo"
-    assert_equal("bar", @sdbm.index("foo"))
-  end
-
   def test_readonly
     @sdbm["bar"] = "baz"
     @sdbm.close

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/