gir_ffi 0.14.1 → 0.15.0

data/test/integration/generated_gio_test.rb

@@ -1,27 +1,27 @@
 # frozen_string_literal: true
 
-require 'gir_ffi_test_helper'
+require "gir_ffi_test_helper"
 
 GirFFI.setup :Gio
 
 # Tests generated methods and functions in the Gio namespace.
-describe 'The generated Gio module' do
-  describe 'File#new_for_path, a method returning an interface,' do
-    it 'returns an object of a more specific class' do
-      file = Gio::File.new_for_path('/')
-      file.class.registered_ancestors.must_equal [file.class, Gio::File, GObject::Object]
+describe "The generated Gio module" do
+  describe "File#new_for_path, a method returning an interface," do
+    it "returns an object of a more specific class" do
+      file = Gio::File.new_for_path("/")
+      _(file.class.registered_ancestors).must_equal [file.class, Gio::File, GObject::Object]
 
       refute_instance_of Gio::File, file
       assert_includes file.class.registered_ancestors, Gio::File
     end
   end
 
-  describe 'the result of #file_new_from_path' do
+  describe "the result of #file_new_from_path" do
     before do
-      @it = Gio.file_new_for_path('/')
+      @it = Gio.file_new_for_path("/")
     end
 
-    it 'is able to set up a method in a class that is not the first ancestor' do
+    it "is able to set up a method in a class that is not the first ancestor" do
       refute_defines_instance_method @it.class, :get_qdata
       refute_defines_instance_method Gio::File, :get_qdata
       assert_defines_instance_method GObject::Object, :get_qdata
@@ -29,88 +29,88 @@ describe 'The generated Gio module' do
       @it.setup_and_call :get_qdata, 1
     end
 
-    it 'knows its GType' do
+    it "knows its GType" do
       instance_gtype = GObject.type_from_instance @it
-      @it.class.gtype.must_equal instance_gtype
+      _(@it.class.gtype).must_equal instance_gtype
     end
   end
 
-  describe 'the FileInfo class' do
-    describe 'an instance' do
+  describe "the FileInfo class" do
+    describe "an instance" do
       before do
-        file = Gio.file_new_for_path('/')
-        @fileinfo = file.query_info '*', :none, nil
+        file = Gio.file_new_for_path("/")
+        @fileinfo = file.query_info "*", :none, nil
       end
 
-      it 'has a working #get_attribute_type method' do
-        type = @fileinfo.get_attribute_type 'standard::display-name'
+      it "has a working #get_attribute_type method" do
+        type = @fileinfo.get_attribute_type "standard::display-name"
         assert_equal :string, type
       end
     end
   end
 
-  describe 'the action-added signal' do
+  describe "the action-added signal" do
     before do
       @grp = Gio::SimpleActionGroup.new
     end
 
     it "correctly passes on the string parameter 'action_name'" do
       a = nil
-      GObject.signal_connect @grp, 'action-added' do |_grp, action_name, _user_data|
+      GObject.signal_connect @grp, "action-added" do |_grp, action_name, _user_data|
         a = action_name
       end
-      GObject.signal_emit @grp, 'action-added', 'foo'
-      assert_equal 'foo', a
+      GObject.signal_emit @grp, "action-added", "foo"
+      assert_equal "foo", a
     end
   end
 
-  describe 'the reply signal' do
+  describe "the reply signal" do
     before do
       @mo = Gio::MountOperation.new
     end
 
     it "correctly passes on the enum parameter 'result'" do
       a = nil
-      GObject.signal_connect @mo, 'reply' do |_mnt, result, _user_data|
+      GObject.signal_connect @mo, "reply" do |_mnt, result, _user_data|
         a = result
       end
-      GObject.signal_emit @mo, 'reply', :unhandled
+      GObject.signal_emit @mo, "reply", :unhandled
       assert_equal :unhandled, a
     end
   end
 
-  describe 'the CharsetConverter class' do
-    it 'includes two interfaces' do
+  describe "the CharsetConverter class" do
+    it "includes two interfaces" do
       klass = Gio::CharsetConverter
-      klass.included_interfaces.must_equal [Gio::Initable, Gio::Converter]
+      _(klass.included_interfaces).must_equal [Gio::Initable, Gio::Converter]
     end
 
-    it 'allows an instance to find the #reset method' do
-      cnv = Gio::CharsetConverter.new 'utf8', 'utf8'
+    it "allows an instance to find the #reset method" do
+      cnv = Gio::CharsetConverter.new "utf8", "utf8"
       cnv.reset
       pass
     end
   end
 
-  describe 'the SocketSourceFunc callback' do
-    it 'can be cast to a native function' do
+  describe "the SocketSourceFunc callback" do
+    it "can be cast to a native function" do
       Gio::SocketSourceFunc.new { |*args| p args }.to_native
     end
   end
 
-  describe 'Gio::SimpleAction' do
-    let(:simple_action) { Gio::SimpleAction.new('test', 'd') }
+  describe "Gio::SimpleAction" do
+    let(:simple_action) { Gio::SimpleAction.new("test", "d") }
 
     it 'can read the property "state-type" with #get_property' do
-      simple_action.get_property('state-type').must_be_nil
+      _(simple_action.get_property("state-type")).must_be_nil
     end
 
     it 'can read the property "state-type" with #state_type' do
-      simple_action.state_type.must_be_nil
+      _(simple_action.state_type).must_be_nil
     end
 
     it 'cannot write the property "state-type" with #state_type=' do
-      simple_action.wont_respond_to :state_type=
+      _(simple_action).wont_respond_to :state_type=
     end
   end
 end

data/test/integration/generated_glib_test.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require 'gir_ffi_test_helper'
+require "gir_ffi_test_helper"
 
 # Tests generated classes, methods and functions in the GLib namespace.
-describe 'The generated GLib module' do
-  it 'can auto-generate the GLib::SOURCE_REMOVE constant' do
-    skip unless get_introspection_data 'GLib', 'SOURCE_REMOVE'
-
-    GLib::SOURCE_REMOVE.must_equal false
+describe "The generated GLib module" do
+  it "can auto-generate the GLib::SOURCE_REMOVE constant" do
+    _(GLib::SOURCE_REMOVE).must_equal false
   end
 end

data/test/integration/generated_gobject_test.rb

@@ -1,44 +1,44 @@
 # frozen_string_literal: true
 
-require 'gir_ffi_test_helper'
+require "gir_ffi_test_helper"
 
 GirFFI.setup :Regress
 
 describe GObject do
-  describe '.type_interfaces' do
-    it 'works, showing that returning an array of GType works' do
+  describe ".type_interfaces" do
+    it "works, showing that returning an array of GType works" do
       klass = GObject::TypeModule
       ifcs = GObject.type_interfaces klass.gtype
       assert_equal 1, ifcs.size
     end
   end
 
-  describe '.signal_set_va_marshaller' do
-    it 'can be set up' do
-      result = GObject.setup_method 'signal_set_va_marshaller'
-      result.must_equal true
+  describe ".signal_set_va_marshaller" do
+    it "can be set up" do
+      result = GObject.setup_method "signal_set_va_marshaller"
+      _(result).must_equal true
     end
   end
 
   describe GObject::TypeInfo do
     let(:instance) { GObject::TypeInfo.new }
-    it 'has a working field setter for class_init' do
+    it "has a working field setter for class_init" do
       instance.class_init = proc do |_object_class, _data|
       end
     end
 
-    it 'has a working field getter for class_init' do
-      instance.class_init.must_be_nil
+    it "has a working field getter for class_init" do
+      _(instance.class_init).must_be_nil
       instance.class_init = proc do |_object_class, _data|
       end
       result = instance.class_init
-      result.wont_be_nil
-      result.must_be_instance_of FFI::Function
+      _(result).wont_be_nil
+      _(result).must_be_instance_of FFI::Function
     end
   end
 
   describe GObject::TypePlugin do
-    it 'is implemented as a module' do
+    it "is implemented as a module" do
       mod = GObject::TypePlugin
       assert_instance_of Module, mod
       refute_instance_of Class, mod
@@ -46,71 +46,79 @@ describe GObject do
   end
 
   describe GObject::TypeModule do
-    it 'has the GObject::TypePlugin module as an ancestor' do
+    it "has the GObject::TypePlugin module as an ancestor" do
       klass = GObject::TypeModule
       assert_includes klass.registered_ancestors, GObject::TypePlugin
     end
   end
 
   describe GObject::ValueArray do
-    it 'uses the constructor provided by GObject' do
+    it "uses the constructor provided by GObject" do
       instance = GObject::ValueArray.new 16
-      instance.n_prealloced.must_equal 16
-      instance.n_values.must_equal 0
+      _(instance.n_prealloced).must_equal 16
+      _(instance.n_values).must_equal 0
     end
   end
 
   describe GObject::SignalQuery do
-    it 'works' do
+    it "works" do
       GObject::SignalQuery.new
       pass
     end
 
-    it 'uses the n_params field for the length of param_types' do
-      field_info = get_field_introspection_data 'GObject', 'SignalQuery', 'param_types'
-      skip if field_info.field_type.array_length < 0
+    it "uses the n_params field for the length of param_types" do
       gtype = GObject::Object.gtype
       signals = GObject.signal_list_ids gtype
       signal_query = GObject.signal_query signals.first
-      signal_query.n_params.must_equal 1
-      signal_query.param_types.size.must_equal 1
+      _(signal_query.n_params).must_equal 1
+      _(signal_query.param_types.size).must_equal 1
     end
   end
 
   describe GObject::Binding do
-    it 'is created with GObject::Object#bind_property' do
+    it "is created with GObject::Object#bind_property" do
       source = Regress::TestObj.constructor
       target = Regress::TestObj.constructor
-      binding = source.bind_property 'double', target, 'double', :default
-      binding.must_be_kind_of GObject::Binding
+      binding = source.bind_property "double", target, "double", :default
+      _(binding).must_be_kind_of GObject::Binding
     end
 
-    describe 'an instance' do
+    describe "an instance" do
       let(:source) { Regress::TestObj.constructor }
       let(:target) { Regress::TestObj.constructor }
-      let(:binding) { source.bind_property 'double', target, 'double', :default }
+      let(:binding) { source.bind_property "double", target, "double", :default }
 
       it 'can read the property "target-property" with #get_property' do
-        binding.get_property('target-property').must_equal 'double'
+        _(binding.get_property("target-property")).must_equal "double"
       end
 
       it 'can read the property "target-property" with #target_property' do
-        binding.target_property.must_equal 'double'
+        _(binding.target_property).must_equal "double"
       end
 
       it 'cannot write the property "target-property" with #target_property=' do
-        binding.wont_respond_to :target_property=
+        _(binding).wont_respond_to :target_property=
       end
     end
   end
 
   describe GObject::ParamSpec do
-    it 'does not have a separate #name field accessor' do
-      pspec = GObject.param_spec_int('foo', 'foo bar',
-                                     'The Foo Bar Property',
+    it "has a generated field accessor for #flags but not #get_flags method" do
+      pspec = GObject.param_spec_int("foo", "foo bar",
+                                     "The Foo Bar Property",
                                      10, 20, 15,
                                      3)
-      pspec.wont_respond_to :name
+      _(pspec).wont_respond_to :get_flags
+      _(pspec.method(:flags).original_name).must_equal :flags
+    end
+
+    it "aliases #get_name to #name instead of having a separate field accessor" do
+      pspec = GObject.param_spec_int("foo", "foo bar",
+                                     "The Foo Bar Property",
+                                     10, 20, 15,
+                                     3)
+      _(pspec).must_respond_to :get_name
+      _(pspec.method(:name).original_name).must_equal :get_name
     end
   end
 end

data/test/integration/generated_gst_test.rb

@@ -1,34 +1,34 @@
 # frozen_string_literal: true
 
-require 'gir_ffi_test_helper'
+require "gir_ffi_test_helper"
 
 GirFFI.setup :Gst
 Gst.init []
 
 # Tests behavior of objects in the generated Gio namespace.
-describe 'the generated Gst module' do
-  describe 'Gst::FakeSink' do
-    let(:instance) { Gst::ElementFactory.make('fakesink', 'sink') }
+describe "the generated Gst module" do
+  describe "Gst::FakeSink" do
+    let(:instance) { Gst::ElementFactory.make("fakesink", "sink") }
 
-    it 'allows the handoff signal to be connected and emitted' do
+    it "allows the handoff signal to be connected and emitted" do
       a = nil
-      instance.signal_connect('handoff') { a = 10 }
-      GObject.signal_emit(instance, 'handoff')
-      a.must_equal 10
+      instance.signal_connect("handoff") { a = 10 }
+      GObject.signal_emit(instance, "handoff")
+      _(a).must_equal 10
     end
 
-    it 'correctly fetches the name' do
-      instance.name.must_equal 'sink'
+    it "correctly fetches the name" do
+      _(instance.name).must_equal "sink"
     end
   end
 
-  describe 'Gst::AutoAudioSink' do
-    let(:instance) { Gst::ElementFactory.make('autoaudiosink', 'audiosink') }
+  describe "Gst::AutoAudioSink" do
+    let(:instance) { Gst::ElementFactory.make("autoaudiosink", "audiosink") }
 
-    it 'correctly fetches the name' do
-      skip 'Audio sink was not created' unless instance
-      instance.get_name.must_equal 'audiosink'
-      instance.name.must_equal 'audiosink'
+    it "correctly fetches the name" do
+      skip "Audio sink was not created" unless instance
+      _(instance.get_name).must_equal "audiosink"
+      _(instance.name).must_equal "audiosink"
     end
   end
 end

data/test/integration/generated_gtk_source_test.rb

@@ -1,26 +1,31 @@
 # frozen_string_literal: true
 
-require 'gir_ffi_test_helper'
+require "gir_ffi_test_helper"
 
-# Tests behavior of objects in the generated GtkSource namespace.
-describe 'The generated GtkSource module' do
-  before do
-    begin
-      GirFFI.setup :GtkSource
-    rescue RuntimeError
-      skip 'GtkSource GIR not available'
-    end
-  end
+GirFFI.setup :GtkSource
 
-  describe 'GtkSource::CompletionContext' do
+# Tests behavior of objects in the generated GtkSource namespace.
+describe "The generated GtkSource module" do
+  describe "GtkSource::CompletionContext" do
     let(:instance) { GtkSource::CompletionContext.new }
 
-    it 'allows adding proposals' do
-      proposals = [
-        GtkSource::CompletionItem.new('Proposal 1', 'Proposal 1', nil, 'blah 1'),
-        GtkSource::CompletionItem.new('Proposal 2', 'Proposal 2', nil, 'blah 2'),
-        GtkSource::CompletionItem.new('Proposal 3', 'Proposal 3', nil, 'blah 3')
-      ]
+    it "allows adding proposals" do
+      # Interface changed in GtkSourceView 3.24
+      proposals = if GtkSource::CompletionItem.instance_methods.include? :set_label
+                    Array.new(3) do |i|
+                      GtkSource::CompletionItem.new.tap do |item|
+                        item.label = "Proposal #{i}"
+                        item.text =  "Proposal #{i}"
+                        item.info = "blah #{i}"
+                      end
+                    end
+                  else
+                    [
+                      GtkSource::CompletionItem.new("Proposal 1", "Proposal 1", nil, "blah 1"),
+                      GtkSource::CompletionItem.new("Proposal 2", "Proposal 2", nil, "blah 2"),
+                      GtkSource::CompletionItem.new("Proposal 3", "Proposal 3", nil, "blah 3")
+                    ]
+                  end
       instance.add_proposals nil, proposals, true
     end
   end

data/test/integration/generated_gtop_test.rb

@@ -1,29 +1,22 @@
 # frozen_string_literal: true
 
-require 'gir_ffi_test_helper'
+require "gir_ffi_test_helper"
+
+GirFFI.setup :GTop
 
 # Tests generated methods and functions in the GTop namespace. This namespace
 # contains types with bad names, like 'glibtop_cpu'.
-describe 'The generated GTop module' do
-  before do
-    begin
-      GirFFI.setup :GTop
-    rescue RuntimeError
-      skip 'No GIR data for GTop available'
-    end
-  end
-
-  describe 'Glibtop' do
-    it 'is a valid struct class' do
+describe "The generated GTop module" do
+  describe "Glibtop" do
+    it "is a valid struct class" do
       # Superclass is either BoxedBase or StructBase, depending on library
       # versions. This means StructBase is always one of the ancestors.
       assert GTop::Glibtop < GirFFI::StructBase
     end
 
-    it 'can be created using Glibtop.init' do
-      skip unless get_method_introspection_data 'GTop', 'glibtop', 'init'
+    it "can be created using Glibtop.init" do
       instance = GTop::Glibtop.init
-      instance.must_be_kind_of GTop::Glibtop
+      _(instance).must_be_kind_of GTop::Glibtop
     end
   end
 end