Refactor tests to not use self or same variable names.

Author: aardvark179

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

@@ -327,13 +327,13 @@ static VALUE object_spec_rb_ivar_defined(VALUE self, VALUE obj, VALUE sym_name)
   return rb_ivar_defined(obj, SYM2ID(sym_name));
 }
 
-static VALUE object_spec_rb_copy_generic_ivar(VALUE self, VALUE obj) {
-  rb_copy_generic_ivar(self, obj);
+static VALUE object_spec_rb_copy_generic_ivar(VALUE self, VALUE clone, VALUE obj) {
+  rb_copy_generic_ivar(clone, obj);
   return self;
 }
 
-static VALUE object_spec_rb_free_generic_ivar(VALUE self) {
-  rb_free_generic_ivar(self);
+static VALUE object_spec_rb_free_generic_ivar(VALUE self, VALUE obj) {
+  rb_free_generic_ivar(obj);
   return self;
 }
 
@@ -410,8 +410,8 @@ void Init_object_spec(void) {
   rb_define_method(cls, "rb_ivar_get", object_spec_rb_ivar_get, 2);
   rb_define_method(cls, "rb_ivar_set", object_spec_rb_ivar_set, 3);
   rb_define_method(cls, "rb_ivar_defined", object_spec_rb_ivar_defined, 2);
-  rb_define_method(cls, "rb_copy_generic_ivar", object_spec_rb_copy_generic_ivar, 1);
-  rb_define_method(cls, "rb_free_generic_ivar", object_spec_rb_free_generic_ivar, 0);
+  rb_define_method(cls, "rb_copy_generic_ivar", object_spec_rb_copy_generic_ivar, 2);
+  rb_define_method(cls, "rb_free_generic_ivar", object_spec_rb_free_generic_ivar, 1);
 }
 
 #ifdef __cplusplus

spec/ruby/optional/capi/object_spec.rb

@@ -858,16 +858,18 @@ def reach
       it "copies the instance variables from one object to another" do
         original = Object.new
         original.instance_variable_set(:@foo, :bar)
-        @o.rb_copy_generic_ivar(original)
-        @o.instance_variable_get(:@foo).should == :bar
+        clone = Object.new
+        @o.rb_copy_generic_ivar(clone, original)
+        clone.instance_variable_get(:@foo).should == :bar
       end
     end
 
     describe "rb_free_generic_ivar" do
       it "removes the instance variables from an object" do
-        @o.instance_variable_set(:@foo, :bar)
-        @o.rb_free_generic_ivar
-        @o.instance_variables.should == []
+        o = Object.new
+        o.instance_variable_set(:@baz, :flibble)
+        @o.rb_free_generic_ivar(o)
+        o.instance_variables.should == []
       end
     end
   end