gir_ffi 0.2.2 → 0.2.3

data/test/ffi-gobject/gobject_test.rb

@@ -21,28 +21,32 @@ describe GObject do
 
   it "has constants for the fundamental GTypes" do
     assert_equal GObject.type_from_name("invalid"), GObject::TYPE_INVALID
-    assert_equal GObject.type_from_name("void"), GObject::TYPE_NONE
-    assert_equal GObject.type_from_name("GInterface"), GObject::TYPE_INTERFACE
-    assert_equal GObject.type_from_name("gchar"), GObject::TYPE_CHAR
-    assert_equal GObject.type_from_name("guchar"), GObject::TYPE_UCHAR
-    assert_equal GObject.type_from_name("gboolean"), GObject::TYPE_BOOLEAN
-    assert_equal GObject.type_from_name("gint"), GObject::TYPE_INT
-    assert_equal GObject.type_from_name("guint"), GObject::TYPE_UINT
-    assert_equal GObject.type_from_name("glong"), GObject::TYPE_LONG
-    assert_equal GObject.type_from_name("gulong"), GObject::TYPE_ULONG
-    assert_equal GObject.type_from_name("gint64"), GObject::TYPE_INT64
-    assert_equal GObject.type_from_name("guint64"), GObject::TYPE_UINT64
-    assert_equal GObject.type_from_name("GEnum"), GObject::TYPE_ENUM
-    assert_equal GObject.type_from_name("GFlags"), GObject::TYPE_FLAGS
-    assert_equal GObject.type_from_name("gfloat"), GObject::TYPE_FLOAT
-    assert_equal GObject.type_from_name("gdouble"), GObject::TYPE_DOUBLE
-    assert_equal GObject.type_from_name("gchararray"), GObject::TYPE_STRING
-    assert_equal GObject.type_from_name("gpointer"), GObject::TYPE_POINTER
-    assert_equal GObject.type_from_name("GBoxed"), GObject::TYPE_BOXED
-    assert_equal GObject.type_from_name("GParam"), GObject::TYPE_PARAM
-    assert_equal GObject.type_from_name("GObject"), GObject::TYPE_OBJECT
-    assert_equal GObject.type_from_name("GType"), GObject::TYPE_GTYPE
-    assert_equal GObject.type_from_name("GVariant"), GObject::TYPE_VARIANT
+    assert_equal nil, GObject.type_name(GObject::TYPE_INVALID)
+
+    assert_equal "void", GObject.type_name(GObject::TYPE_NONE)
+    assert_equal "GInterface", GObject.type_name(GObject::TYPE_INTERFACE)
+    assert_equal "gchar", GObject.type_name(GObject::TYPE_CHAR)
+    assert_equal "guchar", GObject.type_name(GObject::TYPE_UCHAR)
+    assert_equal "gboolean", GObject.type_name(GObject::TYPE_BOOLEAN)
+    assert_equal "gint", GObject.type_name(GObject::TYPE_INT)
+    assert_equal "guint", GObject.type_name(GObject::TYPE_UINT)
+    assert_equal "glong", GObject.type_name(GObject::TYPE_LONG)
+    assert_equal "gulong", GObject.type_name(GObject::TYPE_ULONG)
+    assert_equal "gint64", GObject.type_name(GObject::TYPE_INT64)
+    assert_equal "guint64", GObject.type_name(GObject::TYPE_UINT64)
+    assert_equal "GEnum", GObject.type_name(GObject::TYPE_ENUM)
+    assert_equal "GFlags", GObject.type_name(GObject::TYPE_FLAGS)
+    assert_equal "gfloat", GObject.type_name(GObject::TYPE_FLOAT)
+    assert_equal "gdouble", GObject.type_name(GObject::TYPE_DOUBLE)
+    assert_equal "gchararray", GObject.type_name(GObject::TYPE_STRING)
+    assert_equal "gpointer", GObject.type_name(GObject::TYPE_POINTER)
+    assert_equal "GBoxed", GObject.type_name(GObject::TYPE_BOXED)
+    assert_equal "GParam", GObject.type_name(GObject::TYPE_PARAM)
+    assert_equal "GObject", GObject.type_name(GObject::TYPE_OBJECT)
+    assert_equal "GType", GObject.type_name(GObject::TYPE_GTYPE)
+    assert_equal "GVariant", GObject.type_name(GObject::TYPE_VARIANT)
+    assert_equal "GStrv", GObject.type_name(GObject::TYPE_STRV)
+    assert_equal "GHashTable", GObject.type_name(GObject::TYPE_HASH_TABLE)
   end
 end
 

data/test/ffi-gobject/value_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
 require 'ffi-gobject'
 
 describe GObject::Value do
-  describe "::wrap_ruby_value class" do
+  describe "::wrap_ruby_value" do
     it "wraps a boolean false" do
       gv = GObject::Value.wrap_ruby_value false
       assert_instance_of GObject::Value, gv
@@ -15,6 +15,16 @@ describe GObject::Value do
       assert_instance_of GObject::Value, gv
       assert_equal true, gv.get_boolean
     end
+
+    it "wraps an Integer" do
+      gv = GObject::Value.wrap_ruby_value 42
+      assert_equal 42, gv.get_int
+    end
+
+    it "wraps a String" do
+      gv = GObject::Value.wrap_ruby_value "Some Random String"
+      assert_equal "Some Random String", gv.get_string
+    end
   end
 
   describe "#ruby_value" do
@@ -30,5 +40,20 @@ describe GObject::Value do
       assert_equal true, result
     end
   end
+
+  describe "::from" do
+    it "creates a gint GValue from a Ruby Integer" do
+      gv = GObject::Value.from 21
+      gv.current_gtype_name.must_equal "gint"
+      gv.ruby_value.must_equal 21
+    end
+
+    it "returns its argument if given a GValue" do
+      gv = GObject::Value.from 21
+      gv2 = GObject::Value.from gv
+      gv2.current_gtype_name.must_equal "gint"
+      gv2.ruby_value.must_equal 21
+    end
+  end
 end
 

data/test/ffi-gobject_introspection/lib_test.rb

@@ -54,3 +54,13 @@ describe "loading the shared library" do
     end
   end
 end
+
+describe GObjectIntrospection::Lib::GIArgument do
+  describe "its member :v_ssize" do
+    it "is signed" do
+      gia = GObjectIntrospection::Lib::GIArgument.new
+      gia[:v_int64] = -1
+      assert_equal(-1, gia[:v_ssize])
+    end
+  end
+end

data/test/gir_ffi_test_helper.rb

@@ -26,7 +26,7 @@ gir = GObjectIntrospection::IRepository.default
 gir.require "Gtk", "2.0"
 
 # Need a dummy module for some tests.
-module Lib
+module DummyLib
 end
 
 class MiniTest::Unit::TestCase

data/test/integration/derived_classes_test.rb

@@ -0,0 +1,31 @@
+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
+
+  describe "with an interface 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
+
+  after do
+    restore_module :GIMarshallingTests
+  end
+end
+

data/test/integration/generated_gimarshallingtests_test.rb

@@ -31,9 +31,9 @@ describe "GIMarshallingTests" do
       end
 
       it "has a writable field g_strv" do
-        assert_equal [], @bx.g_strv
+        assert_equal [], @bx.g_strv.to_a
         @bx.g_strv = ["foo", "bar"]
-        assert_equal ["foo", "bar"], @bx.g_strv
+        assert_equal ["foo", "bar"], @bx.g_strv.to_a
       end
     end
 
@@ -54,7 +54,7 @@ describe "GIMarshallingTests" do
     it "has a working function #returnv" do
       res = GIMarshallingTests::BoxedStruct.returnv
       assert_equal 42, res.long_
-      assert_equal ["0", "1", "2"], res.g_strv
+      assert_equal ["0", "1", "2"], res.g_strv.to_a
     end
   end
 
@@ -541,12 +541,12 @@ describe "GIMarshallingTests" do
 
   it "has a working function #array_zero_terminated_out" do
     res = GIMarshallingTests.array_zero_terminated_out
-    assert_equal ["0", "1", "2"], res
+    assert_equal ["0", "1", "2"], res.to_a
   end
 
   it "has a working function #array_zero_terminated_return" do
     res = GIMarshallingTests.array_zero_terminated_return
-    assert_equal ["0", "1", "2"], res
+    assert_equal ["0", "1", "2"], res.to_a
   end
 
   it "has a working function #boolean_in_false" do
@@ -604,7 +604,7 @@ describe "GIMarshallingTests" do
   it "has a working function #boxed_struct_returnv" do
     res = GIMarshallingTests.boxed_struct_returnv
     assert_equal 42, res.long_
-    assert_equal ["0", "1", "2"], res.g_strv
+    assert_equal ["0", "1", "2"], res.g_strv.to_a
   end
 
   it "has a working function #bytearray_full_return" do
@@ -1043,17 +1043,17 @@ describe "GIMarshallingTests" do
 
   it "has a working function #gstrv_inout" do
     res = GIMarshallingTests.gstrv_inout ["0", "1", "2"]
-    assert_equal ["-1", "0", "1", "2"], res
+    assert_equal ["-1", "0", "1", "2"], res.to_a
   end
 
   it "has a working function #gstrv_out" do
     res = GIMarshallingTests.gstrv_out
-    assert_equal ["0", "1", "2"], res
+    assert_equal ["0", "1", "2"], res.to_a
   end
 
   it "has a working function #gstrv_return" do
     res = GIMarshallingTests.gstrv_return
-    assert_equal ["0", "1", "2"], res
+    assert_equal ["0", "1", "2"], res.to_a
   end
 
   it "has a working function #gtype_inout" do
@@ -1075,9 +1075,16 @@ describe "GIMarshallingTests" do
     assert_equal "void", name
   end
 
-  it "has a working function #gvalue_in" do
-    GIMarshallingTests.gvalue_in GObject::Value.wrap_ruby_value(42)
-    pass
+  describe "#gvalue_in" do
+    it "works when passed a GObject::Value object" do
+      GIMarshallingTests.gvalue_in GObject::Value.wrap_ruby_value(42)
+      pass
+    end
+
+    it "automatically converts a non-GValue object to a GValue" do
+      GIMarshallingTests.gvalue_in 42
+      pass
+    end
   end
 
   it "has a working function #gvalue_in_enum" do
@@ -1088,9 +1095,16 @@ describe "GIMarshallingTests" do
     pass
   end
 
-  it "has a working function #gvalue_inout" do
-    res = GIMarshallingTests.gvalue_inout GObject::Value.wrap_ruby_value(42)
-    assert_equal "42", res.ruby_value
+  describe "#gvalue_inout" do
+    it "works when passed a GObject::Value object" do
+      res = GIMarshallingTests.gvalue_inout GObject::Value.wrap_ruby_value(42)
+      assert_equal "42", res.ruby_value
+    end
+
+    it "automatically converts a non-GValue input to a GValue" do
+      res = GIMarshallingTests.gvalue_inout 42
+      assert_equal "42", res.ruby_value
+    end
   end
 
   it "has a working function #gvalue_out" do

data/test/integration/generated_gio_test.rb

@@ -27,12 +27,11 @@ describe "The generated Gio module" do
 
     it "is able to set up a method in a class that is not the first ancestor" do
       anc = @it.class.ancestors
-      assert_equal Gio::File, anc[1]
-      assert_equal GObject::Object, anc[2]
-      refute_includes Gio::File.instance_methods.map(&:to_s),
-        'get_qdata'
-      assert_includes GObject::Object.instance_methods.map(&:to_s),
-        'get_qdata'
+      assert_equal [Gio::File, GObject::Object], anc[1, 2]
+
+      refute_defines_instance_method Gio::File, :get_qdata
+      assert_defines_instance_method GObject::Object, :get_qdata
+
       @it.setup_and_call :get_qdata, 1
     end
   end

data/test/integration/generated_regress_test.rb

@@ -278,8 +278,12 @@ class GeneratedRegressTest < MiniTest::Spec
 
           it "sets the 'hash-table' property" do
             @o.set_property("hash-table", {"foo" => 34, "bar" => 83})
-            assert_equal({"foo" => 34, "bar" => 83},
-              GLib::HashTable.wrap(:utf8, :gint32, @o.hash_table.to_ptr).to_hash)
+
+            ht = @o.hash_table
+            ht.key_type = :utf8
+            ht.value_type = :gint32
+
+            assert_equal({"foo" => 34, "bar" => 83}, ht.to_hash)
           end
 
           it "sets the 'float' property" do
@@ -1083,27 +1087,27 @@ class GeneratedRegressTest < MiniTest::Spec
 
     it "has correct #test_strv_in_gvalue" do
       gv = Regress.test_strv_in_gvalue
-      assert_equal ['one', 'two', 'three'], gv.ruby_value
+      assert_equal ['one', 'two', 'three'], gv.ruby_value.to_a
     end
 
     it "has correct #test_strv_out" do
       arr = Regress.test_strv_out
-      assert_equal ["thanks", "for", "all", "the", "fish"], arr
+      assert_equal ["thanks", "for", "all", "the", "fish"], arr.to_a
     end
 
     it "has correct #test_strv_out_c" do
       arr = Regress.test_strv_out_c
-      assert_equal ["thanks", "for", "all", "the", "fish"], arr
+      assert_equal ["thanks", "for", "all", "the", "fish"], arr.to_a
     end
 
     it "has correct #test_strv_out_container" do
       arr = Regress.test_strv_out_container
-      assert_equal ['1', '2', '3'], arr
+      assert_equal ['1', '2', '3'], arr.to_a
     end
 
     it "has correct #test_strv_outarg" do
       arr = Regress.test_strv_outarg
-      assert_equal ['1', '2', '3'], arr
+      assert_equal ['1', '2', '3'], arr.to_a
     end
 
     should "have correct test_timet" do

data/test/integration/method_lookup_test.rb

@@ -0,0 +1,32 @@
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+
+# Tests how methods are looked up and generated on first use.
+describe "Looking up methods" do
+  before do
+    save_module :Regress
+    GirFFI.setup :Regress
+  end
+
+  describe "an instance method" do
+    it "is found from a subclass" do
+      assert_defines_instance_method Regress::TestObj, :forced_method
+      refute_defines_instance_method Regress::TestSubObj, :forced_method
+
+      sub_object = Regress::TestSubObj.new
+      sub_object.forced_method
+    end
+  end
+
+  describe "a class method" do
+    it "is found from a subclass" do
+      assert_defines_singleton_method Regress::TestObj, :static_method
+      refute_defines_singleton_method Regress::TestSubObj, :static_method
+
+      Regress::TestSubObj.static_method 42
+    end
+  end
+
+  after do
+    restore_module :Regress
+  end
+end

data/test/interface_type_builder_test.rb

@@ -12,6 +12,6 @@ describe GirFFI::Builder::Type::Interface do
   end
 
   it "creates methods on the interface" do
-    assert_includes @iface.instance_methods.map(&:to_s), 'complete_interface_info'
+    assert_defines_instance_method @iface, :complete_interface_info
   end
 end

data/test/test_helper.rb

@@ -32,6 +32,44 @@ class MiniTest::Unit::TestCase
   def assert_not_nil it
     refute_nil it
   end
+
+  def assert_defines_singleton_method klass, method, msg = nil
+    method = method.to_sym
+    methods = klass.singleton_methods(false).map { |name| name.to_sym }
+    msg = message(msg) {
+      "Expected #{mu_pp(klass)} to define singleton method #{mu_pp(method)}, " +
+        "but only found #{mu_pp(methods)}"
+    }
+    assert_includes methods, method, msg
+  end
+
+  def refute_defines_singleton_method klass, method, msg = nil
+    method = method.to_sym
+    methods = klass.singleton_methods(false).map { |name| name.to_sym }
+    msg = message(msg) {
+      "Expected #{mu_pp(klass)} not to define singleton method #{mu_pp(method)}"
+    }
+    refute_includes methods, method, msg
+  end
+
+  def assert_defines_instance_method klass, method, msg = nil
+    method = method.to_sym
+    methods = klass.instance_methods(false).map { |name| name.to_sym }
+    msg = message(msg) {
+      "Expected #{mu_pp(klass)} to define instance method #{mu_pp(method)}, " +
+        "but only found #{mu_pp(methods)}"
+    }
+    assert_includes methods, method, msg
+  end
+
+  def refute_defines_instance_method klass, method, msg = nil
+    method = method.to_sym
+    methods = klass.instance_methods(false).map { |name| name.to_sym }
+    msg = message(msg) {
+      "Expected #{mu_pp(klass)} not to define instance method #{mu_pp(method)}"
+    }
+    refute_includes methods, method, msg
+  end
 end
 
 class MiniTest::Spec

data/test/unit/argument_builder_test.rb

@@ -1,6 +1,18 @@
 require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
 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
@@ -9,7 +21,7 @@ describe GirFFI::Builder::Argument::Base do
 
         mock(info = Object.new).param_type(0) { subtype }
 
-        builder = GirFFI::Builder::Argument::Base.new nil, 'foo', info, nil
+        builder = GirFFI::Builder::Argument::Base.new nil, 'foo', info
         assert_equal ":void", builder.subtype_tag_or_class_name
       end
     end
@@ -21,7 +33,7 @@ describe GirFFI::Builder::Argument::Base do
 
         mock(info = Object.new).param_type(0) { subtype }
 
-        builder = GirFFI::Builder::Argument::Base.new nil, 'bar', info, nil
+        builder = GirFFI::Builder::Argument::Base.new nil, 'bar', info
         assert_equal ":foo", builder.subtype_tag_or_class_name
       end
     end
@@ -37,7 +49,7 @@ describe GirFFI::Builder::Argument::Base do
 
         mock(info = Object.new).param_type(0) { subtype }
 
-        builder = GirFFI::Builder::Argument::Base.new nil, 'bar', info, nil
+        builder = GirFFI::Builder::Argument::Base.new nil, 'bar', info
         assert_equal "::Foo::Bar", builder.subtype_tag_or_class_name
       end
     end
@@ -49,7 +61,7 @@ describe GirFFI::Builder::Argument::Base do
 
         mock(info = Object.new).param_type(0) { subtype }
 
-        builder = GirFFI::Builder::Argument::Base.new nil, 'bar', info, nil
+        builder = GirFFI::Builder::Argument::Base.new nil, 'bar', info
         assert_equal "[:pointer, :foo]", builder.subtype_tag_or_class_name
       end
     end