gir_ffi 0.6.7 → 0.7.0

data/test/ffi-gobject_test.rb

@@ -9,7 +9,8 @@ describe GObject do
     it "emits a signal" do
       a = 1
       o = Regress::TestSubObj.new
-      callback = Proc.new { a = 2 }
+      prc = proc { a = 2 }
+      callback = GObject::Callback.from prc
       ::GObject::Lib.g_signal_connect_data o, "test", callback, nil, nil, 0
       GObject.signal_emit o, "test"
       assert_equal 2, a

data/test/gir_ffi/arg_helper_test.rb

@@ -1,7 +1,26 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::ArgHelper do
-  it "has no more tests" do
-    pass
+  describe ".cast_from_pointer" do
+    it "handles class types" do
+      klass = Class.new
+      mock(klass).wrap(:pointer_value) { :wrapped_value }
+      GirFFI::ArgHelper.cast_from_pointer(klass, :pointer_value).must_equal :wrapped_value
+    end
+
+    it "handles negative :gint8" do
+      ptr = FFI::Pointer.new(-127)
+      GirFFI::ArgHelper.cast_from_pointer(:gint8, ptr).must_equal(-127)
+    end
+
+    it "handles positive :gint8" do
+      ptr = FFI::Pointer.new(128)
+      GirFFI::ArgHelper.cast_from_pointer(:gint8, ptr).must_equal(128)
+    end
+
+    it "handles :guint32" do
+      ptr = FFI::Pointer.new(0xffffffff)
+      GirFFI::ArgHelper.cast_from_pointer(:guint32, ptr).must_equal(0xffffffff)
+    end
   end
 end

data/test/gir_ffi/builders/argument_builder_test.rb

@@ -1,244 +1,223 @@
 require 'gir_ffi_test_helper'
 
-# Dummy module
-module Bar
-  module Foo
-
-  end
-end
-
-# NOTE: All cooperating classes were originally stubbed, but this became
-# unweildy as functionality was moved between classes. Also, IArgInfo and
-# related classes are not really classes controlled by GirFFI, as part of their
-# interface is dictated by GIR's implementation. Therefore, these tests are
-# being converted to a situation where they test behavior agains real instances
-# of IArgInfo.
 describe GirFFI::Builders::ArgumentBuilder do
-  let(:argument_info) { Object.new }
-  let(:type_info) { Object.new }
   let(:var_gen) { GirFFI::VariableNameGenerator.new }
-  let(:builder) { GirFFI::Builders::ArgumentBuilder.new(var_gen, argument_info) }
-  let(:conversion_arguments) { [] }
-  let(:argument_class_name) { nil }
-
-  before do
-    stub(argument_info).name { 'foo' }
-    stub(argument_info).argument_type { type_info }
-    stub(argument_info).direction { direction }
-    stub(argument_info).skip? { false }
-    stub(type_info).argument_class_name { argument_class_name }
-    stub(type_info).extra_conversion_arguments { conversion_arguments }
-  end
+  let(:builder) { GirFFI::Builders::ArgumentBuilder.new(var_gen, arg_info) }
 
   describe "for an argument with direction :in" do
-    let(:direction) { :in }
-
     describe "for :callback" do
-      let(:builder) { GirFFI::Builders::ArgumentBuilder.new(var_gen, arg_info) }
       let(:arg_info) {
         get_introspection_data('Regress', 'test_callback_destroy_notify').args[0] }
 
-      it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = ::Regress::TestCallbackUserData.from(callback)" ]
+      it "has the correct value for #pre_conversion" do
+        builder.pre_conversion.must_equal [ "_v1 = Regress::TestCallbackUserData.from(callback)" ]
       end
 
-      it "has the correct value for #post" do
-        builder.post.must_equal [ ]
+      it "has the correct value for #post_conversion" do
+        builder.post_conversion.must_equal [ ]
       end
     end
 
     describe "for :zero_terminated" do
-      let(:argument_class_name) { 'GirFFI::ZeroTerminated' }
-      let(:conversion_arguments) { [:foo] }
+      let(:arg_info) { get_introspection_data("GIMarshallingTests",
+                                              "array_in_len_zero_terminated").args[0] }
 
-      before do
-        stub(type_info).flattened_tag { :zero_terminated }
+      it "has the correct value for #pre_conversion" do
+        builder.pre_conversion.must_equal [ "_v1 = GirFFI::ZeroTerminated.from(:gint32, ints)" ]
+      end
+
+      it "has the correct value for #post_conversion" do
+        builder.post_conversion.must_equal [ ]
       end
+    end
+
+    describe "for :void" do
+      let(:arg_info) { get_introspection_data("Regress", "test_callback_user_data").args[1] }
+
+      describe "when it is a regular argument" do
+        before do
+          builder.is_closure = false
+        end
+
+        it "has the correct value for #pre_conversion" do
+          builder.pre_conversion.must_equal [ "_v1 = GirFFI::InPointer.from(:void, user_data)" ]
+        end
 
-      it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = GirFFI::ZeroTerminated.from(:foo, foo)" ]
+        it "has the correct value for #post_conversion" do
+          builder.post_conversion.must_equal [ ]
+        end
       end
 
-      it "has the correct value for #post" do
-        builder.post.must_equal [ ]
+      describe "when it is a closure" do
+        before do
+          builder.is_closure = true
+        end
+
+        it "has the correct value for #pre_conversion" do
+          builder.pre_conversion.must_equal [ "_v1 = GirFFI::InPointer.from_closure_data(user_data)" ]
+        end
+
+        it "has the correct value for #post_conversion" do
+          builder.post_conversion.must_equal [ ]
+        end
       end
     end
   end
 
   describe "for an argument with direction :out" do
-    let(:direction) { :out }
-
     describe "for :enum" do
-      let(:builder) { GirFFI::Builders::ArgumentBuilder.new(var_gen, arg_info) }
       let(:arg_info) { get_introspection_data("GIMarshallingTests", "genum_out").args[0] }
 
-      it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for GIMarshallingTests::GEnum" ]
+      it "has the correct value for #pre_conversion" do
+        builder.pre_conversion.must_equal [ "_v1 = GirFFI::InOutPointer.for GIMarshallingTests::GEnum" ]
       end
 
-      it "has the correct value for #post" do
-        builder.post.must_equal [ "_v2 = _v1.to_value" ]
+      it "has the correct value for #post_conversion" do
+        builder.post_conversion.must_equal [ "_v2 = _v1.to_value" ]
       end
     end
 
     describe "for :flags" do
-      let(:builder) { GirFFI::Builders::ArgumentBuilder.new(var_gen, arg_info) }
       let(:arg_info) {
         get_introspection_data("GIMarshallingTests", "flags_out").args[0] }
 
-      it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for GIMarshallingTests::Flags" ]
+      it "has the correct value for #pre_conversion" do
+        builder.pre_conversion.must_equal [ "_v1 = GirFFI::InOutPointer.for GIMarshallingTests::Flags" ]
       end
 
-      it "has the correct value for #post" do
-        builder.post.must_equal [ "_v2 = _v1.to_value" ]
+      it "has the correct value for #post_conversion" do
+        builder.post_conversion.must_equal [ "_v2 = _v1.to_value" ]
       end
     end
 
     describe "for :object" do
-      let(:builder) { GirFFI::Builders::ArgumentBuilder.new(var_gen, arg_info) }
       let(:arg_info) {
-        get_introspection_data("GIMarshallingTests", "param_spec_out").args[0] }
+        get_method_introspection_data("Regress", "TestObj", "null_out").args[0] }
 
-      before do
-        # FIXME: Find alternative info that doesn't need a guard.
-        skip unless get_introspection_data("GIMarshallingTests", "param_spec_out")
-      end
-
-      it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, GObject::ParamSpec]" ]
+      it "has the correct value for #pre_conversion" do
+        builder.pre_conversion.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, Regress::TestObj]" ]
       end
 
-      it "has the correct value for #post" do
-        builder.post.must_equal [ "_v2 = ::GObject::ParamSpec.wrap(_v1.to_value)" ]
+      it "has the correct value for #post_conversion" do
+        builder.post_conversion.must_equal [ "_v2 = Regress::TestObj.wrap(_v1.to_value)" ]
       end
     end
 
     describe "for :struct" do
-      let(:argument_class_name) { 'Bar::Foo' }
-      before do
-        stub(type_info).flattened_tag { :struct }
-      end
 
       describe "when not allocated by the caller" do
-        let(:builder) { GirFFI::Builders::ArgumentBuilder.new(var_gen, arg_info) }
         let(:arg_info) {
           get_introspection_data("GIMarshallingTests", "boxed_struct_out").args[0] }
 
-        it "has the correct value for #pre" do
-          builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, GIMarshallingTests::BoxedStruct]" ]
+        it "has the correct value for #pre_conversion" do
+          builder.pre_conversion.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, GIMarshallingTests::BoxedStruct]" ]
         end
 
-        it "has the correct value for #post" do
-          builder.post.must_equal [ "_v2 = ::GIMarshallingTests::BoxedStruct.wrap(_v1.to_value)" ]
+        it "has the correct value for #post_conversion" do
+          builder.post_conversion.must_equal [ "_v2 = GIMarshallingTests::BoxedStruct.wrap(_v1.to_value)" ]
         end
       end
 
       describe "when allocated by the caller" do
-        before do
-          stub(argument_info).caller_allocates? { true }
-        end
+        let(:arg_info) {
+          get_method_introspection_data("Regress", "TestStructA", "clone").args[0] }
 
-        it "has the correct value for #pre" do
-          builder.pre.must_equal [ "_v1 = Bar::Foo.new" ]
+        it "has the correct value for #pre_conversion" do
+          builder.pre_conversion.must_equal [ "_v1 = Regress::TestStructA.new" ]
         end
 
-        it "has the correct value for #post" do
-          builder.post.must_equal [ "_v2 = _v1" ]
+        it "has empty #post_conversion" do
+          builder.post_conversion.must_equal []
         end
       end
     end
 
     describe "for :strv" do
-      let(:builder) { GirFFI::Builders::ArgumentBuilder.new(var_gen, arg_info) }
       let(:arg_info) {
         get_introspection_data("GIMarshallingTests", "gstrv_out").args[0] }
 
-      it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, :strv]" ]
+      it "has the correct value for #pre_conversion" do
+        builder.pre_conversion.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, :strv]" ]
       end
 
-      it "has the correct value for #post" do
-        builder.post.must_equal [ "_v2 = GLib::Strv.wrap(_v1.to_value)" ]
+      it "has the correct value for #post_conversion" do
+        builder.post_conversion.must_equal [ "_v2 = GLib::Strv.wrap(_v1.to_value)" ]
       end
     end
 
     describe "for :array" do
-      let(:builder) { GirFFI::Builders::ArgumentBuilder.new(var_gen, arg_info) }
 
       describe "when allocated by the callee" do
         let(:arg_info) {
           get_introspection_data("GIMarshallingTests", "garray_utf8_none_out").args[0] }
 
-        it "has the correct value for #pre" do
-          builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, :array]" ]
+        it "has the correct value for #pre_conversion" do
+          builder.pre_conversion.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, :array]" ]
         end
 
-        it "has the correct value for #post" do
-          builder.post.must_equal [ "_v2 = GLib::Array.wrap(:utf8, _v1.to_value)" ]
+        it "has the correct value for #post_conversion" do
+          builder.post_conversion.must_equal [ "_v2 = GLib::Array.wrap(:utf8, _v1.to_value)" ]
         end
       end
 
       describe "when allocated by the caller" do
-        let(:arg_info) {
-          get_introspection_data("GIMarshallingTests", "garray_utf8_full_out_caller_allocated").args[0] }
+        let(:function_info) {
+          get_introspection_data("GIMarshallingTests", "garray_utf8_full_out_caller_allocated") }
 
-          before do
-            # FIXME: Find alternative info that doesn't need a guard.
-            skip unless get_introspection_data("GIMarshallingTests", "garray_utf8_full_out_caller_allocated")
-          end
+        let(:arg_info) { function_info.args[0] }
+
+        before do
+          skip unless function_info
+        end
 
-        it "has the correct value for #pre" do
-          builder.pre.must_equal [ "_v1 = GLib::Array.new :utf8" ]
+        it "has the correct value for #pre_conversion" do
+          builder.pre_conversion.must_equal [ "_v1 = GLib::Array.new :utf8" ]
         end
 
-        it "has the correct value for #post" do
-          builder.post.must_equal [ "_v2 = _v1" ]
+        it "has empty #post_conversion" do
+          builder.post_conversion.must_equal []
         end
       end
     end
 
     describe "for :ptr_array" do
-      let(:builder) { GirFFI::Builders::ArgumentBuilder.new(var_gen, arg_info) }
       let(:arg_info) {
         get_introspection_data("GIMarshallingTests", "gptrarray_utf8_none_out").args[0] }
 
-      it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, :ptr_array]" ]
+      it "has the correct value for #pre_conversion" do
+        builder.pre_conversion.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, :ptr_array]" ]
       end
 
-      it "has the correct value for #post" do
-        builder.post.must_equal [ "_v2 = GLib::PtrArray.wrap(:utf8, _v1.to_value)" ]
+      it "has the correct value for #post_conversion" do
+        builder.post_conversion.must_equal [ "_v2 = GLib::PtrArray.wrap(:utf8, _v1.to_value)" ]
       end
     end
 
     describe "for :error" do
-      let(:builder) { GirFFI::Builders::ArgumentBuilder.new(var_gen, arg_info) }
       let(:arg_info) {
         get_introspection_data("GIMarshallingTests", "gerror_out").args[0] }
 
-      it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, :error]" ]
+      it "has the correct value for #pre_conversion" do
+        builder.pre_conversion.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, :error]" ]
       end
 
-      it "has the correct value for #post" do
-        builder.post.must_equal [ "_v2 = GLib::Error.wrap(_v1.to_value)" ]
+      it "has the correct value for #post_conversion" do
+        builder.post_conversion.must_equal [ "_v2 = GLib::Error.wrap(_v1.to_value)" ]
       end
     end
 
     describe "for :c" do
-      let(:builder) { GirFFI::Builders::ArgumentBuilder.new(var_gen, arg_info) }
 
       describe "with fixed size" do
         let(:arg_info) {
           get_introspection_data("GIMarshallingTests", "array_fixed_out").args[0] }
 
-        it "has the correct value for #pre" do
-          builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, :c]" ]
+        it "has the correct value for #pre_conversion" do
+          builder.pre_conversion.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, :c]" ]
         end
 
-        it "has the correct value for #post" do
-          builder.post.must_equal [ "_v2 = GLib::SizedArray.wrap(:gint32, 4, _v1.to_value)" ]
+        it "has the correct value for #post_conversion" do
+          builder.post_conversion.must_equal [ "_v2 = GirFFI::SizedArray.wrap(:gint32, 4, _v1.to_value)" ]
         end
       end
 
@@ -248,114 +227,104 @@ describe GirFFI::Builders::ArgumentBuilder do
 
         let(:length_argument) { Object.new }
         before do
-          stub(length_argument).retname { "bar" }
+          stub(length_argument).post_converted_name { "bar" }
           builder.length_arg = length_argument
         end
 
-        it "has the correct value for #pre" do
-          builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, :c]" ]
+        it "has the correct value for #pre_conversion" do
+          builder.pre_conversion.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, :c]" ]
         end
 
-        it "has the correct value for #post" do
-          builder.post.must_equal [ "_v2 = GLib::SizedArray.wrap(:gint32, bar, _v1.to_value)" ]
+        it "has the correct value for #post_conversion" do
+          builder.post_conversion.must_equal [ "_v2 = GirFFI::SizedArray.wrap(:gint32, bar, _v1.to_value)" ]
         end
       end
     end
 
     describe "for :glist" do
-      let(:builder) { GirFFI::Builders::ArgumentBuilder.new(var_gen, arg_info) }
       let(:arg_info) {
         get_introspection_data("GIMarshallingTests", "glist_utf8_none_out").args[0] }
 
-      it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, :glist]" ]
+      it "has the correct value for #pre_conversion" do
+        builder.pre_conversion.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, :glist]" ]
       end
 
-      it "has the correct value for #post" do
-        builder.post.must_equal [ "_v2 = GLib::List.wrap(:utf8, _v1.to_value)" ]
+      it "has the correct value for #post_conversion" do
+        builder.post_conversion.must_equal [ "_v2 = GLib::List.wrap(:utf8, _v1.to_value)" ]
       end
     end
 
     describe "for :gslist" do
-      let(:builder) { GirFFI::Builders::ArgumentBuilder.new(var_gen, arg_info) }
       let(:arg_info) {
         get_introspection_data("GIMarshallingTests", "gslist_utf8_none_out").args[0] }
 
-      it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, :gslist]" ]
+      it "has the correct value for #pre_conversion" do
+        builder.pre_conversion.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, :gslist]" ]
       end
 
-      it "has the correct value for #post" do
-        builder.post.must_equal [ "_v2 = GLib::SList.wrap(:utf8, _v1.to_value)" ]
+      it "has the correct value for #post_conversion" do
+        builder.post_conversion.must_equal [ "_v2 = GLib::SList.wrap(:utf8, _v1.to_value)" ]
       end
     end
 
     describe "for :ghash" do
-      let(:builder) { GirFFI::Builders::ArgumentBuilder.new(var_gen, arg_info) }
       let(:arg_info) {
         get_introspection_data("GIMarshallingTests", "ghashtable_utf8_none_out").args[0] }
 
-      it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, :ghash]" ]
+      it "has the correct value for #pre_conversion" do
+        builder.pre_conversion.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, [:ghash, :utf8, :utf8]]" ]
       end
 
-      it "has the correct value for #post" do
-        builder.post.must_equal [ "_v2 = GLib::HashTable.wrap([:utf8, :utf8], _v1.to_value)" ]
+      it "has the correct value for #post_conversion" do
+        builder.post_conversion.must_equal [ "_v2 = GLib::HashTable.wrap([:utf8, :utf8], _v1.to_value)" ]
       end
     end
   end
 
   describe "for an argument with direction :inout" do
-    let(:direction) { :inout }
-
     describe "for :enum" do
-      let(:argument_class_name) { 'Bar::Foo' }
-      before do
-        stub(type_info).flattened_tag { :enum }
-        stub(type_info).tag_or_class { Bar::Foo }
-      end
+      let(:arg_info) {
+        get_introspection_data("GIMarshallingTests", "enum_inout").args[0] }
 
-      it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.from Bar::Foo, foo" ]
+      it "has the correct value for #pre_conversion" do
+        builder.pre_conversion.must_equal [ "_v1 = GirFFI::InOutPointer.for GIMarshallingTests::Enum",
+                                 "_v1.set_value #{arg_info.name}" ]
       end
 
-      it "has the correct value for #post" do
-        builder.post.must_equal [ "_v2 = _v1.to_value" ]
+      it "has the correct value for #post_conversion" do
+        builder.post_conversion.must_equal [ "_v2 = _v1.to_value" ]
       end
     end
 
     describe "for :flags" do
-      let(:argument_class_name) { 'Bar::Foo' }
-      before do
-        stub(type_info).flattened_tag { :flags }
-        stub(type_info).tag_or_class { Bar::Foo }
-      end
+      let(:arg_info) {
+        get_introspection_data("GIMarshallingTests", "no_type_flags_inout").args[0] }
 
-      it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.from Bar::Foo, foo" ]
+      it "has the correct value for #pre_conversion" do
+        builder.pre_conversion.must_equal [ "_v1 = GirFFI::InOutPointer.for GIMarshallingTests::NoTypeFlags",
+                                 "_v1.set_value #{arg_info.name}" ]
       end
 
-      it "has the correct value for #post" do
-        builder.post.must_equal [ "_v2 = _v1.to_value" ]
+      it "has the correct value for #post_conversion" do
+        builder.post_conversion.must_equal [ "_v2 = _v1.to_value" ]
       end
     end
 
     describe "for :gint32" do
-      before do
-        stub(type_info).flattened_tag { :gint32 }
-        stub(type_info).tag_or_class { :gint32 }
-      end
+      let(:arg_info) {
+        get_introspection_data("GIMarshallingTests", "int32_inout_min_max").args[0] }
 
-      it "has the correct value for inarg" do
-        builder.inarg.must_equal "foo"
+      it "has the correct value for method_argument_name" do
+        builder.method_argument_name.must_equal "#{arg_info.name}"
       end
 
-      it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.from :gint32, foo" ]
+      it "has the correct value for #pre_conversion" do
+        builder.pre_conversion.must_equal [ "_v1 = GirFFI::InOutPointer.for :gint32",
+                                 "_v1.set_value #{arg_info.name}" ]
       end
 
-      it "has the correct value for #post" do
-        builder.post.must_equal [ "_v2 = _v1.to_value" ]
+      it "has the correct value for #post_conversion" do
+        builder.post_conversion.must_equal [ "_v2 = _v1.to_value" ]
       end
     end
 
@@ -364,8 +333,6 @@ describe GirFFI::Builders::ArgumentBuilder do
         get_introspection_data('Regress', 'test_array_int_inout') }
       let(:arg_info) { function_info.args[0] }
       let(:array_arg_info) { function_info.args[1] }
-      let(:builder) {
-        GirFFI::Builders::ArgumentBuilder.new(var_gen, arg_info) }
       let(:array_arg_builder) {
         GirFFI::Builders::ArgumentBuilder.new(var_gen, array_arg_info) }
 
@@ -373,193 +340,152 @@ describe GirFFI::Builders::ArgumentBuilder do
         builder.array_arg = array_arg_builder
       end
 
-      it "has the correct value for #pre" do
-        builder.pre.must_equal [ "n_ints = ints.nil? ? 0 : ints.length",
-                                 "_v1 = GirFFI::InOutPointer.from :gint32, n_ints" ]
+      it "has the correct value for #pre_conversion" do
+        builder.pre_conversion.must_equal [ "n_ints = ints.nil? ? 0 : ints.length",
+                                 "_v1 = GirFFI::InOutPointer.for :gint32",
+                                 "_v1.set_value n_ints" ]
       end
 
-      it "has the correct value for #post" do
-        builder.post.must_equal [ "_v2 = _v1.to_value" ]
+      it "has the correct value for #post_conversion" do
+        builder.post_conversion.must_equal [ "_v2 = _v1.to_value" ]
       end
     end
 
     describe "for :strv" do
-      let(:argument_class_name) { 'GLib::Strv' }
-      before do
-        stub(type_info).flattened_tag { :strv }
-        stub(type_info).tag_or_class { [:pointer, :array] }
-      end
+      let(:arg_info) {
+        get_introspection_data("GIMarshallingTests", "gstrv_inout").args[0] }
 
-      it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.from [:pointer, :array], GLib::Strv.from(foo)" ]
+      it "has the correct value for #pre_conversion" do
+        builder.pre_conversion.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, :strv]",
+                                 "_v1.set_value GLib::Strv.from(g_strv)" ]
       end
 
-      it "has the correct value for #post" do
-        builder.post.must_equal [ "_v2 = GLib::Strv.wrap(_v1.to_value)" ]
+      it "has the correct value for #post_conversion" do
+        builder.post_conversion.must_equal [ "_v2 = GLib::Strv.wrap(_v1.to_value)" ]
       end
     end
 
     describe "for :ptr_array" do
-      let(:conversion_arguments) { [:foo] }
-      let(:argument_class_name) { 'GLib::PtrArray' }
-
-      before do
-        stub(type_info).flattened_tag { :ptr_array }
-        stub(type_info).tag_or_class { [:pointer, :array] }
-      end
+      let(:arg_info) {
+        get_introspection_data("GIMarshallingTests", "gptrarray_utf8_none_inout").args[0] }
 
-      it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.from [:pointer, :array], GLib::PtrArray.from(:foo, foo)" ]
+      it "has the correct value for #pre_conversion" do
+        builder.pre_conversion.must_equal [ "_v1 = GirFFI::InOutPointer.for [:pointer, :ptr_array]",
+                                 "_v1.set_value GLib::PtrArray.from(:utf8, parray_)" ]
       end
 
-      it "has the correct value for #post" do
-        builder.post.must_equal [ "_v2 = GLib::PtrArray.wrap(:foo, _v1.to_value)" ]
+      it "has the correct value for #post_conversion" do
+        builder.post_conversion.must_equal [ "_v2 = GLib::PtrArray.wrap(:utf8, _v1.to_value)" ]
       end
     end
 
     describe "for :utf8" do
-      let(:conversion_arguments) { [:utf8] }
-      let(:argument_class_name) { 'GirFFI::InPointer' }
-
-      before do
-        stub(type_info).flattened_tag { :utf8 }
-        stub(type_info).tag_or_class { :utf8 }
-      end
+      let(:arg_info) {
+        get_introspection_data("GIMarshallingTests", "utf8_none_inout").args[0] }
 
-      it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.from :utf8, GirFFI::InPointer.from(:utf8, foo)" ]
+      it "has the correct value for #pre_conversion" do
+        builder.pre_conversion.must_equal [ "_v1 = GirFFI::InOutPointer.for :utf8",
+                                 "_v1.set_value GirFFI::InPointer.from(:utf8, utf8)" ]
       end
 
-      it "has the correct value for #post" do
-        builder.post.must_equal [ "_v2 = _v1.to_value.to_utf8" ]
+      it "has the correct value for #post_conversion" do
+        builder.post_conversion.must_equal [ "_v2 = _v1.to_value.to_utf8" ]
       end
     end
 
     describe "for :c" do
-      let(:argument_class_name) { 'GLib::SizedArray' }
-
-      before do
-        stub(type_info).flattened_tag { :c }
-        stub(type_info).tag_or_class { [:pointer, :c] }
-        stub(type_info).subtype_tag_or_class { :bar }
-      end
-
       describe "with fixed size" do
-        let(:conversion_arguments) { [:bar, 3] }
-
-        before do
-          stub(type_info).array_fixed_size { 3 }
-        end
+        let(:arg_info) {
+          get_introspection_data("GIMarshallingTests", "array_fixed_inout").args[0] }
 
-        it "has the correct value for #pre" do
-          builder.pre.must_equal [
-            "GirFFI::ArgHelper.check_fixed_array_size 3, foo, \"foo\"",
-            "_v1 = GirFFI::InOutPointer.from [:pointer, :c], GLib::SizedArray.from(:bar, 3, foo)"
+        it "has the correct value for #pre_conversion" do
+          builder.pre_conversion.must_equal [
+            "GirFFI::ArgHelper.check_fixed_array_size 4, ints, \"ints\"",
+            "_v1 = GirFFI::InOutPointer.for [:pointer, :c]",
+            "_v1.set_value GirFFI::SizedArray.from(:gint32, 4, ints)"
           ]
         end
 
-        it "has the correct value for #post" do
-          builder.post.must_equal [ "_v2 = GLib::SizedArray.wrap(:bar, 3, _v1.to_value)" ]
+        it "has the correct value for #post_conversion" do
+          builder.post_conversion.must_equal [ "_v2 = GirFFI::SizedArray.wrap(:gint32, 4, _v1.to_value)" ]
         end
       end
 
       describe "with separate size parameter" do
-        let(:length_argument) { Object.new }
-        let(:conversion_arguments) { [:bar, -1] }
+        let(:function_info) {
+          get_introspection_data('Regress', 'test_array_int_inout') }
+        let(:length_arg_info) { function_info.args[0] }
+        let(:arg_info) { function_info.args[1] }
+        let(:length_arg_builder) {
+          GirFFI::Builders::ArgumentBuilder.new(var_gen, length_arg_info) }
+
         before do
-          stub(type_info).array_fixed_size { -1 }
-          stub(length_argument).retname { "baz" }
-          builder.length_arg = length_argument
+          builder.length_arg = length_arg_builder
         end
 
-        it "has the correct value for #pre" do
-          builder.pre.must_equal [
-            "_v1 = GirFFI::InOutPointer.from [:pointer, :c], GLib::SizedArray.from(:bar, -1, foo)"
+        it "has the correct value for #pre_conversion" do
+          builder.pre_conversion.must_equal [
+            "_v1 = GirFFI::InOutPointer.for [:pointer, :c]",
+            "_v1.set_value GirFFI::SizedArray.from(:gint32, -1, ints)"
           ]
         end
 
-        it "has the correct value for #post" do
-          builder.post.must_equal [ "_v2 = GLib::SizedArray.wrap(:bar, baz, _v1.to_value)" ]
+        it "has the correct value for #post_conversion" do
+          builder.post_conversion.must_equal [ "_v3 = GirFFI::SizedArray.wrap(:gint32, _v2, _v1.to_value)" ]
         end
       end
     end
   end
 
   describe "for a skipped argument with direction :in" do
-    let(:direction) { :in }
+    let(:arg_info) {
+      get_method_introspection_data("Regress", "TestObj", "skip_param").args[2] }
 
-    before do
-      stub(argument_info).skip? { true }
+    it "has the correct value for method_argument_name" do
+      builder.method_argument_name.must_be_nil
     end
 
-    describe "for :gint32" do
-      before do
-        stub(type_info).flattened_tag { :gint32 }
-      end
-
-      it "has the correct value for inarg" do
-        builder.inarg.must_be_nil
-      end
-
-      it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = 0" ]
-      end
+    it "has the correct value for #pre_conversion" do
+      builder.pre_conversion.must_equal [ "_v1 = 0" ]
+    end
 
-      it "has the correct value for #post" do
-        builder.post.must_equal []
-      end
+    it "has the correct value for #post_conversion" do
+      builder.post_conversion.must_equal []
     end
   end
 
   describe "for a skipped argument with direction :inout" do
-    let(:direction) { :inout }
+    let(:arg_info) {
+      get_method_introspection_data("Regress", "TestObj", "skip_inout_param").args[3] }
 
-    before do
-      stub(argument_info).skip? { true }
+    it "has the correct value for method_argument_name" do
+      builder.method_argument_name.must_be_nil
     end
 
-    describe "for :gint32" do
-      before do
-        stub(type_info).flattened_tag { :gint32 }
-      end
-
-      it "has the correct value for inarg" do
-        builder.inarg.must_be_nil
-      end
-
-      it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = nil" ]
-      end
+    it "has the correct value for #pre_conversion" do
+      builder.pre_conversion.must_equal [ "_v1 = GirFFI::InOutPointer.for :gint32",
+                                          "_v1.set_value 0" ]
+    end
 
-      it "has the correct value for #post" do
-        builder.post.must_equal []
-      end
+    it "has the correct value for #post_conversion" do
+      builder.post_conversion.must_equal []
     end
   end
 
   describe "for a skipped argument with direction :out" do
-    let(:direction) { :out }
+    let(:arg_info) {
+      get_method_introspection_data("Regress", "TestObj", "skip_out_param").args[1] }
 
-    before do
-      stub(argument_info).skip? { true }
+    it "has the correct value for method_argument_name" do
+      builder.method_argument_name.must_be_nil
     end
 
-    describe "for :gint32" do
-      before do
-        stub(type_info).flattened_tag { :gint32 }
-      end
-
-      it "has the correct value for inarg" do
-        builder.inarg.must_be_nil
-      end
-
-      it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = nil" ]
-      end
+    it "has the correct value for #pre_conversion" do
+      builder.pre_conversion.must_equal [ "_v1 = GirFFI::InOutPointer.for :gint32" ]
+    end
 
-      it "has the correct value for #post" do
-        builder.post.must_equal []
-      end
+    it "has the correct value for #post_conversion" do
+      builder.post_conversion.must_equal []
     end
   end
 end