gir_ffi 0.7.8 → 0.7.9

data/test/gir_ffi/info_ext/i_unresolved_info_test.rb

@@ -9,9 +9,9 @@ describe GirFFI::InfoExt::IUnresolvedInfo do
 
   let(:unresolved_info) { klass.new }
 
-  describe '#to_ffitype' do
+  describe '#to_ffi_type' do
     it 'returns the most generic type' do
-      unresolved_info.to_ffitype.must_equal :pointer
+      unresolved_info.to_ffi_type.must_equal :pointer
     end
   end
 end

data/test/gir_ffi/info_ext/safe_constant_name_test.rb

@@ -10,13 +10,13 @@ describe GirFFI::InfoExt::SafeConstantName do
 
   describe '#safe_name' do
     it 'makes names starting with an underscore safe' do
-      mock(info).name { '_foo' }
+      expect(info).to receive(:name).and_return '_foo'
 
       assert_equal 'Private___foo', info.safe_name
     end
 
     it 'makes names with dashes safe' do
-      mock(info).name { 'this-could-be-a-signal-name' }
+      expect(info).to receive(:name).and_return 'this-could-be-a-signal-name'
 
       info.safe_name.must_equal 'This_could_be_a_signal_name'
     end

data/test/gir_ffi/info_ext/safe_function_name_test.rb

@@ -10,13 +10,13 @@ describe GirFFI::InfoExt::SafeFunctionName do
 
   describe '#safe_name' do
     it 'keeps lower case names lower case' do
-      mock(info).name { 'foo' }
+      expect(info).to receive(:name).and_return 'foo'
 
       assert_equal 'foo', info.safe_name
     end
 
     it 'returns a non-empty string if name is empty' do
-      mock(info).name { '' }
+      expect(info).to receive(:name).and_return ''
 
       assert_equal '_', info.safe_name
     end

data/test/gir_ffi/interface_base_test.rb

@@ -5,14 +5,14 @@ describe GirFFI::InterfaceBase do
 
   describe '#wrap' do
     it 'delegates conversion to the wrapped pointer' do
-      mock(ptr = Object.new).to_object { 'good-result' }
+      expect(ptr = Object.new).to receive(:to_object).and_return 'good-result'
       interface.wrap(ptr).must_equal 'good-result'
     end
   end
 
-  describe '.to_ffitype' do
+  describe '.to_ffi_type' do
     it 'returns :pointer' do
-      interface.to_ffitype.must_equal :pointer
+      interface.to_ffi_type.must_equal :pointer
     end
   end
 end

data/test/gir_ffi/object_base_test.rb

@@ -5,14 +5,14 @@ describe GirFFI::ObjectBase do
 
   describe '.wrap' do
     it 'delegates conversion to the wrapped pointer' do
-      mock(ptr = Object.new).to_object { 'good-result' }
+      expect(ptr = Object.new).to receive(:to_object).and_return 'good-result'
       derived_class.wrap(ptr).must_equal 'good-result'
     end
   end
 
-  describe '.to_ffitype' do
+  describe '.to_ffi_type' do
     it 'returns :pointer' do
-      derived_class.to_ffitype.must_equal :pointer
+      derived_class.to_ffi_type.must_equal :pointer
     end
   end
 end

data/test/gir_ffi/sized_array_test.rb

@@ -3,7 +3,7 @@ require 'gir_ffi_test_helper'
 describe GirFFI::SizedArray do
   describe '::wrap' do
     it 'takes a type, size and pointer and returns a GirFFI::SizedArray wrapping them' do
-      mock(ptr = Object.new).null? { false }
+      expect(ptr = Object.new).to receive(:null?).and_return false
       sarr = GirFFI::SizedArray.wrap :gint32, 3, ptr
       assert_instance_of GirFFI::SizedArray, sarr
       assert_equal ptr, sarr.to_ptr
@@ -12,7 +12,7 @@ describe GirFFI::SizedArray do
     end
 
     it 'returns nil if the wrapped pointer is null' do
-      mock(ptr = Object.new).null? { true }
+      expect(ptr = Object.new).to receive(:null?).and_return true
       sarr = GirFFI::SizedArray.wrap :gint32, 3, ptr
       sarr.must_be_nil
     end

data/test/gir_ffi/type_map_test.rb

@@ -1,14 +1,14 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::TypeMap do
-  describe '.type_specification_to_ffitype' do
+  describe '.type_specification_to_ffi_type' do
     it 'returns the nested FFI::Enum for an Enum module' do
-      GirFFI::TypeMap.type_specification_to_ffitype(GLib::DateMonth).
+      GirFFI::TypeMap.type_specification_to_ffi_type(GLib::DateMonth).
         must_equal GLib::DateMonth
     end
 
     it 'returns the class itself for a Struct class' do
-      GirFFI::TypeMap.type_specification_to_ffitype(GObject::EnumValue).
+      GirFFI::TypeMap.type_specification_to_ffi_type(GObject::EnumValue).
         must_equal GObject::EnumValue
     end
   end

data/test/gir_ffi/unintrospectable_type_info_test.rb

@@ -15,8 +15,8 @@ describe GirFFI::UnintrospectableTypeInfo do
         gobject = Object.new
         gir = Object.new
 
-        mock(gobject).type_parent(:some_type) { :foo }
-        mock(gir).find_by_gtype(:foo) { :foo_info }
+        expect(gobject).to receive(:type_parent).with(:some_type).and_return :foo
+        expect(gir).to receive(:find_by_gtype).with(:foo).and_return :foo_info
 
         info = GirFFI::UnintrospectableTypeInfo.new(:some_type, gir, gobject)
 
@@ -29,8 +29,8 @@ describe GirFFI::UnintrospectableTypeInfo do
         gobject = Object.new
         gir = Object.new
 
-        mock(gobject).type_parent(:some_type) { :foo }
-        mock(gir).find_by_gtype(:foo) { nil }
+        expect(gobject).to receive(:type_parent).with(:some_type).and_return :foo
+        expect(gir).to receive(:find_by_gtype).with(:foo).and_return nil
 
         info = GirFFI::UnintrospectableTypeInfo.new(:some_type, gir, gobject)
 
@@ -44,9 +44,9 @@ describe GirFFI::UnintrospectableTypeInfo do
       gobject = Object.new
       gir = Object.new
 
-      mock(gobject).type_interfaces(:some_type) { [:foo, :bar] }
-      mock(gir).find_by_gtype(:foo) { :foo_info }
-      mock(gir).find_by_gtype(:bar) { :bar_info }
+      expect(gobject).to receive(:type_interfaces).with(:some_type).and_return [:foo, :bar]
+      expect(gir).to receive(:find_by_gtype).with(:foo).and_return :foo_info
+      expect(gir).to receive(:find_by_gtype).with(:bar).and_return :bar_info
 
       info = GirFFI::UnintrospectableTypeInfo.new(:some_type, gir, gobject)
 
@@ -57,9 +57,9 @@ describe GirFFI::UnintrospectableTypeInfo do
       gobject = Object.new
       gir = Object.new
 
-      mock(gobject).type_interfaces(:some_type) { [:foo, :bar] }
-      mock(gir).find_by_gtype(:foo) { :foo_info }
-      mock(gir).find_by_gtype(:bar) { nil }
+      expect(gobject).to receive(:type_interfaces).with(:some_type).and_return [:foo, :bar]
+      expect(gir).to receive(:find_by_gtype).with(:foo).and_return :foo_info
+      expect(gir).to receive(:find_by_gtype).with(:bar).and_return nil
 
       info = GirFFI::UnintrospectableTypeInfo.new(:some_type, gir, gobject)
 
@@ -87,9 +87,9 @@ describe GirFFI::UnintrospectableTypeInfo do
       gir = Object.new
       parent_info = Object.new
 
-      mock(gobject).type_parent(:some_type) { :foo }
-      mock(gir).find_by_gtype(:foo) { parent_info }
-      mock(parent_info).namespace { 'FooNamespace' }
+      expect(gobject).to receive(:type_parent).with(:some_type).and_return :foo
+      expect(gir).to receive(:find_by_gtype).with(:foo).and_return parent_info
+      expect(parent_info).to receive(:namespace).and_return 'FooNamespace'
 
       info = GirFFI::UnintrospectableTypeInfo.new(:some_type, gir, gobject)
 
@@ -101,7 +101,7 @@ describe GirFFI::UnintrospectableTypeInfo do
     it 'finds the class name by gtype' do
       gobject = Object.new
 
-      mock(gobject).type_name(:some_type) { 'GSomeType' }
+      expect(gobject).to receive(:type_name).with(:some_type).and_return 'GSomeType'
 
       info = GirFFI::UnintrospectableTypeInfo.new(:some_type, nil, gobject)
 

data/test/gir_ffi/user_defined_property_info_test.rb

@@ -11,7 +11,7 @@ describe GirFFI::UserDefinedPropertyInfo do
 
   describe '#name' do
     it 'returns the name retrieved from the parameter specification' do
-      mock(param_spec = Object.new).get_name { :property_name }
+      expect(param_spec = Object.new).to receive(:get_name).and_return :property_name
       info = GirFFI::UserDefinedPropertyInfo.new param_spec
       info.name.must_equal :property_name
     end

data/test/gir_ffi/user_defined_type_info_test.rb

@@ -3,17 +3,20 @@ require 'gir_ffi/user_defined_type_info'
 
 describe GirFFI::UserDefinedTypeInfo do
   describe '#described_class' do
+    let(:info) { GirFFI::UserDefinedTypeInfo.new :some_class }
+
     it 'returns the class passed to #initialize' do
-      info = GirFFI::UserDefinedTypeInfo.new :some_class
       info.described_class.must_equal :some_class
     end
   end
 
   describe '#install_property' do
+    let(:info) { GirFFI::UserDefinedTypeInfo.new :some_class }
+    let(:foo_spec) { Object.new }
+
     it 'adds the passed in property to the list of properties' do
-      mock(foo_spec = Object.new).get_name { :foo }
+      expect(foo_spec).to receive(:get_name).and_return :foo
 
-      info = GirFFI::UserDefinedTypeInfo.new :some_class
       info.install_property foo_spec
       info.properties.map(&:name).must_equal [:foo]
     end
@@ -37,28 +40,38 @@ describe GirFFI::UserDefinedTypeInfo do
   end
 
   describe '#initialize' do
-    it 'yields the new object to the block passed' do
-      mock(foo_spec = Object.new).get_name { :foo }
-      mock(bar_spec = Object.new).get_name { :bar }
-
-      info = GirFFI::UserDefinedTypeInfo.new :some_class do |inf|
+    let(:foo_spec) { Object.new }
+    let(:bar_spec) { Object.new }
+    let(:info) {
+      GirFFI::UserDefinedTypeInfo.new :some_class do |inf|
         inf.install_property foo_spec
         inf.install_property bar_spec
       end
+    }
+
+    before do
+      expect(foo_spec).to receive(:get_name).and_return :foo
+      expect(bar_spec).to receive(:get_name).and_return :bar
+    end
+
+    it 'yields the new object to the block passed' do
       info.properties.map(&:name).must_equal [:foo, :bar]
     end
   end
 
   describe '#g_name' do
+    let(:klass) { Object.new }
+    let(:info) { GirFFI::UserDefinedTypeInfo.new klass }
+
+    before do
+      allow(klass).to receive(:name).and_return 'foo'
+    end
+
     it "returns the described class' name by default" do
-      mock(klass = Object.new).name { 'foo' }
-      info = GirFFI::UserDefinedTypeInfo.new klass
       info.g_name.must_equal 'foo'
     end
 
     it 'returns the the name set by #g_name= if present' do
-      stub(klass = Object.new).name { 'foo' }
-      info = GirFFI::UserDefinedTypeInfo.new klass
       info.g_name = 'bar'
       info.g_name.must_equal 'bar'
     end

data/test/gir_ffi/zero_terminated_test.rb

@@ -48,7 +48,6 @@ describe GirFFI::ZeroTerminated do
       end
       arr.must_equal [1, 2, 3]
     end
-
   end
 
   describe '#==' do

data/test/gir_ffi_test.rb

@@ -33,13 +33,13 @@ describe GirFFI do
       end
 
       it 'returns a GType for the derived class' do
-        parent_gtype = GIMarshallingTests::OverridesObject.get_gtype
+        parent_gtype = GIMarshallingTests::OverridesObject.gtype
         @gtype.wont_equal parent_gtype
         GObject.type_name(@gtype).must_equal @klass.name
       end
 
-      it 'makes #get_gtype on the registered class return the new GType' do
-        @klass.get_gtype.must_equal @gtype
+      it 'makes #gtype on the registered class return the new GType' do
+        @klass.gtype.must_equal @gtype
       end
 
       it 'registers a type with the same size as the parent' do

data/test/gir_ffi_test_helper.rb

@@ -53,6 +53,10 @@ module GirFFITestExtensions
     GObject::Object::Struct.new(object.to_ptr)[:ref_count]
   end
 
+  def ref object
+    object.ref
+  end
+
   def max_for_unsigned_type type
     (1 << (FFI.type_size(type) * 8)) - 1
   end

data/test/integration/generated_gimarshallingtests_test.rb

@@ -9,7 +9,7 @@ GirFFI.setup :GIMarshallingTests
 describe GIMarshallingTests do
   let(:derived_klass) {
     Object.const_set("DerivedClass#{Sequence.next}",
-                                         Class.new(GIMarshallingTests::Object))
+                     Class.new(GIMarshallingTests::Object))
   }
 
   def make_derived_instance
@@ -87,12 +87,12 @@ describe GIMarshallingTests do
 
   it 'has the constant CONSTANT_GERROR_DOMAIN' do
     assert_equal 'gi-marshalling-tests-gerror-domain',
-      GIMarshallingTests::CONSTANT_GERROR_DOMAIN
+                 GIMarshallingTests::CONSTANT_GERROR_DOMAIN
   end
 
   it 'has the constant CONSTANT_GERROR_MESSAGE' do
     assert_equal 'gi-marshalling-tests-gerror-message',
-      GIMarshallingTests::CONSTANT_GERROR_MESSAGE
+                 GIMarshallingTests::CONSTANT_GERROR_MESSAGE
   end
 
   it 'has the constant CONSTANT_NUMBER' do
@@ -198,11 +198,11 @@ describe GIMarshallingTests do
   describe 'GIMarshallingTests::Interface' do
     it 'has a working method #test_int8_in' do
       derived_klass.class_eval { include GIMarshallingTests::Interface }
-      instance = make_derived_instance do |info|
+      derived_instance = make_derived_instance do |info|
         info.install_vfunc_implementation :test_int8_in, proc { |obj, in_| obj.int = in_ }
       end
-      instance.test_int8_in 8
-      instance.int.must_equal 8
+      derived_instance.test_int8_in 8
+      derived_instance.int.must_equal 8
     end
   end
 
@@ -216,13 +216,13 @@ describe GIMarshallingTests do
     it 'has a working method #test_variant_array_in' do
       skip unless get_introspection_data 'GIMarshallingTests', 'Interface3'
       derived_klass.class_eval { include GIMarshallingTests::Interface3 }
-      instance = make_derived_instance do |info|
+      derived_instance = make_derived_instance do |info|
         info.install_vfunc_implementation :test_variant_array_in, proc {|obj, in_|
           obj.int = in_.to_a.first.get_byte
         }
       end
-      instance.test_variant_array_in [GLib::Variant.new_byte(42)]
-      instance.int.must_equal 42
+      derived_instance.test_variant_array_in [GLib::Variant.new_byte(42)]
+      derived_instance.int.must_equal 42
     end
   end
 
@@ -230,7 +230,7 @@ describe GIMarshallingTests do
     let(:instance) { GIMarshallingTests::NestedStruct.new }
     it 'has a writable field simple_struct' do
       assert_instance_of GIMarshallingTests::SimpleStruct,
-        instance.simple_struct
+                         instance.simple_struct
       new_struct = GIMarshallingTests::SimpleStruct.new
       new_struct.int8 = 42
       instance.simple_struct = new_struct
@@ -280,12 +280,14 @@ describe GIMarshallingTests do
 
     it 'has a working function #full_inout' do
       ob = GIMarshallingTests::Object.new 42
+      ref_count(ob).must_equal 1
 
       res = GIMarshallingTests::Object.full_inout ob
 
-      # TODO: Deal with the fact that ob is now invalid
+      ref_count(ob).must_be :>, 0
+      ref_count(res).must_equal 1
 
-      assert_instance_of GIMarshallingTests::Object, res
+      res.must_be_instance_of GIMarshallingTests::Object
       res.int.must_equal 0
     end
 
@@ -364,7 +366,7 @@ describe GIMarshallingTests do
         }
       end
       result = derived_instance.
-        get_ref_info_for_vfunc_in_object_transfer_full GIMarshallingTests::Object.get_gtype
+        get_ref_info_for_vfunc_in_object_transfer_full GIMarshallingTests::Object.gtype
       result.must_equal [1, false]
       obj.must_be_instance_of GIMarshallingTests::Object
     end
@@ -372,28 +374,32 @@ describe GIMarshallingTests do
     it 'has a working method #get_ref_info_for_vfunc_in_object_transfer_none' do
       skip unless get_vfunc_introspection_data('GIMarshallingTests', 'Object',
                                                'vfunc_in_object_transfer_none')
-      klass = nil
+      obj = nil
       derived_instance = make_derived_instance do |info|
         info.install_vfunc_implementation :vfunc_in_object_transfer_none, proc {|_this, object|
-          klass = object.class
+          obj = object
         }
       end
       result = derived_instance.
-        get_ref_info_for_vfunc_in_object_transfer_none GIMarshallingTests::Object.get_gtype
-      result.must_equal [1, false]
-      klass.must_equal GIMarshallingTests::Object
+        get_ref_info_for_vfunc_in_object_transfer_none GIMarshallingTests::Object.gtype
+      ref_count(obj).must_be :>, 0
+      result.must_equal [2, false]
+      obj.must_be_instance_of GIMarshallingTests::Object
     end
 
     it 'has a working method #get_ref_info_for_vfunc_out_object_transfer_full' do
       skip unless get_vfunc_introspection_data('GIMarshallingTests', 'Object',
                                                'vfunc_out_object_transfer_full')
+      obj = nil
       derived_instance = make_derived_instance do |info|
         info.install_vfunc_implementation :vfunc_out_object_transfer_full, proc {|_obj|
-          GIMarshallingTests::Object.new 42
+          obj = GIMarshallingTests::Object.new(42)
         }
       end
       result = derived_instance.get_ref_info_for_vfunc_out_object_transfer_full
-      result.must_equal [1, false]
+      ref_count(obj).must_be :>, 0
+      # TODO: Check desired result
+      result.must_equal [2, false]
     end
 
     it 'has a working method #get_ref_info_for_vfunc_out_object_transfer_none' do
@@ -417,7 +423,7 @@ describe GIMarshallingTests do
         }
       end
       result = derived_instance.get_ref_info_for_vfunc_return_object_transfer_full
-      result.must_equal [1, false]
+      result.must_equal [2, false]
     end
 
     it 'has a working method #get_ref_info_for_vfunc_return_object_transfer_none' do
@@ -1740,7 +1746,7 @@ describe GIMarshallingTests do
 
   it 'has a working function #garray_utf8_full_out_caller_allocated' do
     skip unless get_introspection_data 'GIMarshallingTests',
-      'garray_utf8_full_out_caller_allocated'
+                                       'garray_utf8_full_out_caller_allocated'
     res = GIMarshallingTests.garray_utf8_full_out_caller_allocated
     res.must_be :==, %w(0 1 2)
   end
@@ -2190,7 +2196,7 @@ describe GIMarshallingTests do
 
   it 'has a working function #gvalue_in_enum' do
     gv = GObject::Value.new
-    gv.init GIMarshallingTests::GEnum.get_gtype
+    gv.init GIMarshallingTests::GEnum.gtype
     gv.set_enum GIMarshallingTests::GEnum[:value3]
     GIMarshallingTests.gvalue_in_enum gv
     pass
@@ -2205,8 +2211,8 @@ describe GIMarshallingTests do
 
   it 'has a working function #gvalue_in_with_type' do
     gv = GObject::Value.new
-    gv.init GIMarshallingTests::SubSubObject.get_gtype
-    GIMarshallingTests.gvalue_in_with_type gv, GIMarshallingTests::Object.get_gtype
+    gv.init GIMarshallingTests::SubSubObject.gtype
+    GIMarshallingTests.gvalue_in_with_type gv, GIMarshallingTests::Object.gtype
   end
 
   it 'has a working function #gvalue_inout' do