gir_ffi 0.7.4 → 0.7.5

data/test/ffi-glib/strv_test.rb

@@ -1,6 +1,33 @@
 require 'base_test_helper'
 
 describe GLib::Strv do
+  describe "::from" do
+    it "creates a Strv from a Ruby array" do
+      strv = GLib::Strv.from ["1", "2", "3"]
+      strv.must_be_instance_of GLib::Strv
+      strv.to_a.must_equal ["1", "2", "3"]
+    end
+
+    it "return its argument if given a Strv" do
+      strv = GLib::Strv.from ["1", "2", "3"]
+      strv2 = GLib::Strv.from strv
+      assert strv2.equal? strv
+    end
+
+    it "wraps its argument if given a pointer" do
+      strv = GLib::Strv.from ["1", "2", "3"]
+
+      pointer = strv.to_ptr
+      pointer.must_be_kind_of FFI::Pointer
+
+      strv2 = GLib::Strv.from pointer
+
+      strv2.must_be_kind_of GLib::Strv
+      refute strv2.equal? strv
+      strv2.to_a.must_equal strv.to_a
+    end
+  end
+
   describe "#==" do
     it "returns true when comparing to an array with the same elements" do
       strv = GLib::Strv.from ["1", "2", "3"]

data/test/ffi-gobject_introspection/i_constant_info_test.rb

@@ -10,11 +10,7 @@ describe GObjectIntrospection::IConstantInfo do
       assert_equal :gint32, @info.constant_type.tag
     end
 
-    it "returns a value union with member :v_int32 with value 1_000_000" do
-      assert_equal 1_000_000, @info.value_union[:v_int32]
-    end
-
-    it "returns 1 as its value" do
+    it "returns 1_000_000 as its value" do
       assert_equal 1_000_000, @info.value
     end
   end

data/test/ffi-gobject_test.rb

@@ -122,14 +122,14 @@ describe GObject do
         sb = Regress::TestSimpleBoxedA.new
         sb.some_int = 23
 
-        GObject.signal_connect(o, "test-with-static-scope-arg", 2) { |i, object, d|
-          @a = d
+        GObject.signal_connect(o, "test-with-static-scope-arg", 2) { |instance, object, user_data|
+          @a = user_data
           @b = object
         }
         GObject.signal_emit o, "test-with-static-scope-arg", sb
       end
 
-      it "moves the user data argument" do
+      it "passes on the user data argument" do
         assert_equal 2, @a
       end
 

data/test/gir_ffi/builders/{with_methods_test.rb → registered_type_builder_test.rb}

@@ -2,7 +2,7 @@ require 'gir_ffi_test_helper'
 
 GirFFI.setup :Regress
 
-describe GirFFI::Builders::WithMethods do
+describe GirFFI::Builders::RegisteredTypeBuilder do
   describe "#setup_instance_method" do
     it "restores a method that was removed" do
       Regress::TestObj.class_eval { remove_method "instance_method" }

data/test/gir_ffi/builders/signal_closure_builder_test.rb

@@ -0,0 +1,136 @@
+require 'gir_ffi_test_helper'
+
+describe GirFFI::Builders::SignalClosureBuilder do
+  let(:builder) { GirFFI::Builders::SignalClosureBuilder.new signal_info }
+
+  describe "#build_class" do
+    let(:signal_info) {
+      get_signal_introspection_data "Regress", "TestObj", "test" }
+
+    it "builds a descendant of RubyClosure" do
+      klass = builder.build_class
+      klass.ancestors.must_include GObject::RubyClosure
+    end
+  end
+
+  describe "#marshaller_definition" do
+    describe "for a signal with no arguments or return value" do
+      let(:signal_info) {
+        get_signal_introspection_data "Regress", "TestObj", "test" }
+
+      it "returns a valid marshaller converting only the receiver" do
+        expected = <<-CODE.reset_indentation
+        def self.marshaller(closure, return_value, param_values, _invocation_hint, _marshal_data)
+          _instance, _ = param_values.map(&:get_value_plain)
+          _v1 = _instance
+          wrap(closure.to_ptr).invoke_block(_v1)
+        end
+        CODE
+
+        builder.marshaller_definition.must_equal expected
+      end
+    end
+
+    describe "for a signal with an argument and a return value" do
+      let(:signal_info) {
+        get_signal_introspection_data "Regress", "TestObj", "sig-with-int64-prop" }
+
+      it "returns a valid mapping method" do
+        skip unless signal_info
+
+        expected = <<-CODE.reset_indentation
+        def self.marshaller(closure, return_value, param_values, _invocation_hint, _marshal_data)
+          _instance, i, _ = param_values.map(&:get_value_plain)
+          _v1 = _instance
+          _v2 = i
+          _v3 = wrap(closure.to_ptr).invoke_block(_v1, _v2)
+          return_value.set_value _v3
+        end
+        CODE
+
+        builder.marshaller_definition.must_equal expected
+      end
+    end
+
+    describe "for a signal with an enum argument" do
+      let(:signal_info) {
+        get_signal_introspection_data "Gio", "MountOperation", "reply" }
+
+      it "returns a valid mapping method" do
+        expected = <<-CODE.reset_indentation
+        def self.marshaller(closure, return_value, param_values, _invocation_hint, _marshal_data)
+          _instance, result, _ = param_values.map(&:get_value_plain)
+          _v1 = _instance
+          _v2 = result
+          wrap(closure.to_ptr).invoke_block(_v1, _v2)
+        end
+        CODE
+
+        builder.marshaller_definition.must_equal expected
+      end
+    end
+
+    describe "for a signal with a array plus length arguments" do
+      let(:signal_info) {
+        get_signal_introspection_data "Regress", "TestObj", "sig-with-array-len-prop" }
+
+      it "returns a valid mapping method" do
+        skip unless signal_info
+
+        expected = <<-CODE.reset_indentation
+        def self.marshaller(closure, return_value, param_values, _invocation_hint, _marshal_data)
+          _instance, arr, len, _ = param_values.map(&:get_value_plain)
+          _v1 = _instance
+          _v2 = len
+          _v3 = GirFFI::SizedArray.wrap(:guint32, _v2, arr)
+          wrap(closure.to_ptr).invoke_block(_v1, _v3)
+        end
+        CODE
+
+        builder.marshaller_definition.must_equal expected
+      end
+    end
+
+    describe "for a signal with a struct argument" do
+      let(:signal_info) {
+        get_signal_introspection_data "Regress", "TestObj", "test-with-static-scope-arg" }
+
+      it "returns a valid mapping method" do
+        skip unless signal_info
+
+        expected = <<-CODE.reset_indentation
+        def self.marshaller(closure, return_value, param_values, _invocation_hint, _marshal_data)
+          _instance, object, _ = param_values.map(&:get_value_plain)
+          _v1 = _instance
+          _v2 = Regress::TestSimpleBoxedA.wrap(object)
+          wrap(closure.to_ptr).invoke_block(_v1, _v2)
+        end
+        CODE
+
+        builder.marshaller_definition.must_equal expected
+      end
+    end
+
+    describe "for a signal returning an array of integers" do
+      let(:signal_info) {
+        get_signal_introspection_data "Regress", "TestObj", "sig-with-intarray-ret" }
+
+      it "returns a valid mapping method" do
+        skip unless signal_info
+
+        expected = <<-CODE.reset_indentation
+        def self.marshaller(closure, return_value, param_values, _invocation_hint, _marshal_data)
+          _instance, i, _ = param_values.map(&:get_value_plain)
+          _v1 = _instance
+          _v2 = i
+          _v3 = wrap(closure.to_ptr).invoke_block(_v1, _v2)
+          _v4 = GLib::Array.from(:gint32, _v3)
+          return_value.set_value _v4
+        end
+        CODE
+
+        builder.marshaller_definition.must_equal expected
+      end
+    end
+  end
+end

data/test/gir_ffi/builders/user_defined_builder_test.rb

@@ -100,7 +100,8 @@ describe GirFFI::Builders::UserDefinedBuilder do
       gtype = klass.get_gtype
       other_builder = GirFFI::Builders::UserDefinedBuilder.new info
       other_builder.build_class
-      other_builder.gtype.must_equal gtype
+      # FIXME: Does not really test what we want to test: other_builder might lie!
+      other_builder.target_gtype.must_equal gtype
     end
   end
 end

data/test/gir_ffi/info_ext/i_signal_info_test.rb

@@ -25,15 +25,4 @@ describe GirFFI::InfoExt::ISignalInfo do
       result_boxed.some_int.must_equal boxed.some_int
     end
   end
-
-  describe "#return_ffi_type" do
-    # NOTE: This is needed because FFI callbacks are limited in the
-    # accepted types.
-    it "returns :bool for the :gboolean type" do
-      stub(return_type_info = Object.new).to_ffitype { GLib::Boolean }
-      stub(signal_info).return_type { return_type_info }
-
-      signal_info.return_ffi_type.must_equal :bool
-    end
-  end
 end

data/test/integration/generated_gimarshallingtests_test.rb

@@ -437,6 +437,7 @@ describe GIMarshallingTests do
       derived_instance.int.must_equal 23
     end
 
+    # TODO: Check if this is fixed
     # See https://bugzilla.gnome.org/show_bug.cgi?id=727665
     it "has a working method #int8_out" do
       skip "Introspection data is not generated correctly"
@@ -1039,7 +1040,7 @@ describe GIMarshallingTests do
       end
     end
 
-    describe "its 'some-uuint' property" do
+    describe "its 'some-uint' property" do
       it "can be retrieved with #get_property" do
         instance.get_property("some-uint").get_value.must_equal 0
       end
@@ -1355,6 +1356,18 @@ describe GIMarshallingTests do
     pass
   end
 
+  it "has a working function #array_in_utf8_two_in" do
+    skip unless get_introspection_data 'GIMarshallingTests', 'array_in_utf8_two_in'
+    GIMarshallingTests.array_in_utf8_two_in [-1, 0, 1, 2], "1", "2"
+    pass
+  end
+
+  it "has a working function #array_in_utf8_two_in_out_of_order" do
+    skip unless get_introspection_data 'GIMarshallingTests', 'array_in_utf8_two_in_out_of_order'
+    GIMarshallingTests.array_in_utf8_two_in_out_of_order "1", [-1, 0, 1, 2], "2"
+    pass
+  end
+
   it "has a working function #array_inout" do
     res = GIMarshallingTests.array_inout [-1, 0, 1, 2]
     res.must_be :==, [-2, -1, 0, 1, 2]
@@ -1545,6 +1558,21 @@ describe GIMarshallingTests do
     result.must_equal 42.0
   end
 
+  it "has a working function #callback_owned_boxed" do
+    skip unless get_introspection_data 'GIMarshallingTests', 'callback_owned_boxed'
+    a = nil
+
+    callback = proc { |box, callback_data| a = box.long_ + callback_data }
+
+    result = GIMarshallingTests.callback_owned_boxed callback, 42
+    result.must_equal 1
+    a.must_equal 43
+
+    result = GIMarshallingTests.callback_owned_boxed callback, 42
+    result.must_equal 2
+    a.must_equal 44
+  end
+
   it "has a working function #callback_return_value_and_multiple_out_parameters" do
     result = GIMarshallingTests.callback_return_value_and_multiple_out_parameters proc { |*args|
       [42, -142, 3]
@@ -1756,6 +1784,7 @@ describe GIMarshallingTests do
   it "has a working function #gclosure_in" do
     cl = GObject::RubyClosure.new { 42 }
     GIMarshallingTests.gclosure_in cl
+    pass
   end
 
   it "has a working function #gclosure_return" do
@@ -2143,7 +2172,6 @@ describe GIMarshallingTests do
   end
 
   it "has a working function #gvalue_flat_array_round_trip" do
-    skip "Fails on JRuby" if RUBY_PLATFORM == 'java'
     result = GIMarshallingTests.gvalue_flat_array_round_trip 42, "42", true
     arr = result.to_a
     arr[0].get_value.must_equal 42
@@ -2403,6 +2431,14 @@ describe GIMarshallingTests do
     assert_equal 0x7fffffff, res
   end
 
+  it "has a working function #int_one_in_utf8_two_in_one_allows_none" do
+    skip unless get_introspection_data('GIMarshallingTests',
+                                       'int_one_in_utf8_two_in_one_allows_none')
+    GIMarshallingTests.int_one_in_utf8_two_in_one_allows_none 1, "2", "3"
+    GIMarshallingTests.int_one_in_utf8_two_in_one_allows_none 1, nil, "3"
+    pass
+  end
+
   it "has a working function #int_out_max" do
     res = GIMarshallingTests.int_out_max
     assert_equal 0x7fffffff, res
@@ -2438,6 +2474,14 @@ describe GIMarshallingTests do
     assert_equal [4, 5, 6], res
   end
 
+  it "has a working function #int_two_in_utf8_two_in_with_allow_none" do
+    skip unless get_introspection_data('GIMarshallingTests',
+                                       'int_two_in_utf8_two_in_with_allow_none')
+    GIMarshallingTests.int_two_in_utf8_two_in_with_allow_none 1, 2, "3", "4"
+    GIMarshallingTests.int_two_in_utf8_two_in_with_allow_none 1, 2, nil, nil
+    pass
+  end
+
   it "has a working function #long_in_max" do
     GIMarshallingTests.long_in_max max_long
     pass
@@ -2514,6 +2558,7 @@ describe GIMarshallingTests do
     res.must_be_instance_of GIMarshallingTests::OverridesStruct
   end
 
+  # TODO: Wait for fixed version of param_spec_in_bool to land in Debian/Ubuntu
   # See https://bugzilla.gnome.org/show_bug.cgi?id=728409
   it "has a working function #param_spec_in_bool" do
     skip "param_spec_in_bool tests the wrong type"

data/test/integration/generated_regress_test.rb

@@ -520,6 +520,12 @@ describe Regress do
       o = Regress::TestObj.new_callback Proc.new { a = 2 }, nil, nil
       assert_instance_of Regress::TestObj, o
       a.must_equal 2
+
+      # Regress::TestObj.new_callback adds a callback to the list of notified
+      # callbacks. Thaw the callbacks to make sure the list is cleared for
+      # later tests.
+      result = Regress.test_callback_thaw_notifications
+      result.must_equal 2
     end
 
     it "creates an instance using #new_from_file" do
@@ -582,7 +588,7 @@ describe Regress do
     end
 
     it "has a working method #emit_sig_with_int64" do
-      skip "FFI doesn't seem to convert the returned :int64 properly yet"
+      skip unless get_signal_introspection_data "Regress", "TestObj", "sig-with-int64-prop"
       instance.signal_connect "sig-with-int64-prop" do |obj, i, ud|
         i
       end
@@ -600,7 +606,7 @@ describe Regress do
     end
 
     it "has a working method #emit_sig_with_uint64" do
-      skip "FFI doesn't seem to convert the returned :int64 properly yet"
+      skip unless get_signal_introspection_data "Regress", "TestObj", "sig-with-uint64-prop"
       instance.signal_connect "sig-with-uint64-prop" do |obj, i, ud|
         i
       end
@@ -1024,9 +1030,10 @@ describe Regress do
         a = int64
       end
 
-      GObject.signal_emit instance, "sig-with-int64-prop", 0x7fffffffffffffff
+      result = GObject.signal_emit instance, "sig-with-int64-prop", 0x7fff_ffff_ffff_ffff
 
-      a.must_equal 0x7fffffffffffffff
+      a.must_equal 0x7fff_ffff_ffff_ffff
+      result.get_value.must_equal 0x7fff_ffff_ffff_ffff
     end
 
     it "handles the 'sig-with-intarray-ret' signal" do
@@ -1043,9 +1050,8 @@ describe Regress do
 
       a.must_equal 3
 
-      # We would expect result to contain the int array, but regress.c uses the
-      # wrong marshalling function
-      result.get_value.must_be_nil
+      # TODO: Use signal info to convert return value
+      GLib::Array.wrap(:gint32, result.get_value_plain).to_a.must_equal [3, 2, 1]
     end
 
     it "handles the 'sig-with-obj' signal" do
@@ -1082,9 +1088,10 @@ describe Regress do
         a = uint64
       end
 
-      GObject.signal_emit instance, "sig-with-uint64-prop", 0xffffffffffffffff
+      result = GObject.signal_emit instance, "sig-with-uint64-prop", 0xffff_ffff_ffff_ffff
 
-      a.must_equal 0xffffffffffffffff
+      a.must_equal 0xffff_ffff_ffff_ffff
+      result.get_value.must_equal 0xffff_ffff_ffff_ffff
     end
 
     it "handles the 'test' signal" do
@@ -1508,6 +1515,7 @@ describe Regress do
       instance.data1.read_int.must_equal 42
     end
 
+    # TODO: Check what gobject-introspection should/will do with these fields.
     it "has a writable field data2" do
       skip "Introspection data cannot deal with type of this field yet"
     end
@@ -1950,8 +1958,9 @@ describe Regress do
   end
 
   it "has a working function #test_closure_variant" do
-    skip "This causes a core dump on some systems"
     arg = GLib::Variant.new_string "foo"
+
+    # TODO: Convert proc to RubyClosure automatically
     closure = GObject::RubyClosure.new do |variant|
       str = variant.get_string
       if str == "foo"
@@ -1961,7 +1970,6 @@ describe Regress do
       end
     end
 
-    # TODO: Convert proc to RubyClosure automatically
     result = Regress.test_closure_variant closure, arg
 
     result.get_int32.must_equal 40