gir_ffi 0.7.5 → 0.7.6

data/test/ffi-glib/byte_array_test.rb

@@ -1,7 +1,7 @@
 require 'gir_ffi_test_helper'
 
 describe GLib::ByteArray do
-  it "can succesfully be created with Glib::ByteArray.new" do
+  it "can succesfully be created with GLib::ByteArray.new" do
     ba = GLib::ByteArray.new
     assert_instance_of GLib::ByteArray, ba
   end

data/test/ffi-glib/bytes_test.rb

@@ -1,7 +1,7 @@
 require 'gir_ffi_test_helper'
 
 describe GLib::Bytes do
-  it "can succesfully be created with Glib::Bytes.new" do
+  it "can succesfully be created with GLib::Bytes.new" do
     bytes = GLib::Bytes.new [1, 2, 3]
     bytes.must_be_instance_of GLib::Bytes
   end

data/test/ffi-gobject/object_test.rb

@@ -35,13 +35,23 @@ describe GObject::Object do
 
   describe "#signal_connect" do
     subject { GObject::Object.new GObject::TYPE_OBJECT, nil }
+
     it 'delegates to GObject' do
-      mock(GObject).signal_connect(subject, 'some-event')
+      mock(GObject).signal_connect(subject, 'some-event', nil)
       subject.signal_connect('some-event') do
         nothing
       end
 
       RR.verify
     end
+
+    it 'delegates to GObject if an optional data argument is passed' do
+      mock(GObject).signal_connect(subject, 'some-event', 'data')
+      subject.signal_connect('some-event', 'data') do
+        nothing
+      end
+
+      RR.verify
+    end
   end
 end

data/test/ffi-gobject/value_test.rb

@@ -200,7 +200,7 @@ describe GObject::Value do
 
     it "works with a ByteArray" do
       ba = GLib::ByteArray.new.append("some bytes")
-      v = GObject::Value.for_g_type GObject.type_from_name("GByteArray")
+      v = GObject::Value.for_g_type GObject::TYPE_BYTE_ARRAY
       v.set_boxed ba
 
       result = v.get_value
@@ -208,6 +208,17 @@ describe GObject::Value do
       result.to_string.must_equal "some bytes"
       result.must_be_kind_of GLib::ByteArray
     end
+
+    it "works with an Array" do
+      arr = GLib::Array.from(:uint, [1, 2, 3])
+      v = GObject::Value.for_g_type GObject::TYPE_ARRAY
+      v.set_boxed arr
+
+      result = v.get_value
+
+      result.must_be_kind_of GLib::Array
+      result.reset_typespec(:uint).to_a.must_equal [1, 2, 3]
+    end
   end
 
   describe "::from" do

data/test/ffi-gobject_introspection/i_base_info_test.rb

@@ -15,6 +15,20 @@ describe GObjectIntrospection::IBaseInfo do
     end
   end
 
+  describe "#deprecated?" do
+    let(:deprecated_info) { get_introspection_data 'Regress', 'test_versioning' }
+    let(:other_info) { get_introspection_data 'Regress', 'test_value_return' }
+
+    it "returns true for a deprecated item" do
+      skip unless deprecated_info
+      deprecated_info.must_be :deprecated?
+    end
+
+    it "returns false for a non-deprecated item" do
+      other_info.wont_be :deprecated?
+    end
+  end
+
   describe "upon garbage collection" do
     it "calls g_base_info_unref" do
       if defined?(RUBY_ENGINE) && ['jruby', 'rbx'].include?(RUBY_ENGINE)

data/test/ffi-gobject_introspection/i_object_info_test.rb

@@ -1,15 +1,17 @@
 require 'introspection_test_helper'
 
 describe GObjectIntrospection::IObjectInfo do
+  let(:object_info) { get_introspection_data('GObject', 'Object') }
+
   describe "#find_vfunc" do
-    before do
-      gir = GObjectIntrospection::IRepository.default
-      gir.require 'GObject', nil
-      @info = gir.find_by_name 'GObject', 'Object'
+    it "finds a vfunc by name" do
+      object_info.find_vfunc("finalize").wont_be_nil
     end
+  end
 
-    it "finds a vfunc by name" do
-      @info.find_vfunc("finalize").wont_be_nil
+  describe "#type_name" do
+    it "returns the correct name" do
+      object_info.type_name.must_equal 'GObject'
     end
   end
 end

data/test/ffi-gobject_introspection/i_registered_type_info_test.rb

@@ -0,0 +1,24 @@
+require 'introspection_test_helper'
+
+describe GObjectIntrospection::IRegisteredTypeInfo do
+  describe "#get_type_name" do
+    describe "for an interface" do
+      let(:registered_type_info) {
+        get_introspection_data('GIMarshallingTests', 'Interface') }
+
+      it "returns interface name" do
+        registered_type_info.type_name.must_equal 'GIMarshallingTestsInterface'
+      end
+    end
+
+    describe "for a type that is not an interface" do
+      let(:registered_type_info) {
+        get_introspection_data('GIMarshallingTests', 'Enum') }
+
+      it "returns nil" do
+        registered_type_info.type_name.must_be_nil
+      end
+    end
+  end
+end
+

data/test/ffi-gobject_introspection/i_type_info_test.rb

@@ -0,0 +1,17 @@
+require 'introspection_test_helper'
+
+describe GObjectIntrospection::ITypeInfo do
+  describe "#name?" do
+    let(:object_info) { get_introspection_data('GIMarshallingTests', 'Object') }
+    let(:vfunc_info) { object_info.find_vfunc('vfunc_array_out_parameter') }
+    let(:arg_info) { vfunc_info.args[0] }
+    let(:type_info) { arg_info.argument_type }
+
+    it "raises an error" do
+      skip unless vfunc_info
+      proc {
+        type_info.name
+      }.must_raise RuntimeError
+    end
+  end
+end

data/test/gir_ffi/builder_test.rb

@@ -161,9 +161,10 @@ describe GirFFI::Builder do
       GirFFI::Builder.build_class get_introspection_data('Regress', 'TestSubObj')
     end
 
-    it "builds Regress namespace" do
+    it "sets up the Regress namespace" do
       assert Regress.const_defined? :Lib
-      assert Regress.respond_to? :method_missing
+      assert Regress.respond_to? :gir_ffi_builder
+      assert Regress.const_defined? :GIR_FFI_BUILDER
     end
 
     it "creates the Regress::Lib module ready to attach functions from the shared library" do

data/test/gir_ffi/builders/argument_builder_test.rb

@@ -36,7 +36,7 @@ describe GirFFI::Builders::ArgumentBuilder do
 
       describe "when it is a regular argument" do
         before do
-          builder.is_closure = false
+          builder.closure = false
         end
 
         it "has the correct value for #pre_conversion" do
@@ -50,7 +50,7 @@ describe GirFFI::Builders::ArgumentBuilder do
 
       describe "when it is a closure" do
         before do
-          builder.is_closure = true
+          builder.closure = true
         end
 
         it "has the correct value for #pre_conversion" do

data/test/gir_ffi/builders/function_builder_test.rb

@@ -8,7 +8,7 @@ describe GirFFI::Builders::FunctionBuilder do
     code = fbuilder.generate
 
     expected = <<-CODE
-      def self.test_array_fixed_out_objects 
+      def self.test_array_fixed_out_objects
         _v1 = GirFFI::InOutPointer.for [:pointer, :c]
         Regress::Lib.regress_test_array_fixed_out_objects _v1
         _v2 = GirFFI::SizedArray.wrap([:pointer, Regress::TestObj], 2, _v1.to_value)
@@ -25,7 +25,7 @@ describe GirFFI::Builders::FunctionBuilder do
     code = fbuilder.generate
 
     expected = <<-CODE
-      def self.test_array_gint16_in ints
+      def self.test_array_gint16_in(ints)
         n_ints = ints.nil? ? 0 : ints.length
         _v1 = n_ints
         _v2 = GirFFI::SizedArray.from(:gint16, -1, ints)
@@ -43,7 +43,7 @@ describe GirFFI::Builders::FunctionBuilder do
     code = fbuilder.generate
 
     expected = <<-CODE
-      def self.test_callback_destroy_notify callback, user_data, notify
+      def self.test_callback_destroy_notify(callback, user_data, notify)
         _v1 = Regress::TestCallbackUserData.from(callback)
         _v2 = GirFFI::InPointer.from_closure_data(user_data)
         _v3 = GLib::DestroyNotify.from(notify)
@@ -61,7 +61,7 @@ describe GirFFI::Builders::FunctionBuilder do
     code = fbuilder.generate
 
     expected = <<-CODE
-      def self.new_from_file x
+      def self.new_from_file(x)
         _v1 = GirFFI::InPointer.from(:utf8, x)
         _v2 = FFI::MemoryPointer.new(:pointer).write_pointer nil
         _v3 = Regress::Lib.regress_test_obj_new_from_file _v1, _v2
@@ -80,7 +80,7 @@ describe GirFFI::Builders::FunctionBuilder do
     code = fbuilder.generate
 
     expected = <<-CODE
-      def self.gvalue_in value
+      def self.gvalue_in(value)
         _v1 = GObject::Value.from(value)
         GIMarshallingTests::Lib.gi_marshalling_tests_gvalue_in _v1
       end
@@ -95,11 +95,11 @@ describe GirFFI::Builders::FunctionBuilder do
     code = fbuilder.generate
 
     expected = <<-CODE
-      def self.test_array_int_null_in arr
-        _v1 = GirFFI::SizedArray.from(:gint32, -1, arr)
+      def self.test_array_int_null_in(arr)
         len = arr.nil? ? 0 : arr.length
-        _v2 = len
-        Regress::Lib.regress_test_array_int_null_in _v1, _v2
+        _v1 = len
+        _v2 = GirFFI::SizedArray.from(:gint32, -1, arr)
+        Regress::Lib.regress_test_array_int_null_in _v2, _v1
       end
     CODE
 
@@ -112,12 +112,12 @@ describe GirFFI::Builders::FunctionBuilder do
     code = fbuilder.generate
 
     expected = <<-CODE
-      def self.test_array_int_null_out 
-        _v1 = GirFFI::InOutPointer.for [:pointer, :c]
-        _v2 = GirFFI::InOutPointer.for :gint32
-        Regress::Lib.regress_test_array_int_null_out _v1, _v2
-        _v3 = _v2.to_value
-        _v4 = GirFFI::SizedArray.wrap(:gint32, _v3, _v1.to_value)
+      def self.test_array_int_null_out
+        _v1 = GirFFI::InOutPointer.for :gint32
+        _v2 = GirFFI::InOutPointer.for [:pointer, :c]
+        Regress::Lib.regress_test_array_int_null_out _v2, _v1
+        _v3 = _v1.to_value
+        _v4 = GirFFI::SizedArray.wrap(:gint32, _v3, _v2.to_value)
         return _v4
       end
     CODE
@@ -131,15 +131,15 @@ describe GirFFI::Builders::FunctionBuilder do
     code = fbuilder.generate
 
     expected = <<-CODE
-      def method_array_inout ints
-        _v1 = GirFFI::InOutPointer.for [:pointer, :c]
-        _v1.set_value GirFFI::SizedArray.from(:gint32, -1, ints)
+      def method_array_inout(ints)
         length = ints.nil? ? 0 : ints.length
-        _v2 = GirFFI::InOutPointer.for :gint32
-        _v2.set_value length
-        GIMarshallingTests::Lib.gi_marshalling_tests_object_method_array_inout self, _v1, _v2
-        _v3 = _v2.to_value
-        _v4 = GirFFI::SizedArray.wrap(:gint32, _v3, _v1.to_value)
+        _v1 = GirFFI::InOutPointer.for :gint32
+        _v1.set_value length
+        _v2 = GirFFI::InOutPointer.for [:pointer, :c]
+        _v2.set_value GirFFI::SizedArray.from(:gint32, -1, ints)
+        GIMarshallingTests::Lib.gi_marshalling_tests_object_method_array_inout self, _v2, _v1
+        _v3 = _v1.to_value
+        _v4 = GirFFI::SizedArray.wrap(:gint32, _v3, _v2.to_value)
         return _v4
       end
     CODE
@@ -153,7 +153,7 @@ describe GirFFI::Builders::FunctionBuilder do
     code = fbuilder.generate
 
     expected = <<-CODE
-      def instance_method 
+      def instance_method
         _v1 = Regress::Lib.regress_test_obj_instance_method self
         return _v1
       end
@@ -171,7 +171,7 @@ describe GirFFI::Builders::FunctionBuilder do
       it "builds a correct definition" do
         size_type = ":guint#{FFI.type_size(:size_t) * 8}"
         code.must_equal <<-CODE.reset_indentation
-          def get_strv 
+          def get_strv
             _v1 = GirFFI::InOutPointer.for #{size_type}
             _v2 = GLib::Lib.g_variant_get_strv self, _v1
             _v3 = GLib::Strv.wrap(_v2)
@@ -187,7 +187,7 @@ describe GirFFI::Builders::FunctionBuilder do
       it "builds a correct definition" do
         skip unless function_info
         code.must_equal <<-CODE.reset_indentation
-          def self.has_parameter_named_attrs foo, attributes
+          def self.has_parameter_named_attrs(foo, attributes)
             _v1 = foo
             GirFFI::ArgHelper.check_fixed_array_size 32, attributes, \"attributes\"
             _v2 = GirFFI::SizedArray.from([:pointer, :guint32], 32, attributes)
@@ -206,7 +206,7 @@ describe GirFFI::Builders::FunctionBuilder do
       it "builds a correct definition" do
         skip unless function_info
         code.must_equal <<-CODE.reset_indentation
-          def method_int8_arg_and_out_callee arg
+          def method_int8_arg_and_out_callee(arg)
             _v1 = arg
             _v2 = GirFFI::InOutPointer.for [:pointer, :gint8]
             GIMarshallingTests::Lib.gi_marshalling_tests_object_method_int8_arg_and_out_callee self, _v1, _v2

data/test/gir_ffi/builders/object_builder_test.rb

@@ -22,6 +22,16 @@ describe GirFFI::Builders::ObjectBuilder do
       sig = builder.find_signal 'changed'
       sig.name.must_equal 'changed'
     end
+
+    it "raises an error for a signal that doesn't exist" do
+      msg = nil
+      begin
+        obj_builder.find_signal 'foo'
+      rescue RuntimeError => e
+        msg = e.message
+      end
+      assert_match(/^Signal/, msg)
+    end
   end
 
   describe "#find_property" do

data/test/gir_ffi/builders/return_value_builder_test.rb

@@ -329,7 +329,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
     end
 
     it "marks itself as irrelevant" do
-      builder.is_relevant?.must_equal false
+      builder.relevant?.must_equal false
     end
 
     it "returns nothing" do
@@ -342,7 +342,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
       get_introspection_data("Regress", "TestCallbackUserData").args[0].argument_type }
 
     before do
-      builder.is_closure = true
+      builder.closure = true
     end
 
     it "fetches the stored object in #post_conversion" do
@@ -366,7 +366,7 @@ describe GirFFI::Builders::ReturnValueBuilder do
     end
 
     it "marks itself as irrelevant" do
-      builder.is_relevant?.must_equal false
+      builder.relevant?.must_equal false
     end
 
     it "returns nothing" do

data/test/gir_ffi/builders/signal_closure_builder_test.rb

@@ -21,7 +21,7 @@ describe GirFFI::Builders::SignalClosureBuilder do
       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)
+          _instance = param_values.first.get_value_plain
           _v1 = _instance
           wrap(closure.to_ptr).invoke_block(_v1)
         end
@@ -40,7 +40,7 @@ describe GirFFI::Builders::SignalClosureBuilder do
 
         expected = <<-CODE.reset_indentation
         def self.marshaller(closure, return_value, param_values, _invocation_hint, _marshal_data)
-          _instance, i, _ = param_values.map(&:get_value_plain)
+          _instance, i = param_values.map(&:get_value_plain)
           _v1 = _instance
           _v2 = i
           _v3 = wrap(closure.to_ptr).invoke_block(_v1, _v2)
@@ -59,7 +59,7 @@ describe GirFFI::Builders::SignalClosureBuilder do
       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)
+          _instance, result = param_values.map(&:get_value_plain)
           _v1 = _instance
           _v2 = result
           wrap(closure.to_ptr).invoke_block(_v1, _v2)
@@ -79,7 +79,7 @@ describe GirFFI::Builders::SignalClosureBuilder do
 
         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)
+          _instance, arr, len = param_values.map(&:get_value_plain)
           _v1 = _instance
           _v2 = len
           _v3 = GirFFI::SizedArray.wrap(:guint32, _v2, arr)
@@ -100,7 +100,7 @@ describe GirFFI::Builders::SignalClosureBuilder do
 
         expected = <<-CODE.reset_indentation
         def self.marshaller(closure, return_value, param_values, _invocation_hint, _marshal_data)
-          _instance, object, _ = param_values.map(&:get_value_plain)
+          _instance, object = param_values.map(&:get_value_plain)
           _v1 = _instance
           _v2 = Regress::TestSimpleBoxedA.wrap(object)
           wrap(closure.to_ptr).invoke_block(_v1, _v2)
@@ -120,7 +120,7 @@ describe GirFFI::Builders::SignalClosureBuilder do
 
         expected = <<-CODE.reset_indentation
         def self.marshaller(closure, return_value, param_values, _invocation_hint, _marshal_data)
-          _instance, i, _ = param_values.map(&:get_value_plain)
+          _instance, i = param_values.map(&:get_value_plain)
           _v1 = _instance
           _v2 = i
           _v3 = wrap(closure.to_ptr).invoke_block(_v1, _v2)

data/test/gir_ffi/in_out_pointer_test.rb

@@ -1,7 +1,5 @@
 require 'gir_ffi_test_helper'
 
-require 'gir_ffi/in_out_pointer'
-
 describe GirFFI::InOutPointer do
   describe ".new" do
     it "wraps an existing pointer and a type" do

data/test/gir_ffi/info_ext/i_type_info_test.rb

@@ -408,7 +408,7 @@ describe GirFFI::InfoExt::ITypeInfo do
         stub(type_info).interface { interface_type_info }
       end
 
-      it "has the correct value for #pre" do
+      it "returns an empty array" do
         type_info.extra_conversion_arguments.must_equal []
       end
     end

data/test/gir_ffi_test_helper.rb

@@ -59,10 +59,6 @@ class Minitest::Test
     GObject::Object::Struct.new(object.to_ptr)[:ref_count]
   end
 
-  def is_floating? object
-    (GObject::Object::Struct.new(object.to_ptr)[:qdata].address & 2) == 2
-  end
-
   def max_for_unsigned_type type
     ( 1 << (FFI.type_size(type) * 8) ) - 1
   end

data/test/integration/generated_gimarshallingtests_test.rb

@@ -242,7 +242,7 @@ describe GIMarshallingTests do
     it "has the member :value2" do
       assert_equal 2, GIMarshallingTests::NoTypeFlags[:value2]
     end
-    it "has the member :value" do
+    it "has the member :value3" do
       assert_equal 4, GIMarshallingTests::NoTypeFlags[:value3]
     end
     it "has the member :mask" do

data/test/integration/generated_regress_test.rb

@@ -435,7 +435,7 @@ describe Regress do
       end
 
       it "has been sunk" do
-        assert !is_floating?(@o)
+        @o.wont_be :floating?
       end
     end
   end
@@ -564,7 +564,7 @@ describe Regress do
     end
 
     it "does not float" do
-      assert !is_floating?(instance)
+      instance.wont_be :floating?
     end
 
     it "has a working method #matrix" do

data/test/integration/idle_loop_test.rb

@@ -0,0 +1,25 @@
+require 'gir_ffi_test_helper'
+
+describe "threading" do
+  it "works while a MainLoop is running" do
+    main_loop = GLib::MainLoop.new nil, false
+
+    a = []
+    GLib.timeout_add(GLib::PRIORITY_DEFAULT, 100,
+                     proc { main_loop.quit },
+                     nil, nil)
+
+    slow_thread = Thread.new do
+      sleep 0.001
+      a << "During run"
+    end
+
+    a << "Before run"
+    main_loop.run
+    a << "After run"
+
+    slow_thread.join
+
+    a.last.must_equal "After run"
+  end
+end

data/test/minitest/stats_plugin.rb

@@ -0,0 +1,26 @@
+module Minitest
+  class StatsReporter < AbstractReporter
+    def initialize _options
+      @results = []
+    end
+
+    def start
+      @current_time = Time.now
+    end
+
+    def record result
+      @results << result
+    end
+
+    def report
+      slowest = @results.sort_by(&:time).reverse.first(10)
+      slowest.each do |result|
+        puts "%10.4f %s" % [result.time, result.location]
+      end
+    end
+  end
+
+  def self.plugin_stats_init(options)
+    self.reporter << StatsReporter.new(options)
+  end
+end