gir_ffi 0.0.4 → 0.0.5

data/test/everything_test.rb

@@ -14,6 +14,8 @@ class EverythingTest < Test::Unit::TestCase
   context "The generated Everything module" do
     setup do
       GirFFI.setup :Everything
+      GirFFI.setup :GObject
+      GirFFI.setup :GLib
     end
 
     context "the Everything::TestBoxed class" do
@@ -40,7 +42,7 @@ class EverythingTest < Test::Unit::TestCase
 	assert_equal 54, tb[:some_int8]
       end
 
-      should "have non-zero result for #get_gtype" do
+      should "have non-zero positive result for #get_gtype" do
 	assert Everything::TestBoxed.get_gtype > 0
       end
 
@@ -176,6 +178,10 @@ class EverythingTest < Test::Unit::TestCase
 	  @o.instance_method_callback Proc.new { a = 2 }
 	  assert_equal 2, a
 	end
+
+	should "not respond to #static_method" do
+	  assert_raises(NoMethodError) { @o.static_method 1 }
+	end
       end
     end
 
@@ -271,13 +277,31 @@ class EverythingTest < Test::Unit::TestCase
 	assert_instance_of Everything::TestWi8021x, o
       end
 
+      should "have a working #static_method" do
+	assert_equal(-84, Everything::TestWi8021x.static_method(-42))
+      end
+
       context "an instance" do
 	setup do
 	  @obj = Everything::TestWi8021x.new
 	end
+
 	should "set its boolean struct member with #set_testbool" do
 	  @obj.set_testbool true
 	  assert_equal 1, @obj[:testbool]
+	  @obj.set_testbool false
+	  assert_equal 0, @obj[:testbool]
+	end
+
+	should "get its boolean struct member with #get_testbool" do
+	  @obj[:testbool] = 0
+	  assert_equal false, @obj.get_testbool
+	  @obj[:testbool] = 1
+	  assert_equal true, @obj.get_testbool
+	end
+
+	should "get its boolean struct member with #get_property" do
+	  @obj[:testbool] = 1
 	  gv = GObject::Value.new
 	  gv.init GObject.type_from_name "gboolean"
 	  @obj.get_property "testbool", gv
@@ -286,16 +310,145 @@ class EverythingTest < Test::Unit::TestCase
       end
     end
 
+    # set_abort_on_error
+
+    context "test_array_fixed_size_int_in" do
+      should "return the correct result" do
+	assert_equal 5 + 4 + 3 + 2 + 1, Everything.test_array_fixed_size_int_in([5, 4, 3, 2, 1])
+      end
+
+      should "raise an error when called with the wrong number of arguments" do
+	assert_raises ArgumentError do
+	  Everything.test_array_fixed_size_int_in [2]
+	end
+      end
+    end
+
+    should "have correct test_array_fixed_size_int_out" do
+      assert_equal [0, 1, 2, 3, 4], Everything.test_array_fixed_size_int_out
+    end
+
+    should "have correct test_array_fixed_size_int_return" do
+      assert_equal [0, 1, 2, 3, 4], Everything.test_array_fixed_size_int_return
+    end
+
+    should "have correct test_array_gint16_in" do
+      assert_equal 5 + 4 + 3, Everything.test_array_gint16_in([5, 4, 3])
+    end
+
+    should "have correct test_array_gint32_in" do
+      assert_equal 5 + 4 + 3, Everything.test_array_gint32_in([5, 4, 3])
+    end
+
+    should "have correct test_array_gint64_in" do
+      assert_equal 5 + 4 + 3, Everything.test_array_gint64_in([5, 4, 3])
+    end
+
+    should "have correct test_array_gint8_in" do
+      assert_equal 5 + 4 + 3, Everything.test_array_gint8_in([5, 4, 3])
+    end
+
+    should "have correct test_array_gtype_in" do
+      t1 = GObject.type_from_name "gboolean"
+      t2 = GObject.type_from_name "gint64"
+      assert_equal "[gboolean,gint64,]", Everything.test_array_gtype_in([t1, t2])
+    end
+
+    should "have correct test_array_int_full_out" do
+      assert_equal [0, 1, 2, 3, 4], Everything.test_array_int_full_out
+    end
+
+    should "have correct test_array_int_in" do
+      assert_equal 5 + 4 + 3, Everything.test_array_int_in([5, 4, 3])
+    end
+
+    should "have correct test_array_int_in_take" do
+      assert_equal 5 + 4 + 3, Everything.test_array_int_in_take([5, 4, 3])
+    end
+
+    should "have correct test_array_int_inout" do
+      assert_equal [3, 4], Everything.test_array_int_inout([5, 2, 3])
+    end
+
+    should "have correct test_array_int_none_out" do
+      assert_equal [1, 2, 3, 4, 5], Everything.test_array_int_none_out
+    end
+
+    should "have correct test_array_int_null_in" do
+      assert_nothing_raised { Everything.test_array_int_null_in nil }
+    end
+
+    should "have correct test_array_int_null_out" do
+      assert_equal nil, Everything.test_array_int_null_out
+    end
+
+    should "have correct test_array_int_out" do
+      assert_equal [0, 1, 2, 3, 4], Everything.test_array_int_out
+    end
+
+    should "have correct test_async_ready_callback" do
+      a = 1
+      main_loop = GLib.main_loop_new nil, false
+
+      Everything.test_async_ready_callback Proc.new {
+	GLib.main_loop_quit main_loop
+	a = 2
+      }
+
+      GLib.main_loop_run main_loop
+
+      assert_equal 2, a
+    end
+
     should "have correct test_boolean" do
       assert_equal false, Everything.test_boolean(false)
       assert_equal true, Everything.test_boolean(true)
     end
 
+    should "have correct test_boolean_false" do
+      assert_equal false, Everything.test_boolean(false)
+    end
+
+    should "have correct test_boolean_true" do
+      assert_equal true, Everything.test_boolean(true)
+    end
+
+    should "have correct test_cairo_context_full_return"
+    should "have correct test_cairo_context_none_in"
+    should "have correct test_cairo_surface_full_out"
+    should "have correct test_cairo_surface_full_return"
+    should "have correct test_cairo_surface_none_in"
+    should "have correct test_cairo_surface_none_return"
+
     should "have correct test_callback" do
       result = Everything.test_callback Proc.new { 5 }
       assert_equal 5, result
     end
 
+    should "have correct test_callback_async" do
+      a = 1
+      Everything.test_callback_async Proc.new {|b|
+	a = 2
+	b
+      }, 44
+      r = Everything.test_callback_thaw_async
+      assert_equal 44, r
+      assert_equal 2, a
+    end
+
+    should "have correct test_callback_destroy_notify" do
+      a = 1
+      r1 = Everything.test_callback_destroy_notify Proc.new {|b|
+	a = 2
+	b
+      }, 42, Proc.new { a = 3 }
+      assert_equal 2, a
+      assert_equal 42, r1
+      r2 = Everything.test_callback_thaw_notifications
+      assert_equal 3, a
+      assert_equal 42, r2
+    end
+
     context "the test_callback_user_data function" do
       should "return the callbacks return value" do
 	result = Everything.test_callback_user_data Proc.new {|u| 5 }, nil
@@ -312,11 +465,284 @@ class EverythingTest < Test::Unit::TestCase
       end
     end
 
+    should "have correct test_closure"
+    should "have correct test_closure_one_arg"
+
+    should "have correct test_double" do
+      r = Everything.test_double 5435.32
+      assert_equal 5435.32, r
+    end
+
+    should "have correct test_enum_param" do
+      r = Everything.test_enum_param :value3
+      assert_equal "value3", r
+    end
+
+    should "have correct test_filename_return"
+
+    should "have correct test_float" do
+      r = Everything.test_float 5435.32
+      assert_in_delta 5435.32, r, 0.001
+    end
+
+    should "have correct test_ghash_container_in"
+    should "have correct test_ghash_container_return"
+    should "have correct test_ghash_everything_in"
+    should "have correct test_ghash_everything_return"
+    should "have correct test_ghash_free"
+    should "have correct test_ghash_nested_everything_return"
+    should "have correct test_ghash_nested_everything_return2"
+    should "have correct test_ghash_nothing_in"
+    should "have correct test_ghash_nothing_in2"
+    should "have correct test_ghash_nothing_return"
+    should "have correct test_ghash_nothing_return2"
+    should "have correct test_ghash_null_in"
+    should "have correct test_ghash_null_out"
+    should "have correct test_ghash_null_return"
+    should "have correct test_glist_container_in"
+    should "have correct test_glist_container_return"
+    should "have correct test_glist_everything_in"
+    should "have correct test_glist_everything_return"
+    should "have correct test_glist_free"
+    should "have correct test_glist_nothing_in"
+    should "have correct test_glist_nothing_in2"
+    should "have correct test_glist_nothing_return"
+    should "have correct test_glist_nothing_return2"
+    should "have correct test_glist_null_in"
+    should "have correct test_glist_null_out"
+    should "have correct test_gslist_container_in"
+    should "have correct test_gslist_container_return"
+    should "have correct test_gslist_everything_in"
+    should "have correct test_gslist_everything_return"
+    should "have correct test_gslist_free"
+    should "have correct test_gslist_nothing_in"
+    should "have correct test_gslist_nothing_in2"
+    should "have correct test_gslist_nothing_return"
+    should "have correct test_gslist_nothing_return2"
+    should "have correct test_gslist_null_in"
+    should "have correct test_gslist_null_out"
+
     should "have correct test_gtype" do
       result = Everything.test_gtype 23
       assert_equal 23, result
     end
 
+    should "have correct test_int" do
+      result = Everything.test_int 23
+      assert_equal 23, result
+    end
+
+    should "have correct test_int16" do
+      result = Everything.test_int16 23
+      assert_equal 23, result
+    end
+
+    should "have correct test_int32" do
+      result = Everything.test_int32 23
+      assert_equal 23, result
+    end
+
+    should "have correct test_int64" do
+      result = Everything.test_int64 2300000000000
+      assert_equal 2300000000000, result
+    end
+
+    should "have correct test_int8" do
+      result = Everything.test_int8 23
+      assert_equal 23, result
+    end
+
+    should "have correct test_int_out_utf8" do
+      len = Everything.test_int_out_utf8 "How long?"
+      assert_equal 9, len
+    end
+
+    should "have correct test_int_value_arg" do
+      gv = GObject::Value.new
+      gv.init GObject.type_from_name "gint"
+      gv.set_int 343
+      result = Everything.test_int_value_arg gv
+      assert_equal 343, result
+    end
+
+    should "have correct test_long" do
+      result = Everything.test_long 2300000000000
+      assert_equal 2300000000000, result
+    end
+
+    should "have correct test_multi_callback" do
+      a = 1
+      result = Everything.test_multi_callback Proc.new {
+	a += 1
+	23
+      }
+      assert_equal 2 * 23, result
+      assert_equal 3, a
+    end
+
+    should "have correct test_multi_double_args" do
+      one, two = Everything.test_multi_double_args 23.1
+      assert_equal 2 * 23.1, one
+      assert_equal 3 * 23.1, two
+    end
+
+    should "have correct test_object_null_in" do
+      assert_nothing_raised { Everything.test_object_null_in nil }
+    end
+
+    should "have correct test_object_null_out" do
+      result = Everything.test_object_null_out
+      assert_equal nil, result
+    end
+
+    should "have correct test_short" do
+      result = Everything.test_short 23
+      assert_equal 23, result
+    end
+
+    should "have correct test_simple_boxed_a_const_return" do
+      result = Everything.test_simple_boxed_a_const_return
+      assert_equal [5, 6, 7.0], [result[:some_int], result[:some_int8], result[:some_double]]
+    end
+
+    context "the test_simple_callback function" do
+      should "call the passed-in proc" do
+	a = 0
+	Everything.test_simple_callback Proc.new { a = 1 }
+	assert_equal 1, a
+      end
+
+      # XXX: The scope data does not seem to be reliable enough.
+      if false
+      should "not store the proc in CALLBACKS" do
+	n = Everything::Lib::CALLBACKS.length
+	Everything.test_simple_callback Proc.new { }
+	assert_equal n, Everything::Lib::CALLBACKS.length
+      end
+      end
+    end
+
+    should "have correct test_size" do
+      assert_equal 2354, Everything.test_size(2354)
+    end
+
+    should "have correct test_ssize"
+    should "have correct test_strv_in"
+    should "have correct test_strv_in_container"
+    should "have correct test_strv_out"
+    should "have correct test_strv_out_c"
+    should "have correct test_strv_out_container"
+    should "have correct test_strv_outarg"
+    should "have correct test_timet"
+
+    should "have correct test_torture_signature_0" do
+      y, z, q = Everything.test_torture_signature_0 86, "foo", 2
+      assert_equal [86, 2*86, 3+2], [y, z, q]
+    end
+
+    context "its #test_torture_signature_1 method" do
+      should "work for m even" do
+	ret, y, z, q = Everything.test_torture_signature_1(-21, "hello", 12)
+	assert_equal [true, -21, 2 * -21, "hello".length + 12], [ret, y, z, q]
+      end
+
+      should "throw an exception for m odd" do
+	assert_raises RuntimeError do
+	  Everything.test_torture_signature_1(-21, "hello", 11)
+	end
+      end
+    end
+      
+    should "have correct test_torture_signature_2" do
+      a = 1
+      y, z, q = Everything.test_torture_signature_2 244,
+	Proc.new {|u| a = u }, 2, Proc.new { a = 3 },
+	"foofoo", 31
+      assert_equal [244, 2*244, 6+31], [y, z, q]
+      assert_equal 3, a
+    end
+
+    should "have correct test_uint" do
+      assert_equal 31, Everything.test_uint(31)
+    end
+
+    should "have correct test_uint16" do
+      assert_equal 31, Everything.test_uint16(31)
+    end
+
+    should "have correct test_uint32" do
+      assert_equal 540000, Everything.test_uint32(540000)
+    end
+
+    should "have correct test_uint64" do
+      assert_equal 54_000_000_000_000, Everything.test_uint64(54_000_000_000_000)
+    end
+
+    should "have correct test_uint8" do
+      assert_equal 31, Everything.test_uint8(31)
+    end
+
+    should "have correct test_ulong" do
+      assert_equal 54_000_000_000_000, Everything.test_uint64(54_000_000_000_000)
+    end
+
+    should "have correct test_ushort" do
+      assert_equal 54_000_000, Everything.test_uint64(54_000_000)
+    end
+
+    should "have correct test_utf8_const_in" do
+      # TODO: Capture stderr to automatically look for error messages.
+      assert_nothing_raised do
+	Everything.test_utf8_const_in("const \xe2\x99\xa5 utf8")
+      end
+    end
+
+    should "have correct test_utf8_const_return" do
+      result = Everything.test_utf8_const_return
+      assert_equal "const \xe2\x99\xa5 utf8", result
+    end
+
+    should "have correct test_utf8_inout" do
+      result = Everything.test_utf8_inout "const \xe2\x99\xa5 utf8"
+      assert_equal "nonconst \xe2\x99\xa5 utf8", result
+    end
+
+    should "have correct test_utf8_nonconst_in" do
+      assert_nothing_raised do
+	Everything.test_utf8_nonconst_in "nonconst \xe2\x99\xa5 utf8"
+      end
+    end
+
+    should "have correct test_utf8_nonconst_return" do
+      result = Everything.test_utf8_nonconst_return
+      assert_equal "nonconst \xe2\x99\xa5 utf8", result
+    end
+
+    should "have correct test_utf8_null_in" do
+      assert_nothing_raised do
+	Everything.test_utf8_null_in nil
+      end
+    end
+
+    should "have correct test_utf8_null_out" do
+      assert_equal nil, Everything.test_utf8_null_out
+    end
+
+    should "have correct test_utf8_out" do
+      result = Everything.test_utf8_out
+      assert_equal "nonconst \xe2\x99\xa5 utf8", result
+    end
+
+    should "have correct test_utf8_out_nonconst_return" do
+      r, out = Everything.test_utf8_out_nonconst_return
+      assert_equal ["first", "second"], [r, out]
+    end
+
+    should "have correct test_utf8_out_out" do
+      out0, out1 = Everything.test_utf8_out_nonconst_return
+      assert_equal ["first", "second"], [out0, out1]
+    end
+
     should "have correct test_value_return" do
       result = Everything.test_value_return 3423
       assert_equal 3423, result.get_int

data/test/function_definition_builder_test.rb

@@ -9,13 +9,16 @@ class FunctionDefinitionBuilderTest < Test::Unit::TestCase
       code = fbuilder.generate
 
       expected = "
-	def init argc, argv
+	def init argv
+	  argc = argv.length
 	  _v1 = GirFFI::ArgHelper.int_to_inoutptr argc
-	  _v3 = GirFFI::ArgHelper.string_array_to_inoutptr argv
+	  _v3 = GirFFI::ArgHelper.utf8_array_to_inoutptr argv
 	  ::Lib.gtk_init _v1, _v3
 	  _v2 = GirFFI::ArgHelper.outptr_to_int _v1
-	  _v4 = GirFFI::ArgHelper.outptr_to_string_array _v3, argv.nil? ? 0 : argv.size
-	  return _v2, _v4
+	  GirFFI::ArgHelper.cleanup_ptr _v1
+	  _v4 = GirFFI::ArgHelper.outptr_to_utf8_array _v3, _v2
+	  GirFFI::ArgHelper.cleanup_ptr_array_ptr _v3, _v2
+	  return _v4
 	end
       "
 
@@ -43,14 +46,16 @@ class FunctionDefinitionBuilderTest < Test::Unit::TestCase
 
       expected =
 	"def signal_connect_data instance, detailed_signal, c_handler, data, destroy_data, connect_flags
-	  _v2 = GirFFI::ArgHelper.object_to_inptr instance
+	  _v1 = GirFFI::ArgHelper.object_to_inptr instance
+	  _v2 = GirFFI::ArgHelper.utf8_to_inptr detailed_signal
 	  _v3 = GirFFI::ArgHelper.mapped_callback_args c_handler
 	  ::Lib::CALLBACKS << _v3
 	  _v4 = GirFFI::ArgHelper.object_to_inptr data
 	  _v5 = GirFFI::ArgHelper.mapped_callback_args destroy_data
 	  ::Lib::CALLBACKS << _v5
-	  _v1 = ::Lib.g_signal_connect_data _v2, detailed_signal, _v3, _v4, _v5, connect_flags
-	  return _v1
+	  _v6 = connect_flags
+	  _v7 = ::Lib.g_signal_connect_data _v1, _v2, _v3, _v4, _v5, _v6
+	  return _v7
 	end"
 
       assert_equal cws(expected), cws(code)
@@ -63,15 +68,67 @@ class FunctionDefinitionBuilderTest < Test::Unit::TestCase
 
       expected =
 	"def new_from_file x
-	  _v3 = FFI::MemoryPointer.new(:pointer).write_pointer nil
-	  _v1 = ::Lib.test_obj_new_from_file x, _v3
-	  GirFFI::ArgHelper.check_error(_v3)
-	  _v2 = ::Everything::TestObj._real_new(_v1)
-	  GirFFI::ArgHelper.sink_if_floating(_v2)
+	  _v1 = GirFFI::ArgHelper.utf8_to_inptr x
+	  _v4 = FFI::MemoryPointer.new(:pointer).write_pointer nil
+	  _v2 = ::Lib.test_obj_new_from_file _v1, _v4
+	  GirFFI::ArgHelper.check_error(_v4)
+	  _v3 = ::Everything::TestObj.wrap(_v2)
+	  GirFFI::ArgHelper.sink_if_floating(_v3)
+	  return _v3
+	end"
+
+      assert_equal cws(expected), cws(code)
+    end
+
+    should "build correct definition of Everything:test_array_int_null_in" do
+      go = get_function_introspection_data 'Everything', 'test_array_int_null_in'
+      fbuilder = GirFFI::FunctionDefinitionBuilder.new go, Lib
+      code = fbuilder.generate
+
+      expected =
+	"def test_array_int_null_in arr
+	  _v1 = GirFFI::ArgHelper.int_array_to_inptr arr
+	  len = arr.nil? ? 0 : arr.length
+	  _v2 = len
+	  ::Lib.test_array_int_null_in _v1, _v2
+	  GirFFI::ArgHelper.cleanup_ptr _v1
+	end"
+
+      assert_equal cws(expected), cws(code)
+    end
+
+    should "build correct definition of Everything:test_array_int_null_out" do
+      go = get_function_introspection_data 'Everything', 'test_array_int_null_out'
+      fbuilder = GirFFI::FunctionDefinitionBuilder.new go, Lib
+      code = fbuilder.generate
+
+      expected =
+	"def test_array_int_null_out
+	  _v1 = GirFFI::ArgHelper.pointer_outptr
+	  _v3 = GirFFI::ArgHelper.int_outptr
+	  ::Lib.test_array_int_null_out _v1, _v3
+	  _v4 = GirFFI::ArgHelper.outptr_to_int _v3
+	  GirFFI::ArgHelper.cleanup_ptr _v3
+	  _v2 = GirFFI::ArgHelper.outptr_to_int_array _v1, _v4
+	  GirFFI::ArgHelper.cleanup_ptr_ptr _v1
 	  return _v2
 	end"
 
       assert_equal cws(expected), cws(code)
     end
+
+    should "build correct definition of Everything:test_utf8_nonconst_in" do
+      go = get_function_introspection_data 'Everything', 'test_utf8_nonconst_in'
+      fbuilder = GirFFI::FunctionDefinitionBuilder.new go, Lib
+      code = fbuilder.generate
+
+      expected =
+	"def test_utf8_nonconst_in in_
+	  _v1 = GirFFI::ArgHelper.utf8_to_inptr in_
+	  ::Lib.test_utf8_nonconst_in _v1
+	end"
+
+      assert_equal cws(expected), cws(code)
+    end
   end
 end

data/test/gobject_overrides_test.rb

@@ -2,7 +2,7 @@ require File.expand_path('test_helper.rb', File.dirname(__FILE__))
 require 'gir_ffi'
 
 class GObjectOverridesTest < Test::Unit::TestCase
-  context "The GObject module with overridden functions" do
+  context "In the GObject module with overridden functions" do
     setup do
       GirFFI.setup :GObject
       GirFFI.setup :Everything
@@ -71,7 +71,7 @@ class GObjectOverridesTest < Test::Unit::TestCase
 	GObject.signal_connect_data o, "test-with-static-scope-arg", callback, nil, nil, 0
 	GObject.signal_emit o, "test-with-static-scope-arg", sb
 
-	sb2 = Everything::TestSimpleBoxedA.new b2
+	sb2 = Everything::TestSimpleBoxedA.wrap b2
 	assert sb.equals(sb2)
       end
     end
@@ -116,6 +116,13 @@ class GObjectOverridesTest < Test::Unit::TestCase
 	assert_equal true, rv.get_boolean
       end
 
+      should "require a block" do
+	o = Everything::TestSubObj.new
+	assert_raises ArgumentError do
+	  GObject.signal_connect o, "test"
+	end
+      end
+
       context "connecting a signal with extra arguments" do
 	setup do
 	  @a = nil
@@ -123,12 +130,13 @@ class GObjectOverridesTest < Test::Unit::TestCase
 
 	  o = Everything::TestSubObj.new
 	  sb = Everything::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"
+	  GObject.signal_emit o, "test-with-static-scope-arg", sb
 	end
 
 	should "move the user data argument" do
@@ -137,6 +145,7 @@ class GObjectOverridesTest < Test::Unit::TestCase
 
 	should "pass on the extra arguments" do
 	  assert_instance_of Everything::TestSimpleBoxedA, @b
+	  assert_equal 23, @b[:some_int]
 	end
       end
 

data/test/test_helper.rb

@@ -3,6 +3,11 @@ require 'rr'
 require 'ffi'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
+if RUBY_PLATFORM == 'java'
+  require 'java'
+  JRuby.objectspace = true
+end
+
 # Since the tests will call Gtk+ functions, Gtk+ must be initialized.
 module DummyGtk
   module Lib