gir_ffi 0.2.3 → 0.3.0

data/test/builder_test.rb

@@ -32,130 +32,6 @@ class BuilderTest < MiniTest::Spec
       end
     end
 
-    context "building Gtk::Window" do
-      before do
-	save_module :Gtk
-	save_module :GObject
-	GirFFI::Builder.build_class get_introspection_data('Gtk', 'Window')
-      end
-
-      should "build Gtk namespace" do
-	assert Gtk.const_defined? :Lib
-	assert Gtk.respond_to? :method_missing
-      end
-
-      should "build parent classes also" do
-	assert Gtk.const_defined? :Widget
-	assert Object.const_defined? :GObject
-	assert GObject.const_defined? :InitiallyUnowned
-	assert GObject.const_defined? :Object
-      end
-
-      should "set up inheritance chain" do
-        ancestors = Gtk::Window.ancestors
-	assert_equal [
-	  Gtk::Window,
-	  Gtk::Bin,
-	  Gtk::Container,
-	  Gtk::Widget
-	], ancestors[0..3]
-        assert ancestors.include? GObject::InitiallyUnowned
-	assert ancestors.include? GObject::Object
-      end
-
-      should "create a Gtk::Window#to_ptr method" do
-	assert Gtk::Window.public_method_defined? :to_ptr
-      end
-
-      after do
-	restore_module :Gtk
-	restore_module :GObject
-      end
-    end
-
-    context "building Gtk" do
-      before do
-	save_module :Gtk
-	GirFFI::Builder.build_module 'Gtk'
-      end
-
-      should "create a Lib module ready to attach functions from gtk-x11-2.0" do
-	# The Gtk module has more than one library on my current machine.
-	expected = (@gir.shared_library 'Gtk').split(',')
-	assert_equal expected.sort, Gtk::Lib.ffi_libraries.map(&:name).sort
-      end
-
-      should "create an array CALLBACKS inside the Gtk::Lib module" do
-	assert_equal [], Gtk::Lib::CALLBACKS
-      end
-
-      should "not replace existing module" do
-	oldmodule = Gtk
-	GirFFI::Builder.build_module 'Gtk'
-	assert_equal oldmodule, Gtk
-      end
-
-      should "not replace existing Lib module" do
-	oldmodule = Gtk::Lib
-	GirFFI::Builder.build_module 'Gtk'
-	assert_equal oldmodule, Gtk::Lib
-      end
-
-      after do
-	restore_module :Gtk
-      end
-    end
-
-    context "looking at Gtk.main" do
-      setup do
-	@go = get_introspection_data 'Gtk', 'main'
-      end
-
-      should "have correct introspection data" do
-	@gir.require "Gtk", "2.0"
-	go2 = @gir.find_by_name "Gtk", "main"
-	assert_equal go2, @go
-      end
-
-      should "attach function to Whatever::Lib" do
-	mod = Module.new
-	mod.const_set :Lib, libmod = Module.new
-	libmod.module_eval do
-	  extend FFI::Library
-	  ffi_lib "gtk-x11-2.0"
-	end
-
-	GirFFI::Builder.send :attach_ffi_function, libmod, @go
-        assert_defines_singleton_method libmod, :gtk_main
-      end
-    end
-
-    context "looking at Gtk.init" do
-      setup do
-	GirFFI::Builder.build_module 'Gtk'
-	@go = get_introspection_data 'Gtk', 'init'
-      end
-
-      should "have :pointer, :pointer as types of the arguments for the attached function" do
-	assert_equal [:pointer, :pointer], GirFFI::Builder.send(:ffi_function_argument_types, @go)
-      end
-
-      should "have :void as return type for the attached function" do
-	assert_equal :void, GirFFI::Builder.send(:ffi_function_return_type, @go)
-      end
-    end
-
-    context "looking at Gtk::Widget#show" do
-      setup do
-	@go = get_method_introspection_data 'Gtk', 'Widget', 'show'
-      end
-
-      should "have :pointer as types of the arguments for the attached function" do
-	assert_equal [:pointer], GirFFI::Builder.send(:ffi_function_argument_types, @go)
-      end
-
-    end
-
     context "looking at Regress.test_callback_destroy_notify" do
       before do
 	save_module :GLib

data/test/ffi-glib/hash_table_test.rb

@@ -7,20 +7,6 @@ describe GLib::HashTable do
     assert_equal :utf8, hsh.value_type
   end
 
-  describe "::from_hash" do
-    it "creates a GHashTable from a Ruby array" do
-      hsh = GLib::HashTable.from_hash [:utf8, :gint32],
-        {"foo" => 23, "bar" => 32}
-      assert_equal({"foo" => 23, "bar" => 32}, hsh.to_hash)
-    end
-
-    it "return its argument if given a GHashTable" do
-      hsh = GLib::HashTable.from_hash [:utf8, :gint32], {"foo" => 23, "bar" => 32}
-      hsh2 = GLib::HashTable.from_hash [:utf8, :gint32], hsh
-      assert_equal hsh, hsh2
-    end
-  end
-
   describe "::from" do
     it "creates a GHashTable from a Ruby array" do
       hsh = GLib::HashTable.from [:utf8, :gint32],

data/test/ffi-glib/list_test.rb

@@ -31,19 +31,6 @@ describe GLib::List do
     end
   end
 
-  describe "::from_array" do
-    it "creates a GList from a Ruby array" do
-      lst = GLib::List.from_array :gint32, [3, 2, 1]
-      assert_equal [3, 2, 1], lst.to_a
-    end
-
-    it "return its argument if given a GList" do
-      lst = GLib::List.from_array :gint32, [3, 2, 1]
-      lst2 = GLib::List.from_array :gint32, lst
-      assert_equal lst, lst2
-    end
-  end
-
   describe "::from" do
     it "creates a GList from a Ruby array" do
       lst = GLib::List.from :gint32, [3, 2, 1]

data/test/ffi-glib/ptr_array_test.rb

@@ -16,17 +16,35 @@ describe GLib::PtrArray do
     end
   end
 
-  it "has a working #each method" do
-    arr = GLib::PtrArray.new :utf8
+  describe "#each" do
+    it "works normally" do
+      arr = GLib::PtrArray.new :utf8
 
-    GLib::PtrArray.add arr, "test1"
-    GLib::PtrArray.add arr, "test2"
-    GLib::PtrArray.add arr, "test3"
+      GLib::PtrArray.add arr, "test1"
+      GLib::PtrArray.add arr, "test2"
+      GLib::PtrArray.add arr, "test3"
+
+      a = []
+      arr.each {|v| a << v}
 
-    a = []
-    arr.each {|v| a << v}
+      assert_equal ["test1", "test2", "test3"], a
+    end
+
+    it "works when exiting the loop prematurely" do
+      arr = GLib::PtrArray.new :utf8
 
-    assert_equal ["test1", "test2", "test3"], a
+      GLib::PtrArray.add arr, "test1"
+      GLib::PtrArray.add arr, "test2"
+      GLib::PtrArray.add arr, "test3"
+
+      a = []
+      arr.each do |v|
+        a << v
+        break if v == "test2"
+      end
+
+      assert_equal ["test1", "test2"], a
+    end
   end
 
   it "includes Enumerable" do

data/test/ffi-glib/s_list_test.rb

@@ -31,15 +31,15 @@ describe GLib::SList do
     end
   end
 
-  describe "::from_array" do
+  describe "::from" do
     it "creates a GSList from a Ruby array" do
-      lst = GLib::SList.from_array :gint32, [3, 2, 1]
+      lst = GLib::SList.from :gint32, [3, 2, 1]
       assert_equal [3, 2, 1], lst.to_a
     end
 
     it "return its argument if given a GSList" do
-      lst = GLib::SList.from_array :gint32, [3, 2, 1]
-      lst2 = GLib::SList.from_array :gint32, lst
+      lst = GLib::SList.from :gint32, [3, 2, 1]
+      lst2 = GLib::SList.from :gint32, lst
       assert_equal lst, lst2
     end
   end

data/test/ffi-gobject/g_object_overrides_test.rb

@@ -164,42 +164,26 @@ class GObjectOverridesTest < MiniTest::Spec
         end
       end
 
-      context "#cast_back_signal_arguments" do
-	context "the result of casting pointers for the test-with-static-scope-arg signal" do
-	  setup do
-	    sig_name = "test-with-static-scope-arg"
-	    o = Regress::TestSubObj.new
-	    b = Regress::TestSimpleBoxedA.new
-	    ud = GirFFI::ArgHelper.object_to_inptr "Hello!"
-	    sig = o.class._find_signal sig_name
-
-	    @gva =
-	      GObject::Helper.cast_back_signal_arguments(
-		sig, o.class, o.to_ptr, b.to_ptr, ud)
-	  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!"
 
-	  should "have three elements" do
-	    assert_equal 3, @gva.length
-	  end
+          assert_equal "Hello!", GirFFI::ArgHelper::OBJECT_STORE[ud.address]
 
-	  context "its first value" do
-	    should "be a TestSubObj" do
-	      assert_instance_of Regress::TestSubObj, @gva[0]
-	    end
-	  end
+          sig = o.class._find_signal "test-with-static-scope-arg"
 
-	  context "its second value" do
-	    should "be a TestSimpleBoxedA" do
-	      assert_instance_of Regress::TestSimpleBoxedA, @gva[1]
-	    end
-	  end
+          gva =
+            GObject::Helper.cast_back_signal_arguments(
+              sig, o.class, o.to_ptr, b.to_ptr, ud)
 
-	  context "its third value" do
-	    should "be a 'Hello!'" do
-	      assert_equal "Hello!", @gva[2]
-	    end
-	  end
-	end
+          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

data/test/ffi-gobject/gobject_test.rb

@@ -2,6 +2,8 @@ require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
 require 'ffi-gobject'
 
+GirFFI.setup :GIMarshallingTests
+
 describe GObject do
   it "has type_init as a public method" do
     assert GObject.respond_to?('type_init')
@@ -48,5 +50,30 @@ describe GObject do
     assert_equal "GStrv", GObject.type_name(GObject::TYPE_STRV)
     assert_equal "GHashTable", GObject.type_name(GObject::TYPE_HASH_TABLE)
   end
-end
 
+  describe "::object_class_from_instance" do
+    it "returns a GObject::ObjectClass with the correct GType" do
+      obj = GIMarshallingTests::OverridesObject.new
+      object_class = GObject.object_class_from_instance obj
+      gtype = object_class.g_type_class.g_type
+
+      object_class.must_be_instance_of GObject::ObjectClass
+      gtype.must_equal GIMarshallingTests::OverridesObject.get_gtype
+    end
+  end
+
+  describe "creating ParamSpecs" do
+    describe "#param_spec_int" do
+      it "creates a GObject::ParamSpecInt" do
+        spec = GObject.param_spec_int("foo", "foo bar",
+                                      "The Foo Bar Property",
+                                      10, 20, 15,
+                                      3)
+        spec.must_be_instance_of GObject::ParamSpecInt
+        spec.minimum.must_equal 10
+        spec.maximum.must_equal 20
+        spec.default_value.must_equal 15
+      end
+    end
+  end
+end

data/test/ffi-gobject/object_class_test.rb

@@ -0,0 +1,21 @@
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+
+require 'ffi-gobject'
+
+describe GObject::ObjectClass do
+  describe "#list_properties" do
+    it "returns GIMarshallingTests::OverridesObject's properties" do
+      obj = GIMarshallingTests::OverridesObject.new
+      object_class = GObject.object_class_from_instance obj
+
+      info = get_introspection_data 'GIMarshallingTests', 'OverridesObject'
+      expected_props = info.properties.map(&:name)
+      expected_props += info.parent.properties.map(&:name)
+
+      props = object_class.list_properties
+      prop_names = props.map(&:get_name)
+
+      prop_names.sort.must_equal expected_props.sort
+    end
+  end
+end

data/test/ffi-gobject/object_test.rb

@@ -8,5 +8,9 @@ describe GObject::Object do
       assert_equal 1,
         GObject::Object.instance_method("get_property").arity
     end
+
+    it 'includes GObject::RubyStyle' do
+      assert GObject::Object.included_modules.include?(GObject::RubyStyle)
+    end
   end
 end

data/test/ffi-gobject/ruby_style_test.rb

@@ -0,0 +1,38 @@
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+
+require 'ffi-gobject/ruby_style'
+
+describe GObject::RubyStyle do
+  class RubyStyleTest
+    include GObject::RubyStyle
+    def get_x
+      @x
+    end
+    def set_x(val)
+      @x = val
+    end
+  end
+
+  subject { RubyStyleTest.new }
+
+  it 'reads x by calling get_x' do
+    subject.set_x(1)
+    assert_equal 1, subject.x
+  end
+
+  it 'writes x by calling set_x' do
+    subject.x = 2
+    assert_equal 2, subject.x
+  end
+
+  it 'delegates signal_connect to GObject' do
+    mock(GObject).signal_connect(subject, 'some-event')
+    subject.signal_connect('some-event') do
+      nothing
+    end
+
+    RR.verify
+  end
+
+end
+

data/test/ffi-gobject_introspection/i_constant_info_test.rb

@@ -1,21 +1,21 @@
 require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
 
 describe GObjectIntrospection::IConstantInfo do
-  describe "for GLib::ALLOCATOR_LIST, a constant of type :gint32" do
+  describe "for GLib::USEC_PER_SEC, a constant of type :gint32" do
     before do
-      @info = get_introspection_data 'GLib', 'ALLOCATOR_LIST'
+      @info = get_introspection_data 'GLib', 'USEC_PER_SEC'
     end
 
     it "returns :gint32 as its type" do
       assert_equal :gint32, @info.constant_type.tag
     end
 
-    it "returns a value union with member :v_int32 with value 1" do
-      assert_equal 1, @info.value_union[:v_int32]
+    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
-      assert_equal 1, @info.value
+      assert_equal 1_000_000, @info.value
     end
   end
 end

data/test/ffi-gobject_introspection/i_repository_test.rb

@@ -40,18 +40,18 @@ describe GObjectIntrospection::IRepository do
     end
   end
 
-  describe "enumerating the infos for Gtk" do
+  describe "enumerating the infos for GObject" do
     setup do
       @gir = GObjectIntrospection::IRepository.default
-      @gir.require 'Gtk', "2.0"
+      @gir.require 'GObject', "2.0"
     end
 
     should "yield more than one object" do
-      assert_operator @gir.n_infos('Gtk'), :>, 0
+      assert_operator @gir.n_infos('GObject'), :>, 0
     end
 
     should "yield IBaseInfo objects" do
-      assert_kind_of GObjectIntrospection::IBaseInfo, @gir.info('Gtk', 0)
+      assert_kind_of GObjectIntrospection::IBaseInfo, @gir.info('GObject', 0)
     end
   end
 end

data/test/ffi-gtk/gtk_test.rb

@@ -0,0 +1,36 @@
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+
+require 'ffi-gtk3'
+
+describe Gtk do
+  describe "::init" do
+    before do
+      save_module :Gtk
+      ::Object.const_set :Gtk, Module.new
+      Gtk.class_eval do
+        def self.init arr
+          ["baz", "qux", "zonk"]
+        end
+      end
+      stub(Gtk)._setup_method { }
+
+      load 'ffi-gtk/base.rb'
+    end
+
+    it "does not take any arguments" do
+      assert_raises(ArgumentError) { Gtk.init 1, ["foo"] }
+      assert_raises(ArgumentError) { Gtk.init ["foo"] }
+      assert_nothing_raised { Gtk.init }
+    end
+
+    it "replaces ARGV with the tail of the result of the original init function" do
+      ARGV.replace ["foo", "bar"]
+      Gtk.init
+      assert_equal ["qux", "zonk"], ARGV.to_a
+    end
+
+    after do
+      restore_module :Gtk
+    end
+  end
+end

data/test/gir_ffi_test_helper.rb

@@ -21,14 +21,18 @@ module GObjectIntrospection
   end
 end
 
-# Preload data for Gtk+ version 2.0.
-gir = GObjectIntrospection::IRepository.default
-gir.require "Gtk", "2.0"
-
 # Need a dummy module for some tests.
 module DummyLib
 end
 
+# Global sequence provider. Needed to make unique class names.
+class Sequence
+  @@seq = 0
+  def self.next
+    @@seq += 1
+  end
+end
+
 class MiniTest::Unit::TestCase
   def cws code
     code.gsub(/(^\s*|\s*$)/, "")

data/test/integration/derived_classes_test.rb

@@ -1,31 +1,47 @@
 require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
-# Tests deriving Ruby classes from GObject classes.
-describe "Class derivation" do
-  before do
-    save_module :GIMarshallingTests
-    GirFFI.setup :GIMarshallingTests
-  end
+GirFFI.setup :Regress
 
-  describe "with an interface mixed in" do
+# Tests deriving Ruby classes from GObject classes.
+describe "For derived classes" do
+  describe "setting up methods when first called" do
     before do
-      @klass = Class.new GIMarshallingTests::OverridesObject
-      @klass.send :include, GIMarshallingTests::Interface
+      save_module :GIMarshallingTests
+      GirFFI.setup :GIMarshallingTests
     end
 
-    it "finds class methods in the superclass" do
-      @klass.returnv
+    describe "when an interface is mixed in" do
+      before do
+        @klass = Class.new GIMarshallingTests::OverridesObject
+        @klass.send :include, GIMarshallingTests::Interface
+      end
+
+      it "finds class methods in the superclass" do
+        @klass.returnv
+      end
+
+      it "finds instance methods in the superclass" do
+        obj = @klass.new
+        result = obj.method
+        result.must_equal 42
+      end
     end
 
-    it "finds instance methods in the superclass" do
-      obj = @klass.new
-      result = obj.method
-      result.must_equal 42
+    after do
+      restore_module :GIMarshallingTests
     end
   end
 
-  after do
-    restore_module :GIMarshallingTests
+  describe "the initializer" do
+    it "does not have to call super" do
+      klass = Class.new Regress::TestSubObj do
+        def initialize *args
+        end
+      end
+
+      obj = klass.new
+      obj.must_be_instance_of klass
+      obj.to_ptr.wont_be_nil
+    end
   end
 end
-