gir_ffi 0.0.10 → 0.0.11

data/test/builder_test.rb

@@ -9,7 +9,7 @@ class BuilderTest < MiniTest::Spec
     context "building GObject::Object" do
       before do
 	save_module :GObject
-	GirFFI::Builder.build_class get_function_introspection_data('GObject', 'Object')
+	GirFFI::Builder.build_class get_introspection_data('GObject', 'Object')
       end
 
       should "create a Lib module in the parent namespace ready to attach functions from gobject-2.0" do
@@ -23,7 +23,7 @@ class BuilderTest < MiniTest::Spec
 
       should "not replace existing classes" do
 	oldclass = GObject::Object
-	GirFFI::Builder.build_class get_function_introspection_data('GObject', 'Object')
+	GirFFI::Builder.build_class get_introspection_data('GObject', 'Object')
 	assert_equal oldclass, GObject::Object
       end
 
@@ -36,7 +36,7 @@ class BuilderTest < MiniTest::Spec
       before do
 	save_module :Gtk
 	save_module :GObject
-	GirFFI::Builder.build_class get_function_introspection_data('Gtk', 'Window')
+	GirFFI::Builder.build_class get_introspection_data('Gtk', 'Window')
       end
 
       should "build Gtk namespace" do
@@ -67,10 +67,6 @@ class BuilderTest < MiniTest::Spec
 	assert Gtk::Window.instance_methods.map(&:to_sym).include? :to_ptr
       end
 
-      should "result in Gtk::Window.new to succeed" do
-	assert_nothing_raised {Gtk::Window.new(:toplevel)}
-      end
-
       after do
 	restore_module :Gtk
 	restore_module :GObject
@@ -112,7 +108,7 @@ class BuilderTest < MiniTest::Spec
 
     context "looking at Gtk.main" do
       setup do
-	@go = get_function_introspection_data 'Gtk', 'main'
+	@go = get_introspection_data 'Gtk', 'main'
       end
 
       should "have correct introspection data" do
@@ -137,7 +133,7 @@ class BuilderTest < MiniTest::Spec
     context "looking at Gtk.init" do
       setup do
 	GirFFI::Builder.build_module 'Gtk'
-	@go = get_function_introspection_data 'Gtk', 'init'
+	@go = get_introspection_data 'Gtk', 'init'
       end
 
       should "have :pointer, :pointer as types of the arguments for the attached function" do
@@ -168,7 +164,7 @@ class BuilderTest < MiniTest::Spec
 	GirFFI::Builder.build_module 'GLib'
 	GirFFI::Builder.build_module 'GObject'
 	GirFFI::Builder.build_module 'Regress'
-	@go = get_function_introspection_data 'Regress', 'test_callback_destroy_notify'
+	@go = get_introspection_data 'Regress', 'test_callback_destroy_notify'
       end
 
       should "have the correct types of the arguments for the attached function" do
@@ -178,7 +174,7 @@ class BuilderTest < MiniTest::Spec
       end
 
       should "define ffi callback types :Callback and :ClosureNotify" do
-	Regress.gir_ffi_builder.setup_function 'test_callback_destroy_notify'
+	Regress._setup_method 'test_callback_destroy_notify'
 	tcud = Regress::Lib.find_type :TestCallbackUserData
 	dn = GLib::Lib.find_type :DestroyNotify
 
@@ -202,7 +198,7 @@ class BuilderTest < MiniTest::Spec
 
     context "building Regress::TestStructA" do
       setup do
-	GirFFI::Builder.build_class get_function_introspection_data('Regress', 'TestStructA')
+	GirFFI::Builder.build_class get_introspection_data('Regress', 'TestStructA')
       end
 
       should "set up the correct struct members" do
@@ -225,7 +221,7 @@ class BuilderTest < MiniTest::Spec
 
     context "building GObject::TypeCValue" do
       setup do
-	GirFFI::Builder.build_class get_function_introspection_data('GObject', 'TypeCValue')
+	GirFFI::Builder.build_class get_introspection_data('GObject', 'TypeCValue')
       end
 
       should "set up the correct union members" do
@@ -245,7 +241,7 @@ class BuilderTest < MiniTest::Spec
 
     context "building GObject::ValueArray" do
       should "use provided constructor if present" do
-	GirFFI::Builder.build_class get_function_introspection_data('GObject', 'ValueArray')
+	GirFFI::Builder.build_class get_introspection_data('GObject', 'ValueArray')
 	assert_nothing_raised {
 	  GObject::ValueArray.new 2
 	}
@@ -254,7 +250,7 @@ class BuilderTest < MiniTest::Spec
 
     context "building Regress::TestBoxed" do
       setup do
-	GirFFI::Builder.build_class get_function_introspection_data('Regress', 'TestBoxed')
+	GirFFI::Builder.build_class get_introspection_data('Regress', 'TestBoxed')
       end
 
       should "set up #wrap" do
@@ -284,7 +280,7 @@ class BuilderTest < MiniTest::Spec
       end
 
       should "know its own module builder" do
-	assert GirFFI::Builder::Module === Regress.gir_ffi_builder
+	assert GirFFI::Builder::Module === Regress._builder
       end
 
       after do
@@ -295,7 +291,7 @@ class BuilderTest < MiniTest::Spec
     context "built Regress::TestObj" do
       before do
 	save_module :Regress
-	GirFFI::Builder.build_class get_function_introspection_data('Regress', 'TestObj')
+	GirFFI::Builder.build_class get_introspection_data('Regress', 'TestObj')
       end
 
       should "make autocreated instance method available to all instances" do
@@ -319,7 +315,7 @@ class BuilderTest < MiniTest::Spec
       end
 
       should "know its own class builder" do
-	assert GirFFI::Builder::Type::Base === Regress::TestObj.gir_ffi_builder
+	assert GirFFI::Builder::Type::Base === Regress::TestObj._builder
       end
 
       context "its #torture_signature_0 method" do
@@ -339,7 +335,7 @@ class BuilderTest < MiniTest::Spec
     context "built Regress::TestSubObj" do
       before do
 	save_module :Regress
-	GirFFI::Builder.build_class get_function_introspection_data('Regress', 'TestSubObj')
+	GirFFI::Builder.build_class get_introspection_data('Regress', 'TestSubObj')
       end
 
       should "autocreate parent class' set_bare inside the parent class" do

data/test/function_definition_builder_test.rb

@@ -3,20 +3,18 @@ require File.expand_path('test_helper.rb', File.dirname(__FILE__))
 class FunctionDefinitionBuilderTest < MiniTest::Spec
   context "The Builder::Function class" do
     should "build correct definition of Gtk.init" do
-      go = get_function_introspection_data 'Gtk', 'init'
+      go = get_introspection_data 'Gtk', 'init'
       fbuilder = GirFFI::Builder::Function.new go, Lib
       code = fbuilder.generate
 
       expected = "
 	def init argv
 	  argc = argv.length
-	  _v1 = GirFFI::ArgHelper.gint32_to_inoutptr argc
-	  _v3 = GirFFI::ArgHelper.utf8_array_to_inoutptr argv
-	  ::Lib.gtk_init _v1, _v3
-	  _v2 = GirFFI::ArgHelper.outptr_to_gint32 _v1
-	  GirFFI::ArgHelper.cleanup_ptr _v1
-	  _v4 = GirFFI::ArgHelper.outptr_to_utf8_array _v3, _v2
-	  GirFFI::ArgHelper.cleanup_ptr_array_ptr _v3, _v2
+	  _v1 = GirFFI::InOutPointer.from :gint32, argc
+	  _v2 = GirFFI::InOutPointer.from_array :utf8, argv
+	  ::Lib.gtk_init _v1, _v2
+	  _v3 = _v1.to_value
+	  _v4 = GirFFI::ArgHelper.outptr_to_utf8_array _v2, _v3
 	  return _v4
 	end
       "
@@ -39,16 +37,16 @@ class FunctionDefinitionBuilderTest < MiniTest::Spec
     end
 
     should "build correct definition of Regress.test_callback_destroy_notify" do
-      go = get_function_introspection_data 'Regress', 'test_callback_destroy_notify'
+      go = get_introspection_data 'Regress', 'test_callback_destroy_notify'
       fbuilder = GirFFI::Builder::Function.new go, Lib
       code = fbuilder.generate
 
       expected =
 	"def test_callback_destroy_notify callback, user_data, notify
-	  _v1 = GirFFI::ArgHelper.wrap_in_callback_args_mapper \"Regress\", \"TestCallbackUserData\", callback
+	  _v1 = GirFFI::CallbackHelper.wrap_in_callback_args_mapper \"Regress\", \"TestCallbackUserData\", callback
 	  ::Lib::CALLBACKS << _v1
 	  _v2 = GirFFI::ArgHelper.object_to_inptr user_data
-	  _v3 = GirFFI::ArgHelper.wrap_in_callback_args_mapper \"GLib\", \"DestroyNotify\", notify
+	  _v3 = GirFFI::CallbackHelper.wrap_in_callback_args_mapper \"GLib\", \"DestroyNotify\", notify
 	  ::Lib::CALLBACKS << _v3
 	  _v4 = ::Lib.regress_test_callback_destroy_notify _v1, _v2, _v3
 	  return _v4
@@ -64,49 +62,46 @@ class FunctionDefinitionBuilderTest < MiniTest::Spec
 
       expected =
 	"def new_from_file x
-	  _v1 = GirFFI::ArgHelper.utf8_to_inptr x
-	  _v4 = FFI::MemoryPointer.new(:pointer).write_pointer nil
-	  _v2 = ::Lib.regress_test_obj_new_from_file _v1, _v4
-	  GirFFI::ArgHelper.check_error(_v4)
-	  _v3 = self.constructor_wrap(_v2)
-	  return _v3
+	  _v1 = GirFFI::InPointer.from :utf8, x
+	  _v2 = FFI::MemoryPointer.new(:pointer).write_pointer nil
+	  _v3 = ::Lib.regress_test_obj_new_from_file _v1, _v2
+	  GirFFI::ArgHelper.check_error(_v2)
+	  _v4 = self.constructor_wrap(_v3)
+	  return _v4
 	end"
 
       assert_equal cws(expected), cws(code)
     end
 
     should "build correct definition of Regress:test_array_int_null_in" do
-      go = get_function_introspection_data 'Regress', 'test_array_int_null_in'
+      go = get_introspection_data 'Regress', 'test_array_int_null_in'
       fbuilder = GirFFI::Builder::Function.new go, Lib
       code = fbuilder.generate
 
       expected =
 	"def test_array_int_null_in arr
-	  _v1 = GirFFI::ArgHelper.gint32_array_to_inptr arr
+	  _v1 = GirFFI::InPointer.from_array :gint32, arr
 	  len = arr.nil? ? 0 : arr.length
 	  _v2 = len
 	  ::Lib.regress_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 Regress:test_array_int_null_out" do
-      go = get_function_introspection_data 'Regress', 'test_array_int_null_out'
+      go = get_introspection_data 'Regress', 'test_array_int_null_out'
       fbuilder = GirFFI::Builder::Function.new go, Lib
       code = fbuilder.generate
 
       expected =
 	"def test_array_int_null_out
-	  _v1 = GirFFI::ArgHelper.pointer_outptr
-	  _v3 = GirFFI::ArgHelper.gint32_outptr
-	  ::Lib.regress_test_array_int_null_out _v1, _v3
-	  _v4 = GirFFI::ArgHelper.outptr_to_gint32 _v3
-	  GirFFI::ArgHelper.cleanup_ptr _v3
-	  _v2 = GirFFI::ArgHelper.outptr_to_gint32_array _v1, _v4
-	  GirFFI::ArgHelper.cleanup_ptr_ptr _v1
-	  return _v2
+	  _v1 = GirFFI::InOutPointer.for :pointer
+	  _v2 = GirFFI::InOutPointer.for :gint32
+	  ::Lib.regress_test_array_int_null_out _v1, _v2
+	  _v3 = _v2.to_value
+	  _v4 = GirFFI::ArgHelper.outptr_to_gint32_array _v1, _v3
+	  return _v4
 	end"
 
       assert_equal cws(expected), cws(code)
@@ -119,15 +114,13 @@ class FunctionDefinitionBuilderTest < MiniTest::Spec
 
       expected =
         "def method_array_inout ints
-          _v1 = GirFFI::ArgHelper.gint32_array_to_inoutptr ints
+          _v1 = GirFFI::InOutPointer.from_array :gint32, ints
           length = ints.length
-          _v3 = GirFFI::ArgHelper.gint32_to_inoutptr length
-          ::Lib.gi_marshalling_tests_object_method_array_inout self, _v1, _v3
-          _v4 = GirFFI::ArgHelper.outptr_to_gint32 _v3
-          GirFFI::ArgHelper.cleanup_ptr _v3
-          _v2 = GirFFI::ArgHelper.outptr_to_gint32_array _v1, _v4
-          GirFFI::ArgHelper.cleanup_ptr _v1
-          return _v2
+          _v2 = GirFFI::InOutPointer.from :gint32, length
+          ::Lib.gi_marshalling_tests_object_method_array_inout self, _v1, _v2
+          _v3 = _v2.to_value
+          _v4 = GirFFI::ArgHelper.outptr_to_gint32_array _v1, _v3
+          return _v4
 	end"
 
       assert_equal cws(expected), cws(code)

data/test/g_object_overrides_test.rb

@@ -180,6 +180,18 @@ class GObjectOverridesTest < MiniTest::Spec
 	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 =
+            GirFFI::Overrides::GObject::Helper.signal_argument_to_gvalue(
+              info, "foo")
+          assert_instance_of GObject::Value, val
+          assert_equal "foo", val.get_string
+        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
@@ -187,7 +199,7 @@ class GObjectOverridesTest < MiniTest::Spec
 	    o = Regress::TestSubObj.new
 	    b = Regress::TestSimpleBoxedA.new
 	    ud = GirFFI::ArgHelper.object_to_inptr "Hello!"
-	    sig = o.class.gir_ffi_builder.find_signal sig_name
+	    sig = o.class._find_signal sig_name
 
 	    @gva =
 	      GirFFI::Overrides::GObject::Helper.cast_back_signal_arguments(
@@ -217,6 +229,22 @@ class GObjectOverridesTest < MiniTest::Spec
 	  end
 	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 = GirFFI::Overrides::GObject::Helper.cast_signal_argument @info, 7
+            assert_equal :july, res
+          end
+        end
+      end
     end
 
     context "The RubyClosure class" do

data/test/glib_overrides_test.rb

@@ -1,6 +1,10 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
 
 describe "With the GLib overrides" do
+  before do
+    GirFFI.setup :GLib
+  end
+
   describe "a HashTable provided by the system" do
     before do
       GirFFI.setup :Regress

data/test/gtk_overrides_test.rb

@@ -1,25 +1,31 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require 'gir_ffi/overrides/gtk'
 
-class GtkOverridesTest < MiniTest::Spec
-  context "The Gtk.init function" do
-    setup do
-      GirFFI.setup :Gtk, '2.0'
+describe GirFFI::Overrides::Gtk do
+  before do
+    @gtk = Module.new do
+      def self.init arr
+        ["baz", "qux", "zonk"]
+      end
     end
+    stub(@gtk)._setup_method { }
 
-    should "not take any arguments" do
-      assert_raises(ArgumentError) { Gtk.init 1, ["foo"] }
-      assert_raises(ArgumentError) { Gtk.init ["foo"] }
-      assert_nothing_raised { Gtk.init }
+    @gtk.instance_eval do
+      include GirFFI::Overrides::Gtk
     end
+  end
 
-    # FIXME: The following test doesn't actually work.
-    # In practice however, the Gtk.init function does exactly this.
-    if false
-    should "process ARGV, removing Gtk+ options" do
-      ARGV.replace ["foo", "--g-fatal-warnings"]
-      Gtk.init
-      assert_same_elements ["foo"], ARGV
+  context "The .init function" do
+    should "not take any arguments" do
+      assert_raises(ArgumentError) { @gtk.init 1, ["foo"] }
+      assert_raises(ArgumentError) { @gtk.init ["foo"] }
+      assert_nothing_raised { @gtk.init }
     end
+
+    should "replace 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
   end
 end

data/test/i_repository_test.rb

@@ -41,9 +41,10 @@ module GirFFI
       end
     end
 
-    context "Enumerating the infos" do
+    context "Enumerating the infos for Gtk" do
       setup do
 	@gir = IRepository.default
+        @gir.require 'Gtk'
       end
 
       should "yield more than one object" do

data/test/{generated_gimarshallingtests_test.rb → integration/generated_gimarshallingtests_test.rb}

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
 
 # Tests generated methods and functions in the GIMarshallingTests namespace.
 describe "GIMarshallingTests" do

data/test/integration/generated_gio_test.rb

@@ -0,0 +1,98 @@
+require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+
+# Tests generated methods and functions in the Gio namespace.
+describe "The generated Gio module" do
+  setup do
+    GirFFI.setup :Gio
+  end
+
+  describe "#file_new_for_path, a method returning an interface," do
+    it "does not throw an error when generated" do
+      assert_nothing_raised {
+        Gio.file_new_for_path('/')
+      }
+    end
+
+    it "returns an object of a more specific class" do
+      file = Gio.file_new_for_path('/')
+      refute_instance_of Gio::File, file
+      assert_includes file.class.ancestors, Gio::File
+    end
+  end
+
+  describe "the result of #file_new_from_path" do
+    before do
+      @it = Gio.file_new_for_path('/')
+    end
+
+    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'
+      @it.setup_and_call :get_qdata, 1
+    end
+  end
+
+  context "the FileInfo class" do
+    context "an instance" do
+      setup do
+        file = Gio.file_new_for_path('/')
+        @fileinfo = file.query_info "*", :none, nil
+      end
+
+      should "hava a working #get_attribute_type method" do
+        type = @fileinfo.get_attribute_type "standard::display-name"
+        assert_equal :string, type
+      end
+    end
+  end
+
+  describe "the action-added signal" do
+    before do
+      @grp = Gio::SimpleActionGroup.new
+    end
+
+    it "correctly passes on the string parameter 'action_name'" do
+      a = nil
+      GObject.signal_connect @grp, "action-added" do |grp, action_name, user_data|
+        a = action_name
+      end
+      GObject.signal_emit @grp, "action-added", "foo"
+      assert_equal "foo", a
+    end
+  end
+
+  describe "the reply signal" do
+    before do
+      @mo = Gio::MountOperation.new
+    end
+
+    it "correctly passes on the enum parameter 'result'" do
+      a = nil
+      GObject.signal_connect @mo, "reply" do |mnt, result, user_data|
+        a = result
+      end
+      GObject.signal_emit @mo, "reply", 2
+      assert_equal :unhandled, a
+    end
+  end
+
+  describe "the CharsetConverter class" do
+    it "includes two interfaces" do
+      klass = Gio::CharsetConverter
+      assert_includes klass.ancestors, Gio::Converter
+      assert_includes klass.ancestors, Gio::Initable
+    end
+
+    it "allows an instance to find the #reset method" do
+      cnv = Gio::CharsetConverter.new "utf8", "utf8"
+      cnv.reset
+      pass
+    end
+  end
+end
+

data/test/integration/generated_gobject_test.rb

@@ -0,0 +1,30 @@
+require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+
+describe "The generated GObject module" do
+  before do
+    GirFFI.setup :GObject
+  end
+
+  describe "#type_interfaces" do
+    it "works, showing that returning an array of GType works" do
+      tp = GObject.type_from_name 'GTypeModule'
+      ifcs = GObject.type_interfaces tp
+      assert_equal 1, ifcs.size
+    end
+  end
+
+  describe "the TypePlugin interface" do
+    it "is implemented as a module" do
+      mod = GObject::TypePlugin
+      assert_instance_of Module, mod
+      refute_instance_of Class, mod
+    end
+  end
+
+  describe "the TypeModule class" do
+    it "has the GObject::TypePlugin module as an ancestor" do
+      klass = GObject::TypeModule
+      assert_includes klass.ancestors, GObject::TypePlugin
+    end
+  end
+end

data/test/{generated_gtk_test.rb → integration/generated_gtk_test.rb}

@@ -1,12 +1,12 @@
-require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+
+# Since the tests will call Gtk+ functions, Gtk+ must be initialized.
+GirFFI.setup :Gtk, '2.0'
+Gtk.init
 
 # Tests generated methods and functions in the Gtk namespace.
 class GeneratedGtkTest < MiniTest::Spec
   context "In the generated Gtk module" do
-    setup do
-      GirFFI.setup :Gtk, '2.0'
-    end
-
     context "a Gtk::Builder instance" do
       setup do
 	@builder = Gtk::Builder.new

data/test/{generated_regress_test.rb → integration/generated_regress_test.rb}

@@ -1,5 +1,5 @@
 # coding: utf-8
-require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
 
 # Tests generated methods and functions in the Regress namespace.
 class GeneratedRegressTest < MiniTest::Spec
@@ -129,6 +129,7 @@ class GeneratedRegressTest < MiniTest::Spec
 	assert_instance_of Regress::TestObj, o
       end
 
+      # TODO: Test that callback is called
       should "create an instance using #new_callback" do
 	o = Regress::TestObj.new_callback Proc.new { }, nil, nil
 	assert_instance_of Regress::TestObj, o
@@ -212,7 +213,21 @@ class GeneratedRegressTest < MiniTest::Spec
 	should "not respond to #static_method" do
 	  assert_raises(NoMethodError) { @o.static_method 1 }
 	end
+        # TODO: Test instance's fields and properies.
       end
+
+      describe "its 'test' signal" do
+        it "properly passes its arguments" do
+          a = b = nil
+          o = Regress::TestSubObj.new
+          GObject.signal_connect(o, "test", 2) { |i, d| a = d; b = i }
+          GObject.signal_emit o, "test"
+          # TODO: store o's identity somewhere so we can make o == b.
+          assert_equal [2, o.to_ptr], [a, b.to_ptr]
+        end
+      end
+
+      # TODO: Test other signals.
     end
 
     context "the Regress::TestSimpleBoxedA class" do
@@ -467,15 +482,15 @@ class GeneratedRegressTest < MiniTest::Spec
     end
 
     should "have correct test_async_ready_callback" do
-      GirFFI.setup :Gtk, '2.0'
       a = 1
+      main_loop = GLib.main_loop_new nil, false
 
       Regress.test_async_ready_callback Proc.new {
-	Gtk.main_quit
+	main_loop.quit
 	a = 2
       }
 
-      Gtk.main
+      main_loop.run
 
       assert_equal 2, a
     end
@@ -975,7 +990,6 @@ class GeneratedRegressTest < MiniTest::Spec
     end
 
     should "have correct test_utf8_const_in" do
-      # TODO: Capture stderr to automatically look for error messages.
       assert_nothing_raised do
 	Regress.test_utf8_const_in("const \xe2\x99\xa5 utf8")
       end

data/test/interface_type_builder_test.rb

@@ -2,7 +2,7 @@ require File.expand_path('test_helper.rb', File.dirname(__FILE__))
 
 describe GirFFI::Builder::Type::Interface do
   before do
-    info = get_function_introspection_data 'GObject', 'TypePlugin'
+    info = get_introspection_data 'GObject', 'TypePlugin'
     @bldr = GirFFI::Builder::Type::Interface.new info
     @iface = @bldr.build_class
   end

data/test/module_builder_test.rb

@@ -9,7 +9,7 @@ class ModuleBuilderTest < MiniTest::Spec
 
       context "looking at Gtk.main" do
 	setup do
-	  @go = get_function_introspection_data 'Gtk', 'main'
+	  @go = get_introspection_data 'Gtk', 'main'
 	end
 
 	should "build correct definition of Gtk.main" do
@@ -21,7 +21,7 @@ class ModuleBuilderTest < MiniTest::Spec
 
       context "looking at Gtk.init" do
 	setup do
-	  @go = get_function_introspection_data 'Gtk', 'init'
+	  @go = get_introspection_data 'Gtk', 'init'
 	end
 
 	should "delegate definition to Builder::Function" do
@@ -39,7 +39,7 @@ class ModuleBuilderTest < MiniTest::Spec
 
       context "looking at Regress.test_callback_destroy_notify" do
 	setup do
-	  @go = get_function_introspection_data 'Regress', 'test_callback_destroy_notify'
+	  @go = get_introspection_data 'Regress', 'test_callback_destroy_notify'
 	end
 
 	should "delegate definition to Builder::Function" do