forgot some checkins.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1363 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 621 insertions, 30 deletions

diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c
index d6cda918e4..507fae69c1 100644
--- a/ext/sdbm/init.c
+++ b/ext/sdbm/init.c
@@ -16,7 +16,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-VALUE cSDBM;
+static VALUE cSDBM;
 
 struct dbmdata {
     int  di_size;
@@ -44,16 +44,28 @@ free_sdbm(dbmp)
 }
 
 static VALUE
-fsdbm_s_open(argc, argv, klass)
+fsdbm_close(obj)
+    VALUE obj;
+{
+    struct dbmdata *dbmp;
+
+    GetDBM(obj, dbmp);
+    sdbm_close(dbmp->di_dbm);
+    dbmp->di_dbm = 0;
+
+    return Qnil;
+}
+
+static VALUE
+fsdbm_initialize(argc, argv, obj)
     int argc;
     VALUE *argv;
-    VALUE klass;
+    VALUE obj;
 {
     VALUE file, vmode;
     DBM *dbm;
     struct dbmdata *dbmp;
     int mode;
-    VALUE obj;
 
     if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
 	mode = 0666;		/* default value */
@@ -64,7 +76,7 @@ fsdbm_s_open(argc, argv, klass)
     else {
 	mode = NUM2INT(vmode);
     }
-    Check_SafeStr(file);
+    SafeStringValue(file);
 
     dbm = 0;
     if (mode >= 0)
@@ -79,7 +91,8 @@ fsdbm_s_open(argc, argv, klass)
 	rb_sys_fail(RSTRING(file)->ptr);
     }
 
-    obj = Data_Make_Struct(klass,struct dbmdata,0,free_sdbm,dbmp);
+    dbmp = ALLOC(struct dbmdata);
+    DATA_PTR(obj) = dbmp;
     dbmp->di_dbm = dbm;
     dbmp->di_size = -1;
 
@@ -87,16 +100,33 @@ fsdbm_s_open(argc, argv, klass)
 }
 
 static VALUE
-fsdbm_close(obj)
-    VALUE obj;
+fsdbm_s_new(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
 {
-    struct dbmdata *dbmp;
+    VALUE obj = Data_Wrap_Struct(klass, 0, free_sdbm, 0);
+    rb_obj_call_init(obj, argc, argv);
+    return obj;
+}
 
-    GetDBM(obj, dbmp);
-    sdbm_close(dbmp->di_dbm);
-    dbmp->di_dbm = 0;
+static VALUE
+fsdbm_s_open(argc, argv, klass)
+    int argc;
+    VALUE *argv;
+    VALUE klass;
+{
+    VALUE obj = Data_Wrap_Struct(klass, 0, free_sdbm, 0);
 
-    return Qnil;
+    if (NIL_P(fsdbm_initialize(argc, argv, obj))) {
+	return Qnil;
+    }
+
+    if (rb_block_given_p()) {
+        return rb_ensure(rb_yield, obj, fsdbm_close, obj);
+    }
+
+    return obj;
 }
 
 static VALUE
@@ -107,7 +137,7 @@ fsdbm_fetch(obj, keystr, ifnone)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    Check_Type(keystr, T_STRING);
+    StringValue(keystr);
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
@@ -135,10 +165,14 @@ fsdbm_fetch_m(argc, argv, obj)
     VALUE *argv;
     VALUE obj;
 {
-    VALUE keystr, ifnone;
+    VALUE keystr, valstr, ifnone;
 
     rb_scan_args(argc, argv, "11", &keystr, &ifnone);
-    return fsdbm_fetch(obj, keystr, ifnone);
+    valstr = fsdbm_fetch(obj, keystr, ifnone);
+    if (argc == 1 && !rb_block_given_p() && NIL_P(valstr))
+	rb_raise(rb_eIndexError, "key not found");
+
+    return valstr;
 }
 
 static VALUE
@@ -149,7 +183,7 @@ fsdbm_index(obj, valstr)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    Check_Type(valstr, T_STRING);
+    StringValue(valstr);
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
@@ -190,12 +224,13 @@ fsdbm_delete(obj, keystr)
     DBM *dbm;
 
     rb_secure(4);
-    Check_Type(keystr, T_STRING);
+    StringValue(keystr);
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
+    dbmp->di_size = -1;
 
     value = sdbm_fetch(dbm, key);
     if (value.dptr == 0) {
@@ -229,10 +264,13 @@ fsdbm_shift(obj)
     key = sdbm_firstkey(dbm); 
     if (!key.dptr) return Qnil;
     val = sdbm_fetch(dbm, key);
-    sdbm_delete(dbm, key);
-
     keystr = rb_tainted_str_new(key.dptr, key.dsize);
     valstr = rb_tainted_str_new(val.dptr, val.dsize);
+    sdbm_delete(dbm, key);
+    if (dbmp->di_size >= 0) {
+	dbmp->di_size--;
+    }
+
     return rb_assoc_new(keystr, valstr);
 }
 
@@ -244,20 +282,34 @@ fsdbm_delete_if(obj)
     struct dbmdata *dbmp;
     DBM *dbm;
     VALUE keystr, valstr;
+    VALUE ret, ary = rb_ary_new();
+    int i, status = 0, n;
 
     rb_secure(4);
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
+    n = dbmp->di_size;
+    dbmp->di_size = -1;
     for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
 	val = sdbm_fetch(dbm, key);
 	keystr = rb_tainted_str_new(key.dptr, key.dsize);
 	valstr = rb_tainted_str_new(val.dptr, val.dsize);
-	if (RTEST(rb_yield(rb_assoc_new(keystr, valstr)))) {
-	    if (sdbm_delete(dbm, key)) {
-		rb_raise(rb_eRuntimeError, "sdbm_delete failed");
-	    }
+        ret = rb_protect(rb_yield, rb_assoc_new(rb_str_dup(keystr), valstr), &status);
+        if (status != 0) break;
+	if (RTEST(ret)) rb_ary_push(ary, keystr);
+    }
+
+    for (i = 0; i < RARRAY(ary)->len; i++) {
+	keystr = RARRAY(ary)->ptr[i];
+	key.dptr = RSTRING(keystr)->ptr;
+	key.dsize = RSTRING(keystr)->len;
+	if (sdbm_delete(dbm, key)) {
+	    rb_raise(rb_eRuntimeError, "sdbm_delete failed");
 	}
     }
+    if (status) rb_jump_tag(status);
+    if (n > 0) dbmp->di_size = n - RARRAY(ary)->len;
+
     return obj;
 }
 
@@ -273,11 +325,13 @@ fsdbm_clear(obj)
     GetDBM(obj, dbmp);
     dbm = dbmp->di_dbm;
     dbmp->di_size = -1;
-    for (key = sdbm_firstkey(dbm); key.dptr; key = sdbm_nextkey(dbm)) {
+    while (key = sdbm_firstkey(dbm), key.dptr) {
 	if (sdbm_delete(dbm, key)) {
 	    rb_raise(rb_eRuntimeError, "sdbm_delete failed");
 	}
     }
+    dbmp->di_size = 0;
+
     return obj;
 }
 
@@ -299,7 +353,7 @@ fsdbm_invert(obj)
 	valstr = rb_tainted_str_new(val.dptr, val.dsize);
 	rb_hash_aset(hash, valstr, keystr);
     }
-    return obj;
+    return hash;
 }
 
 static VALUE
@@ -528,7 +582,7 @@ fsdbm_has_key(obj, keystr)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    Check_Type(keystr, T_STRING);
+    StringValue(keystr);
     key.dptr = RSTRING(keystr)->ptr;
     key.dsize = RSTRING(keystr)->len;
 
@@ -547,7 +601,7 @@ fsdbm_has_value(obj, valstr)
     struct dbmdata *dbmp;
     DBM *dbm;
 
-    Check_Type(valstr, T_STRING);
+    StringValue(valstr);
     val.dptr = RSTRING(valstr)->ptr;
     val.dsize = RSTRING(valstr)->len;
 
@@ -620,7 +674,8 @@ Init_sdbm()
     rb_include_module(cSDBM, rb_mEnumerable);
 
     rb_define_singleton_method(cSDBM, "open", fsdbm_s_open, -1);
-    rb_define_singleton_method(cSDBM, "new", fsdbm_s_open, -1);
+    rb_define_singleton_method(cSDBM, "new", fsdbm_s_new, -1);
+    rb_define_method(cSDBM, "initialize", fsdbm_initialize, -1);
     rb_define_method(cSDBM, "close", fsdbm_close, 0);
     rb_define_method(cSDBM, "[]", fsdbm_aref, 1);
     rb_define_method(cSDBM, "fetch", fsdbm_fetch_m, -1);
@@ -638,7 +693,7 @@ Init_sdbm()
     rb_define_method(cSDBM, "each_pair", fsdbm_each_pair, 0);
     rb_define_method(cSDBM, "keys", fsdbm_keys, 0);
     rb_define_method(cSDBM, "values", fsdbm_values, 0);
-    rb_define_method(cSDBM, "shift", fsdbm_shift, 1);
+    rb_define_method(cSDBM, "shift", fsdbm_shift, 0);
     rb_define_method(cSDBM, "delete", fsdbm_delete, 1);
     rb_define_method(cSDBM, "delete_if", fsdbm_delete_if, 0);
     rb_define_method(cSDBM, "reject!", fsdbm_delete_if, 0);
diff --git a/ext/sdbm/testsdbm.rb b/ext/sdbm/testsdbm.rb
new file mode 100644
index 0000000000..2cea1e4144
--- /dev/null
+++ b/ext/sdbm/testsdbm.rb
@@ -0,0 +1,536 @@
+require 'runit/testcase'
+require 'runit/cui/testrunner'
+
+if $".grep(/\bsdbm.so\b/).empty?
+  begin
+    require './sdbm'
+  rescue LoadError
+    require 'sdbm'
+  end
+end
+
+def uname_s
+  require 'rbconfig'
+  case Config::CONFIG['host_os']
+  when 'cygwin'
+    require 'Win32API'
+    uname = Win32API.new 'cygwin1', 'uname', 'P', 'I'
+    utsname = ' ' * 100
+    raise 'cannot get system name' if uname.call(utsname) == -1
+
+    utsname.unpack('A20' * 5)[0]
+  else
+    Config::CONFIG['host_os']
+  end
+end
+
+SYSTEM = uname_s
+
+class TestSDBM < RUNIT::TestCase
+  def setup
+    @path = "tmptest_sdbm_"
+    assert_instance_of(SDBM, @sdbm = SDBM.new(@path))
+  end
+  def teardown
+    assert_nil(@sdbm.close)
+    GC.start
+    File.delete *Dir.glob("tmptest_sdbm*").to_a
+    p Dir.glob("tmptest_sdbm*") if $DEBUG
+  end
+
+  def check_size(expect, sdbm=@sdbm)
+    assert_equals(expect, sdbm.size)
+    n = 0
+    sdbm.each { n+=1 }
+    assert_equals(expect, n)
+    if expect == 0
+      assert_equals(true, sdbm.empty?)
+    else
+      assert_equals(false, sdbm.empty?)
+    end
+  end
+
+  def test_version
+    STDERR.print SDBM::VERSION
+  end
+
+  def test_s_new_has_no_block
+    # SDBM.new ignore the block
+    foo = true
+    assert_instance_of(SDBM, sdbm = SDBM.new("tmptest_sdbm") { foo = false })
+    assert_equals(foo, true)
+    assert_nil(sdbm.close)
+  end
+  def test_s_open_no_create
+    assert_nil(sdbm = SDBM.open("tmptest_sdbm", nil))
+  ensure
+    sdbm.close if sdbm
+  end
+  def test_s_open_with_block
+    assert_equals(SDBM.open("tmptest_sdbm") { :foo }, :foo)
+  end
+=begin
+  # Is it guaranteed on many OS?
+  def test_s_open_lock_one_process
+    # locking on one process
+    assert_instance_of(SDBM, sdbm  = SDBM.open("tmptest_sdbm", 0644))
+    assert_exception(Errno::EWOULDBLOCK) {
+      begin
+	SDBM.open("tmptest_sdbm", 0644)
+      rescue Errno::EAGAIN
+	raise Errno::EWOULDBLOCK
+      end
+    }
+  end
+=end
+
+  def test_s_open_nolock
+    # sdbm 1.8.0 specific
+    if not defined? SDBM::NOLOCK
+      return
+    end
+
+    fork() {
+      assert_instance_of(SDBM, sdbm  = SDBM.open("tmptest_sdbm", 0644,
+						SDBM::NOLOCK))
+      sleep 2
+    }
+    sleep 1
+    begin
+      sdbm2 = nil
+      assert_no_exception(Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::EACCES) {
+	assert_instance_of(SDBM, sdbm2 = SDBM.open("tmptest_sdbm", 0644))
+      }
+    ensure
+      Process.wait
+      sdbm2.close if sdbm2
+    end
+
+    p Dir.glob("tmptest_sdbm*") if $DEBUG
+
+    fork() {
+      assert_instance_of(SDBM, sdbm  = SDBM.open("tmptest_sdbm", 0644))
+      sleep 2
+    }
+    begin
+      sleep 1
+      sdbm2 = nil
+      assert_no_exception(Errno::EWOULDBLOCK, Errno::EAGAIN, Errno::EACCES) {
+	# this test is failed on Cygwin98 (???)
+	assert_instance_of(SDBM, sdbm2 = SDBM.open("tmptest_sdbm", 0644,
+						   SDBM::NOLOCK))
+      }
+    ensure
+      Process.wait
+      sdbm2.close if sdbm2
+    end
+  end
+
+  def test_s_open_error
+    assert_instance_of(SDBM, sdbm = SDBM.open("tmptest_sdbm", 0))
+    assert_exception(Errno::EACCES) {
+      SDBM.open("tmptest_sdbm", 0)
+    }
+    sdbm.close
+  end
+
+  def test_close
+    assert_instance_of(SDBM, sdbm = SDBM.open("tmptest_sdbm"))
+    assert_nil(sdbm.close)
+
+    # closed SDBM file
+    assert_exception(RuntimeError) { sdbm.close }
+  end
+
+  def test_aref
+    assert_equals('bar', @sdbm['foo'] = 'bar')
+    assert_equals('bar', @sdbm['foo'])
+
+    assert_nil(@sdbm['bar'])
+  end
+
+  def test_fetch
+    assert_equals('bar', @sdbm['foo']='bar')
+    assert_equals('bar', @sdbm.fetch('foo'))
+
+    # key not found
+    assert_exception(IndexError) {
+      @sdbm.fetch('bar')
+    }
+
+    # test for `ifnone' arg
+    assert_equals('baz', @sdbm.fetch('bar', 'baz'))
+
+    # test for `ifnone' block
+    assert_equals('foobar', @sdbm.fetch('bar') {|key| 'foo' + key })
+  end
+
+  def test_aset
+    num = 0
+    2.times {|i|
+      assert_equals('foo', @sdbm['foo'] = 'foo')
+      assert_equals('foo', @sdbm['foo'])
+      assert_equals('bar', @sdbm['foo'] = 'bar')
+      assert_equals('bar', @sdbm['foo'])
+
+      num += 1 if i == 0
+      assert_equals(num, @sdbm.size)
+
+      # assign nil
+      assert_equals('', @sdbm['bar'] = '')
+      assert_equals('', @sdbm['bar'])
+
+      num += 1 if i == 0
+      assert_equals(num, @sdbm.size)
+
+      # empty string
+      assert_equals('', @sdbm[''] = '')
+      assert_equals('', @sdbm[''])
+
+      num += 1 if i == 0
+      assert_equals(num, @sdbm.size)
+
+      # Fixnum
+      assert_equals('200', @sdbm['100'] = '200')
+      assert_equals('200', @sdbm['100'])
+
+      num += 1 if i == 0
+      assert_equals(num, @sdbm.size)
+
+      # Big key and value
+      assert_equals('y' * 100, @sdbm['x' * 100] = 'y' * 100)
+      assert_equals('y' * 100, @sdbm['x' * 100])
+
+      num += 1 if i == 0
+      assert_equals(num, @sdbm.size)
+    }
+  end
+
+  def test_index
+    assert_equals('bar', @sdbm['foo'] = 'bar')
+    assert_equals('foo', @sdbm.index('bar'))
+    assert_nil(@sdbm['bar'])
+  end
+
+  def test_indexes
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
+    assert_equals(values.reverse, @sdbm.indexes(*keys.reverse))
+  end
+
+  def test_length
+    num = 10
+    assert_equals(0, @sdbm.size)
+    num.times {|i|
+      i = i.to_s
+      @sdbm[i] = i
+    }
+    assert_equals(num, @sdbm.size)
+
+    @sdbm.shift
+
+    assert_equals(num - 1, @sdbm.size)
+  end
+
+  def test_empty?
+    assert_equals(true, @sdbm.empty?)
+    @sdbm['foo'] = 'FOO'
+    assert_equals(false, @sdbm.empty?)
+  end
+
+  def test_each_pair
+    n = 0
+    @sdbm.each_pair { n += 1 }
+    assert_equals(0, n)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
+
+    n = 0
+    ret = @sdbm.each_pair {|key, val|
+      assert_not_nil(i = keys.index(key))
+      assert_equals(val, values[i])
+
+      n += 1
+    }
+    assert_equals(keys.size, n)
+    assert_equals(@sdbm, ret)
+  end
+
+  def test_each_value
+    n = 0
+    @sdbm.each_value { n += 1 }
+    assert_equals(0, n)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
+
+    n = 0
+    ret = @sdbm.each_value {|val|
+      assert_not_nil(key = @sdbm.index(val))
+      assert_not_nil(i = keys.index(key))
+      assert_equals(val, values[i])
+
+      n += 1
+    }
+    assert_equals(keys.size, n)
+    assert_equals(@sdbm, ret)
+  end
+
+  def test_each_key
+    n = 0
+    @sdbm.each_key { n += 1 }
+    assert_equals(0, n)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
+
+    n = 0
+    ret = @sdbm.each_key {|key|
+      assert_not_nil(i = keys.index(key))
+      assert_equals(@sdbm[key], values[i])
+
+      n += 1
+    }
+    assert_equals(keys.size, n)
+    assert_equals(@sdbm, ret)
+  end
+
+  def test_keys
+    assert_equals([], @sdbm.keys)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
+
+    assert_equals(keys.sort, @sdbm.keys.sort)
+    assert_equals(values.sort, @sdbm.values.sort)
+  end
+
+  def test_values
+    test_keys
+  end
+
+  def test_shift
+    assert_nil(@sdbm.shift)
+    assert_equals(0, @sdbm.size)
+
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+
+    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
+
+    ret_keys = []
+    ret_values = []
+    while ret = @sdbm.shift
+      ret_keys.push ret[0]
+      ret_values.push ret[1]
+
+      assert_equals(keys.size - ret_keys.size, @sdbm.size)
+    end
+
+    assert_equals(keys.sort, ret_keys.sort)
+    assert_equals(values.sort, ret_values.sort)
+  end
+
+  def test_delete
+    keys = %w(foo bar baz)
+    values = %w(FOO BAR BAZ)
+    key = keys[1]
+
+    assert_nil(@sdbm.delete(key))
+    assert_equals(0, @sdbm.size)
+
+    @sdbm[keys[0]], @sdbm[keys[1]], @sdbm[keys[2]] = values
+
+    assert_equals(@sdbm, @sdbm.delete(key))
+    assert_nil(@sdbm[key])
+    assert_equals(2, @sdbm.size)
+
+    assert_nil(@sdbm.delete(key))
+  end
+  def test_delete_with_block
+    key = 'no called block'
+    @sdbm[key] = 'foo'
+    assert_equals(@sdbm, @sdbm.delete(key) {|k| k.replace 'called block'})
+    assert_equals('no called block', key)
+    assert_equals(0, @sdbm.size)
+
+    key = 'no called block'
+    assert_nil(@sdbm.delete(key) {|k| k.replace 'called block'})
+    assert_equals('called block', key)
+    assert_equals(0, @sdbm.size)
+  end
+
+  def test_delete_if
+    v = "0"
+    100.times {@sdbm[v] = v; v = v.next}
+
+    ret = @sdbm.delete_if {|key, val| key.to_i < 50}
+    assert_equals(@sdbm, ret)
+    check_size(50, @sdbm)
+
+    ret = @sdbm.delete_if {|key, val| key.to_i >= 50}
+    assert_equals(@sdbm, ret)
+    check_size(0, @sdbm)
+
+    # break
+    v = "0"
+    100.times {@sdbm[v] = v; v = v.next}
+    check_size(100, @sdbm)
+    n = 0;
+    @sdbm.delete_if {|key, val|
+      break if n > 50
+      n+=1
+      true
+    }
+    assert_equals(51, n)
+    check_size(49, @sdbm)
+
+    @sdbm.clear
+
+    # raise
+    v = "0"
+    100.times {@sdbm[v] = v; v = v.next}
+    check_size(100, @sdbm)
+    n = 0;
+    begin
+      @sdbm.delete_if {|key, val|
+	raise "runtime error" if n > 50
+	n+=1
+	true
+      }
+    rescue
+    end
+    assert_equals(51, n)
+    check_size(49, @sdbm)
+  end
+
+  def test_reject
+    v = "0"
+    100.times {@sdbm[v] = v; v = v.next}
+
+    hash = @sdbm.reject {|key, val| key.to_i < 50}
+    assert_instance_of(Hash, hash)
+    assert_equals(100, @sdbm.size)
+
+    assert_equals(50, hash.size)
+    hash.each_pair {|key,val|
+      assert_equals(false, key.to_i < 50)
+      assert_equals(key, val)
+    }
+
+    hash = @sdbm.reject {|key, val| key.to_i < 100}
+    assert_instance_of(Hash, hash)
+    assert_equals(true, hash.empty?)
+  end
+
+  def test_clear
+    v = "1"
+    100.times {v = v.next; @sdbm[v] = v}
+
+    assert_equals(@sdbm, @sdbm.clear)
+
+    # validate SDBM#size
+    i = 0
+    @sdbm.each { i += 1 }
+    assert_equals(@sdbm.size, i)
+    assert_equals(0, i)
+  end
+
+  def test_invert
+    v = "0"
+    100.times {@sdbm[v] = v; v = v.next}
+
+    hash = @sdbm.invert
+    assert_instance_of(Hash, hash)
+    assert_equals(100, hash.size)
+    hash.each_pair {|key, val|
+      assert_equals(key.to_i, val.to_i)
+    }
+  end
+
+  def test_update
+    hash = {}
+    v = "0"
+    100.times {v = v.next; hash[v] = v}
+
+    @sdbm["101"] = "101"
+    @sdbm.update hash
+    assert_equals(101, @sdbm.size)
+    @sdbm.each_pair {|key, val|
+      assert_equals(key.to_i, val.to_i)
+    }
+  end
+
+  def test_replace
+    hash = {}
+    v = "0"
+    100.times {v = v.next; hash[v] = v}
+
+    @sdbm["101"] = "101"
+    @sdbm.replace hash
+    assert_equals(100, @sdbm.size)
+    @sdbm.each_pair {|key, val|
+      assert_equals(key.to_i, val.to_i)
+    }
+  end
+
+  def test_haskey?
+    assert_equals('bar', @sdbm['foo']='bar')
+    assert_equals(true,  @sdbm.has_key?('foo'))
+    assert_equals(false, @sdbm.has_key?('bar'))
+  end
+
+  def test_has_value?
+    assert_equals('bar', @sdbm['foo']='bar')
+    assert_equals(true,  @sdbm.has_value?('bar'))
+    assert_equals(false, @sdbm.has_value?('foo'))
+  end
+
+  def test_to_a
+    v = "0"
+    100.times {v = v.next; @sdbm[v] = v}
+
+    ary = @sdbm.to_a
+    assert_instance_of(Array, ary)
+    assert_equals(100, ary.size)
+    ary.each {|key,val|
+      assert_equals(key.to_i, val.to_i)
+    }
+  end
+
+  def test_to_hash
+    v = "0"
+    100.times {v = v.next; @sdbm[v] = v}
+
+    hash = @sdbm.to_hash
+    assert_instance_of(Hash, hash)
+    assert_equals(100, hash.size)
+    hash.each {|key,val|
+      assert_equals(key.to_i, val.to_i)
+    }
+  end
+end
+
+if $0 == __FILE__
+  if ARGV.size == 0
+    suite = RUNIT::TestSuite.new
+    suite.add_test(TestSDBM.suite)
+  else
+    suite = RUNIT::TestSuite.new
+    ARGV.each do |testmethod|
+      suite.add_test(TestSDBM.new(testmethod))
+    end
+  end
+
+  RUNIT::CUI::TestRunner.run(suite)
+end