st: add test for size of numhash and delete_safe

ruby · funny-falcon · Mar 8, 2012 · Mar 8, 2012 · Mar 8, 2012 · Mar 8, 2012
commit 638344c316a289b98a9e5b5f7ba9f4cd36ab6ac9
diff --git a/ext/-test-/st/numhash/numhash.c b/ext/-test-/st/numhash/numhash.c
@@ -81,6 +81,23 @@ numhash_update(VALUE self, VALUE key)
 	return Qfalse;
 }
 
+static VALUE
+numhash_size(VALUE self)
+{
+    return LONG2FIX(((st_table*)DATA_PTR(self))->num_entries);
+}
+
+static VALUE
+numhash_delete_safe(VALUE self, VALUE key)
+{
+    VALUE val;
+    if (st_delete_safe((st_table*)DATA_PTR(self),
+		(st_data_t*)&key, (st_data_t*)&val, (st_data_t)-1)) {
+	return val;
+    }
+    return Qnil;
+}
+
 void
 Init_numhash(void)
 {
@@ -91,5 +108,7 @@ Init_numhash(void)
     rb_define_method(st, "[]=", numhash_aset, 2);
     rb_define_method(st, "each", numhash_each, 0);
     rb_define_method(st, "update", numhash_update, 1);
+    rb_define_method(st, "size", numhash_size, 0);
+    rb_define_method(st, "delete_safe", numhash_delete_safe, 1);
 }
 
diff --git a/test/-ext-/st/test_numhash.rb b/test/-ext-/st/test_numhash.rb
@@ -23,5 +23,14 @@ def test_update
       assert_equal(:x, @tbl[0])
       assert_equal(:x, @tbl[5])
     end
+
+    def test_size_after_delete_safe
+      10.downto(1) do |up|
+        tbl = Bug::StNumHash.new
+        1.upto(up){|i| tbl[i] = i}
+        assert_equal(1, tbl.delete_safe(1))
+        assert_equal(up - 1, tbl.size, "delete_safe doesn't change size from #{up} to #{up-1}")
+      end
+    end
   end
 end