gir_ffi 0.4.0 → 0.4.1

data/test/ffi-glib/s_list_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 describe GLib::SList do
   it "knows its element type" do

data/test/ffi-gobject/gobject_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 require 'ffi-gobject'
 

data/test/ffi-gobject/helper_test.rb

@@ -0,0 +1,103 @@
+require 'gir_ffi_test_helper'
+
+describe GObject::Helper do
+  before do
+    GirFFI.setup :Regress
+  end
+
+  describe "#signal_arguments_to_gvalue_array" do
+    describe "the result of wrapping test-with-static-scope-arg" do
+      setup do
+        o = Regress::TestSubObj.new
+        b = Regress::TestSimpleBoxedA.new
+
+        @gva =
+          GObject::Helper.signal_arguments_to_gvalue_array(
+            "test-with-static-scope-arg", o, b)
+      end
+
+      should "be a GObject::ValueArray" do
+        assert_instance_of GObject::ValueArray, @gva
+      end
+
+      should "contain two values" do
+        assert_equal 2, @gva.n_values
+      end
+
+      should "have a first value with GType for TestSubObj" do
+        assert_equal Regress::TestSubObj.get_gtype, (@gva.get_nth 0).current_gtype
+      end
+
+      should "have a second value with GType for TestSimpleBoxedA" do
+        assert_equal Regress::TestSimpleBoxedA.get_gtype, (@gva.get_nth 1).current_gtype
+      end
+    end
+  end
+
+  describe "#signal_argument_to_gvalue" do
+    it "maps a :utf8 argument to a string-valued GValue" do
+      stub(arg_t = Object.new).tag { :utf8 }
+      stub(info = Object.new).argument_type { arg_t }
+      val =
+        GObject::Helper.signal_argument_to_gvalue(
+          info, "foo")
+      assert_instance_of GObject::Value, val
+      assert_equal "foo", val.get_string
+    end
+  end
+
+  describe "#cast_back_signal_arguments" do
+    it "correctly casts back pointers for the test-with-static-scope-arg signal" do
+      o = Regress::TestSubObj.new
+      b = Regress::TestSimpleBoxedA.new
+      ud = GirFFI::ArgHelper.object_to_inptr "Hello!"
+
+      assert_equal "Hello!", GirFFI::ArgHelper::OBJECT_STORE[ud.address]
+
+      sig = o.class.find_signal "test-with-static-scope-arg"
+
+      gva =
+        GObject::Helper.cast_back_signal_arguments(
+          sig, o.class, o.to_ptr, b.to_ptr, ud)
+
+      klasses = gva.map {|it| it.class}
+      klasses.must_equal [ Regress::TestSubObj,
+                           Regress::TestSimpleBoxedA,
+                           String ]
+      gva[2].must_equal "Hello!"
+    end
+  end
+
+  describe "#cast_signal_argument" do
+    describe "with info for an enum" do
+      before do
+        enuminfo = get_introspection_data 'GLib', 'DateMonth'
+        stub(arg_t = Object.new).interface { enuminfo }
+        stub(arg_t).tag { :interface }
+        stub(@info = Object.new).argument_type { arg_t }
+      end
+
+      it "casts an integer to its enum symbol" do
+        res = GObject::Helper.cast_signal_argument @info, 7
+        assert_equal :july, res
+      end
+    end
+
+    describe "with info for an interface" do
+      before do
+        ifaceinfo = get_introspection_data 'Regress', 'TestInterface'
+        stub(arg_t = Object.new).interface { ifaceinfo }
+        stub(arg_t).tag { :interface }
+        stub(@info = Object.new).argument_type { arg_t }
+      end
+
+      it "casts the argument by calling #to_object on it" do
+        mock(ptr = Object.new).to_object { "good-result" }
+        res = GObject::Helper.cast_signal_argument @info, ptr
+        res.must_equal "good-result"
+      end
+    end
+  end
+
+end
+

data/test/ffi-gobject/object_class_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 require 'ffi-gobject'
 

data/test/ffi-gobject/object_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 require 'ffi-gobject'
 

data/test/ffi-gobject/ruby_style_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 require 'ffi-gobject/ruby_style'
 

data/test/ffi-gobject/value_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 require 'ffi-gobject'
 

data/test/ffi-gobject_introspection/i_base_info_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+require 'introspection_test_helper'
 
 describe GObjectIntrospection::IBaseInfo do
   describe "#safe_name" do

data/test/ffi-gobject_introspection/i_constant_info_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+require 'introspection_test_helper'
 
 describe GObjectIntrospection::IConstantInfo do
   describe "for GLib::USEC_PER_SEC, a constant of type :gint32" do

data/test/ffi-gobject_introspection/i_function_info_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+require 'introspection_test_helper'
 
 describe GObjectIntrospection::IFunctionInfo do
   describe "#safe_name" do

data/test/ffi-gobject_introspection/i_object_info_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+require 'introspection_test_helper'
 
 module GirFFI
   class IObjectInfoTest < MiniTest::Spec

data/test/ffi-gobject_introspection/i_repository_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+require 'introspection_test_helper'
 
 describe GObjectIntrospection::IRepository do
   describe "an instance" do

data/test/ffi-gobject_introspection/lib_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+require 'introspection_test_helper'
 
 describe "loading the shared library" do
   before do

data/test/ffi-gobject_test.rb

@@ -0,0 +1,120 @@
+require 'gir_ffi_test_helper'
+
+describe GObject do
+  before do
+    GirFFI.setup :Regress
+  end
+
+  describe "::signal_emit" do
+    should "emit a signal" do
+      a = 1
+      o = Regress::TestSubObj.new
+      ::GObject::Lib.g_signal_connect_data o, "test", Proc.new { a = 2 }, nil, nil, 0
+      GObject.signal_emit o, "test"
+      assert_equal 2, a
+    end
+
+    should "handle return values" do
+      s = Gio::SocketService.new
+
+      argtypes = [:pointer, :pointer, :pointer, :pointer]
+      callback = FFI::Function.new(:bool, argtypes) { |a,b,c,d| true }
+      ::GObject::Lib.g_signal_connect_data s, "incoming", callback, nil, nil, 0
+      rv = GObject.signal_emit s, "incoming"
+      assert_equal true, rv.get_boolean
+    end
+
+    should "pass in extra arguments" do
+      o = Regress::TestSubObj.new
+      sb = Regress::TestSimpleBoxedA.new
+      sb.some_int8 = 31
+      sb.some_double = 2.42
+      sb.some_enum = :value2
+      b2 = nil
+
+      argtypes = [:pointer, :pointer, :pointer]
+      callback = FFI::Function.new(:void, argtypes) do |a,b,c|
+        b2 = b
+      end
+      ::GObject::Lib.g_signal_connect_data o, "test-with-static-scope-arg", callback, nil, nil, 0
+      GObject.signal_emit o, "test-with-static-scope-arg", sb
+
+      sb2 = Regress::TestSimpleBoxedA.wrap b2
+      assert sb.equals(sb2)
+    end
+  end
+
+  describe "::signal_connect" do
+    should "install a signal handler" do
+      a = 1
+      o = Regress::TestSubObj.new
+      GObject.signal_connect(o, "test") { a = 2 }
+      GObject.signal_emit o, "test"
+      assert_equal 2, a
+    end
+
+    should "pass user data to handler" do
+      a = 1
+      o = Regress::TestSubObj.new
+      GObject.signal_connect(o, "test", 2) { |i, d| a = d }
+      GObject.signal_emit o, "test"
+      assert_equal 2, a
+    end
+
+    should "pass object to handler" do
+      o = Regress::TestSubObj.new
+      o2 = nil
+      GObject.signal_connect(o, "test") { |i, d| o2 = i }
+      GObject.signal_emit o, "test"
+      assert_instance_of Regress::TestSubObj, o2
+      assert_equal o.to_ptr, o2.to_ptr
+    end
+
+    should "not allow connecting an invalid signal" do
+      o = Regress::TestSubObj.new
+      assert_raises RuntimeError do
+        GObject.signal_connect(o, "not-really-a-signal") {}
+      end
+    end
+
+    should "handle return values" do
+      s = Gio::SocketService.new
+      GObject.signal_connect(s, "incoming") { true }
+      rv = GObject.signal_emit s, "incoming"
+      assert_equal true, rv.get_boolean
+    end
+
+    should "require a block" do
+      o = Regress::TestSubObj.new
+      assert_raises ArgumentError do
+        GObject.signal_connect o, "test"
+      end
+    end
+
+    describe "connecting a signal with extra arguments" do
+      setup do
+        @a = nil
+        @b = 2
+
+        o = Regress::TestSubObj.new
+        sb = Regress::TestSimpleBoxedA.new
+        sb.some_int = 23
+
+        GObject.signal_connect(o, "test-with-static-scope-arg", 2) { |i, object, d|
+          @a = d
+          @b = object
+        }
+        GObject.signal_emit o, "test-with-static-scope-arg", sb
+      end
+
+      should "move the user data argument" do
+        assert_equal 2, @a
+      end
+
+      should "pass on the extra arguments" do
+        assert_instance_of Regress::TestSimpleBoxedA, @b
+        assert_equal 23, @b.some_int
+      end
+    end
+  end
+end

data/test/{ffi-glib → gir_ffi-base/glib}/strv_test.rb

@@ -1,6 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
-
-require 'ffi-glib/strv'
+require 'base_test_helper'
 
 describe GLib::Strv do
   it "wraps a pointer" do
@@ -18,8 +16,13 @@ describe GLib::Strv do
 
   describe "#each" do
     it "yields each string element" do
-      ptr = GirFFI::InPointer.from_array :utf8, ["one", "two", "three"]
-      strv = GLib::Strv.new ptr
+      ary = ["one", "two", "three"]
+      ptrs = ary.map {|a| FFI::MemoryPointer.from_string(a)}
+      ptrs << nil
+      block = FFI::MemoryPointer.new(:pointer, ptrs.length)
+      block.write_array_of_pointer ptrs
+
+      strv = GLib::Strv.new block
       arr = []
       strv.each do |str|
         arr << str

data/test/{unit → gir_ffi}/arg_helper_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 describe GirFFI::ArgHelper do
   describe "::ptr_to_typed_array" do
@@ -91,7 +91,7 @@ describe GirFFI::ArgHelper do
 
   describe "::object_pointer_to_object" do
     it "finds the wrapping class by gtype and wraps the pointer in it" do
-      klsptr = GirFFI::InOutPointer.from :gtype, 0xdeadbeef
+      klsptr = GirFFI::InOutPointer.from :GType, 0xdeadbeef
       objptr = GirFFI::InOutPointer.from :pointer, klsptr
 
       object_class = Class.new

data/test/{unit/argument_builder_test.rb → gir_ffi/builder/argument/base_test.rb}

@@ -1,18 +1,6 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 describe GirFFI::Builder::Argument::Base do
-  describe "#subtype_tag" do
-    it "returns :gpointer if the param_type is a pointer with tag :void" do
-      stub(subtype0 = Object.new).tag { :void }
-      stub(subtype0).pointer? { true }
-      stub(type = Object.new).param_type(0) { subtype0 }
-
-      provider = GirFFI::Builder::Argument::Base.new nil, nil, type
-
-      assert_equal :gpointer, provider.subtype_tag
-    end
-  end
-
   describe "#subtype_tag_or_class_name" do
     describe "for a simple type" do
       it "returns the string ':void'" do

data/test/{unit/function_builder_test.rb → gir_ffi/builder/function_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 describe GirFFI::Builder::Function do
   describe "#pretty_print" do
@@ -56,7 +56,7 @@ describe GirFFI::Builder::Function do
       def self.test_callback_destroy_notify callback, user_data, notify
         _v1 = GirFFI::CallbackHelper.wrap_in_callback_args_mapper \"Regress\", \"TestCallbackUserData\", callback
         DummyLib::CALLBACKS << _v1
-        _v2 = GirFFI::ArgHelper.object_to_inptr user_data
+        _v2 = GirFFI::InPointer.from :void, user_data
         _v3 = GirFFI::CallbackHelper.wrap_in_callback_args_mapper \"GLib\", \"DestroyNotify\", notify
         DummyLib::CALLBACKS << _v3
         _v4 = DummyLib.regress_test_callback_destroy_notify _v1, _v2, _v3

data/test/{unit/module_builder_test.rb → gir_ffi/builder/module_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 describe GirFFI::Builder::Module do
   describe "#pretty_print" do

data/test/{unit/callback_builder_test.rb → gir_ffi/builder/type/callback_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 describe GirFFI::Builder::Type::Callback do
   describe "#pretty_print" do

data/test/{unit/constant_builder_test.rb → gir_ffi/builder/type/constant_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 describe GirFFI::Builder::Type::Constant do
   describe "#pretty_print" do

data/test/{unit/enum_builder_test.rb → gir_ffi/builder/type/enum_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 describe GirFFI::Builder::Type::Enum do
   describe "#pretty_print" do

data/test/{unit/interface_builder_test.rb → gir_ffi/builder/type/interface_test.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 describe GirFFI::Builder::Type::Interface do
   describe "#pretty_print" do
@@ -28,6 +28,3 @@ describe GirFFI::Builder::Type::Interface do
     end
   end
 end
-
-
-

data/test/{unit/object_type_builder_test.rb → gir_ffi/builder/type/object_test.rb}

@@ -1,6 +1,26 @@
-require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi_test_helper'
 
 describe GirFFI::Builder::Type::Object do
+  describe '#find_signal' do
+    it 'finds the signal "test" for TestObj' do
+      builder = GirFFI::Builder::Type::Object.new get_introspection_data('Regress', 'TestObj')
+      sig = builder.find_signal 'test'
+      assert_equal 'test', sig.name
+    end
+
+    it 'finds the signal "test" for TestSubObj' do
+      builder = GirFFI::Builder::Type::Object.new get_introspection_data('Regress', 'TestSubObj')
+      sig = builder.find_signal 'test'
+      assert_equal 'test', sig.name
+    end
+
+    it 'finds the signal "changed" for Gtk::Entry' do
+      builder = GirFFI::Builder::Type::Object.new get_introspection_data('Gtk', 'Entry')
+      sig = builder.find_signal 'changed'
+      assert_equal 'changed', sig.name
+    end
+  end
+
   describe "#find_property" do
     it "finds a property specified on the class itself" do
       builder = GirFFI::Builder::Type::Object.new(
@@ -38,5 +58,4 @@ describe GirFFI::Builder::Type::Object do
     end
 
   end
-
 end