Improve specs related to rb_get_alloc_func()

Author: eregon

spec/ruby/optional/capi/ext/object_spec.c

@@ -374,9 +374,9 @@ static VALUE speced_allocator_p(VALUE self, VALUE klass) {
   return (allocator == speced_allocator) ? Qtrue : Qfalse;
 }
 
-static VALUE allocator_nil_p(VALUE self, VALUE klass) {
+static VALUE custom_alloc_func_p(VALUE self, VALUE klass) {
   rb_alloc_func_t allocator = rb_get_alloc_func(klass);
-  return allocator ? Qfalse : Qtrue;
+  return allocator ? Qtrue : Qfalse;
 }
 
 void Init_object_spec(void) {
@@ -448,7 +448,7 @@ void Init_object_spec(void) {
   rb_define_method(cls, "rb_define_alloc_func", define_alloc_func, 1);
   rb_define_method(cls, "rb_undef_alloc_func", undef_alloc_func, 1);
   rb_define_method(cls, "speced_allocator?", speced_allocator_p, 1);
-  rb_define_method(cls, "allocator_nil?", allocator_nil_p, 1);
+  rb_define_method(cls, "custom_alloc_func?", custom_alloc_func_p, 1);
 }
 
 #ifdef __cplusplus

spec/ruby/optional/capi/object_spec.rb

@@ -886,74 +886,78 @@ def reach
         o.instance_variables.should == []
       end
     end
+  end
 
-    describe "allocator accessors" do
-      describe "rb_define_alloc_func" do
-        it "sets up the allocator" do
-          klass = Class.new
-          @o.rb_define_alloc_func(klass)
-          obj = klass.allocate
-          obj.class.should.equal?(klass)
-          obj.should have_instance_variable(:@from_custom_allocator)
-        end
+  describe "allocator accessors" do
+    describe "rb_define_alloc_func" do
+      it "sets up the allocator" do
+        klass = Class.new
+        @o.rb_define_alloc_func(klass)
+        obj = klass.allocate
+        obj.class.should.equal?(klass)
+        obj.should have_instance_variable(:@from_custom_allocator)
+      end
 
-        it "sets up the allocator for a subclass of String" do
-          klass = Class.new(String)
-          @o.rb_define_alloc_func(klass)
-          obj = klass.allocate
-          obj.class.should.equal?(klass)
-          obj.should have_instance_variable(:@from_custom_allocator)
-          obj.should == ""
-        end
+      it "sets up the allocator for a subclass of String" do
+        klass = Class.new(String)
+        @o.rb_define_alloc_func(klass)
+        obj = klass.allocate
+        obj.class.should.equal?(klass)
+        obj.should have_instance_variable(:@from_custom_allocator)
+        obj.should == ""
+      end
 
-        it "sets up the allocator for a subclass of Array" do
-          klass = Class.new(Array)
-          @o.rb_define_alloc_func(klass)
-          obj = klass.allocate
-          obj.class.should.equal?(klass)
-          obj.should have_instance_variable(:@from_custom_allocator)
-          obj.should == []
-        end
+      it "sets up the allocator for a subclass of Array" do
+        klass = Class.new(Array)
+        @o.rb_define_alloc_func(klass)
+        obj = klass.allocate
+        obj.class.should.equal?(klass)
+        obj.should have_instance_variable(:@from_custom_allocator)
+        obj.should == []
       end
+    end
 
-      describe "rb_get_alloc_func" do
-        it "gets the allocator that is defined directly on a class" do
-          klass = Class.new
-          @o.rb_define_alloc_func(klass)
-          @o.speced_allocator?(Object).should be_false
-          @o.speced_allocator?(klass).should be_true
-        end
+    describe "rb_get_alloc_func" do
+      it "gets the allocator that is defined directly on a class" do
+        klass = Class.new
+        @o.rb_define_alloc_func(klass)
+        @o.speced_allocator?(Object).should == false
+        @o.speced_allocator?(klass).should == true
+      end
 
-        it "gets the allocator that is inherited" do
-          parent = Class.new
-          @o.rb_define_alloc_func(parent)
-          klass = Class.new(parent)
-          @o.speced_allocator?(Object).should be_false
-          @o.speced_allocator?(klass).should be_true
-        end
+      it "gets the allocator that is inherited" do
+        parent = Class.new
+        @o.rb_define_alloc_func(parent)
+        klass = Class.new(parent)
+        @o.speced_allocator?(Object).should == false
+        @o.speced_allocator?(klass).should == true
       end
+    end
 
-      describe "rb_undef_alloc_func" do
-        it "does nothing when called on a class without a custom allocator" do
-          -> { @o.allocator_nil?(Class.new) }.should_not raise_error
-        end
+    describe "rb_undef_alloc_func" do
+      it "makes rb_get_alloc_func() return NULL for a class without a custom allocator" do
+        klass = Class.new
+        @o.rb_undef_alloc_func(klass)
+        @o.custom_alloc_func?(klass).should == false
+      end
 
-        it "undefs the allocator for the class" do
-          klass = Class.new
-          @o.rb_define_alloc_func(klass)
-          @o.speced_allocator?(klass).should be_true
-          @o.rb_undef_alloc_func(klass)
-          @o.allocator_nil?(klass).should be_true
-        end
+      it "undefs the allocator for the class" do
+        klass = Class.new
+        @o.rb_define_alloc_func(klass)
+        @o.speced_allocator?(klass).should == true
+        @o.rb_undef_alloc_func(klass)
+        @o.custom_alloc_func?(klass).should == false
+      end
 
-        it "undefs the allocator for a class that inherits a allocator" do
-          parent = Class.new
-          @o.rb_define_alloc_func(parent)
-          klass = Class.new(parent)
-          @o.speced_allocator?(klass).should be_true
-          @o.rb_undef_alloc_func(klass)
-          @o.allocator_nil?(klass).should be_true
-        end
+      it "undefs the allocator for a class that inherits a allocator" do
+        parent = Class.new
+        @o.rb_define_alloc_func(parent)
+        klass = Class.new(parent)
+        @o.speced_allocator?(klass).should == true
+        @o.rb_undef_alloc_func(klass)
+        @o.custom_alloc_func?(klass).should == false
+
+        @o.speced_allocator?(parent).should == true
       end
     end
   end