gir_ffi 0.0.14 → 0.1.0

data/test/builder_test.rb

@@ -1,9 +1,9 @@
-require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require File.expand_path('gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
 class BuilderTest < MiniTest::Spec
   context "The GirFFI::Builder module" do
     setup do
-      @gir = GirFFI::IRepository.default
+      @gir = GObjectIntrospection::IRepository.default
     end
 
     context "building GObject::Object" do

data/test/class_base_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require File.expand_path('gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
 class ClassBaseTest < MiniTest::Spec
   context "A class derived from GirFFI::Base" do

data/test/{glib_overrides_test.rb → ffi-glib/glib_overrides_test.rb}

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

data/test/{g_object_overrides_test.rb → ffi-gobject/g_object_overrides_test.rb}

@@ -1,4 +1,6 @@
-require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+
+require 'ffi-gobject'
 
 class GObjectOverridesTest < MiniTest::Spec
   context "In the GObject module with overridden functions" do
@@ -6,36 +8,6 @@ class GObjectOverridesTest < MiniTest::Spec
       GirFFI.setup :Regress
     end
 
-    context "the Value class" do
-      context "the wrap_ruby_value class method" do
-        should "wrap a boolean false" do
-          gv = GObject::Value.wrap_ruby_value false
-          assert_instance_of GObject::Value, gv
-          assert_equal false, gv.get_boolean
-        end
-
-        should "wrap a boolean true" do
-          gv = GObject::Value.wrap_ruby_value true
-          assert_instance_of GObject::Value, gv
-          assert_equal true, gv.get_boolean
-        end
-      end
-
-      context "the ruby_value method" do
-        should "unwrap a boolean false" do
-          gv = GObject::Value.wrap_ruby_value false
-          result = gv.ruby_value
-          assert_equal false, result
-        end
-
-        should "unwrap a boolean true" do
-          gv = GObject::Value.wrap_ruby_value true
-          result = gv.ruby_value
-          assert_equal true, result
-        end
-      end
-    end
-
     context "the signal_emit function" do
       should "emit a signal" do
 	a = 1
@@ -158,7 +130,7 @@ class GObjectOverridesTest < MiniTest::Spec
 	    b = Regress::TestSimpleBoxedA.new
 
 	    @gva =
-	      GirFFI::Overrides::GObject::Helper.signal_arguments_to_gvalue_array(
+	      GObject::Helper.signal_arguments_to_gvalue_array(
 		"test-with-static-scope-arg", o, b)
 	  end
 
@@ -185,7 +157,7 @@ class GObjectOverridesTest < MiniTest::Spec
           stub(arg_t = Object.new).tag { :utf8 }
           stub(info = Object.new).argument_type { arg_t }
           val =
-            GirFFI::Overrides::GObject::Helper.signal_argument_to_gvalue(
+            GObject::Helper.signal_argument_to_gvalue(
               info, "foo")
           assert_instance_of GObject::Value, val
           assert_equal "foo", val.get_string
@@ -202,7 +174,7 @@ class GObjectOverridesTest < MiniTest::Spec
 	    sig = o.class._find_signal sig_name
 
 	    @gva =
-	      GirFFI::Overrides::GObject::Helper.cast_back_signal_arguments(
+	      GObject::Helper.cast_back_signal_arguments(
 		sig, o.class, o.to_ptr, b.to_ptr, ud)
 	  end
 
@@ -240,7 +212,7 @@ class GObjectOverridesTest < MiniTest::Spec
           end
 
           it "casts an integer to its enum symbol" do
-            res = GirFFI::Overrides::GObject::Helper.cast_signal_argument @info, 7
+            res = GObject::Helper.cast_signal_argument @info, 7
             assert_equal :july, res
           end
         end
@@ -301,5 +273,3 @@ class GObjectOverridesTest < MiniTest::Spec
     end
   end
 end
-
-

data/test/ffi-gobject/gobject_test.rb

@@ -0,0 +1,22 @@
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+
+require 'ffi-gobject'
+
+describe GObject do
+  it "has type_init as a public method" do
+    assert GObject.respond_to?('type_init')
+  end
+
+  it "does not have g_type_init as a public method" do
+    assert GObject.respond_to?('g_type_init') == false
+  end
+
+  context "::type_init" do
+    it "does not raise an error" do
+      assert_nothing_raised do
+        GObject.type_init
+      end
+    end
+  end
+end
+

data/test/ffi-gobject/value_test.rb

@@ -0,0 +1,34 @@
+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
+    it "wraps a boolean false" do
+      gv = GObject::Value.wrap_ruby_value false
+      assert_instance_of GObject::Value, gv
+      assert_equal false, gv.get_boolean
+    end
+
+    it "wraps a boolean true" do
+      gv = GObject::Value.wrap_ruby_value true
+      assert_instance_of GObject::Value, gv
+      assert_equal true, gv.get_boolean
+    end
+  end
+
+  describe "#ruby_value" do
+    it "unwraps a boolean false" do
+      gv = GObject::Value.wrap_ruby_value false
+      result = gv.ruby_value
+      assert_equal false, result
+    end
+
+    it "unwraps a boolean true" do
+      gv = GObject::Value.wrap_ruby_value true
+      result = gv.ruby_value
+      assert_equal true, result
+    end
+  end
+end
+

data/test/{unit → ffi-gobject_introspection}/i_base_info_test.rb

@@ -1,11 +1,11 @@
 require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
 
-describe GirFFI::IBaseInfo do
+describe GObjectIntrospection::IBaseInfo do
   describe "#safe_name" do
     it "makes names starting with an underscore safe" do
       stub(ptr = Object.new).null? { false }
 
-      info = GirFFI::IBaseInfo.wrap ptr
+      info = GObjectIntrospection::IBaseInfo.wrap ptr
 
       stub(info).name { "_foo" }
 

data/test/{unit → ffi-gobject_introspection}/i_constant_info_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
 
-describe GirFFI::IConstantInfo do
+describe GObjectIntrospection::IConstantInfo do
   describe "for GLib::ALLOCATOR_LIST, a constant of type :gint32" do
     before do
       @info = get_introspection_data 'GLib', 'ALLOCATOR_LIST'

data/test/ffi-gobject_introspection/i_object_info_test.rb

@@ -0,0 +1,20 @@
+require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
+
+module GirFFI
+  class IObjectInfoTest < MiniTest::Spec
+    context "An IObjectInfo object" do
+
+      setup do
+	gir = GObjectIntrospection::IRepository.default
+	gir.require 'GObject', nil
+	@info = gir.find_by_name 'GObject', 'Object'
+      end
+
+      should "find a vfunc by name" do
+	assert_not_nil @info.find_vfunc("finalize")
+      end
+    end
+
+  end
+end
+

data/test/{unit → ffi-gobject_introspection}/i_repository_test.rb

@@ -1,21 +1,21 @@
 require File.expand_path('../test_helper.rb', File.dirname(__FILE__))
 
-describe GirFFI::IRepository do
+describe GObjectIntrospection::IRepository do
   describe "an instance" do
     should "not be created by calling new()" do
       assert_raises NoMethodError do
-        GirFFI::IRepository.new
+        GObjectIntrospection::IRepository.new
       end
     end
 
     should "be created by calling default()" do
-      gir = GirFFI::IRepository.default
-      assert_kind_of GirFFI::IRepository, gir
+      gir = GObjectIntrospection::IRepository.default
+      assert_kind_of GObjectIntrospection::IRepository, gir
     end
 
     should "be a singleton" do
-      gir = GirFFI::IRepository.default
-      gir2 = GirFFI::IRepository.default
+      gir = GObjectIntrospection::IRepository.default
+      gir2 = GObjectIntrospection::IRepository.default
       assert_equal gir, gir2
     end
   end
@@ -23,26 +23,26 @@ describe GirFFI::IRepository do
   describe "#namespace" do
     should "raise an error if the namespace doesn't exist" do
       assert_raises RuntimeError do
-        GirFFI::IRepository.default.require 'VeryUnlikelyGObjectNamespaceName', nil
+        GObjectIntrospection::IRepository.default.require 'VeryUnlikelyGObjectNamespaceName', nil
       end
     end
 
     should "allow version to be nil" do
       assert_nothing_raised do
-        GirFFI::IRepository.default.require 'GObject', nil
+        GObjectIntrospection::IRepository.default.require 'GObject', nil
       end
     end
 
     should "allow version to be left out" do
       assert_nothing_raised do
-        GirFFI::IRepository.default.require 'GObject'
+        GObjectIntrospection::IRepository.default.require 'GObject'
       end
     end
   end
 
   describe "enumerating the infos for Gtk" do
     setup do
-      @gir = GirFFI::IRepository.default
+      @gir = GObjectIntrospection::IRepository.default
       @gir.require 'Gtk', "2.0"
     end
 
@@ -51,7 +51,7 @@ describe GirFFI::IRepository do
     end
 
     should "yield IBaseInfo objects" do
-      assert_kind_of GirFFI::IBaseInfo, @gir.info('Gtk', 0)
+      assert_kind_of GObjectIntrospection::IBaseInfo, @gir.info('Gtk', 0)
     end
   end
 end

data/test/function_definition_builder_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require File.expand_path('gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
 class FunctionDefinitionBuilderTest < MiniTest::Spec
   context "The Builder::Function class" do

data/test/gir_ffi_test_helper.rb

@@ -0,0 +1,114 @@
+require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+
+require 'gir_ffi'
+
+GObjectIntrospection::IRepository.prepend_search_path File.join(File.dirname(__FILE__), 'lib')
+module GObjectIntrospection
+  class IRepository
+    def shared_library_with_regress namespace
+      case namespace
+      when "Regress"
+	return File.join(File.dirname(__FILE__), 'lib', 'libregress.so')
+      when "GIMarshallingTests"
+	return File.join(File.dirname(__FILE__), 'lib', 'libgimarshallingtests.so')
+      else
+	return shared_library_without_regress namespace
+      end
+    end
+
+    alias shared_library_without_regress shared_library
+    alias shared_library shared_library_with_regress
+  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 Lib
+end
+
+class MiniTest::Unit::TestCase
+  def cws code
+    code.gsub(/(^\s*|\s*$)/, "")
+  end
+
+  def get_method_introspection_data namespace, klass, name
+    get_introspection_data(namespace, klass).find_method name
+  end
+
+  SAVED_MODULES = {}
+
+  def save_module name
+    if Object.const_defined? name
+      puts "Saving #{name} over existing" if SAVED_MODULES.has_key? name
+      SAVED_MODULES[name] = Object.const_get name
+      Object.send(:remove_const, name)
+    end
+  end
+
+  def restore_module name
+    if Object.const_defined? name
+      Object.send(:remove_const, name)
+    end
+    if SAVED_MODULES.has_key? name
+      Object.const_set name, SAVED_MODULES[name]
+      SAVED_MODULES.delete name
+    end
+  end
+
+  def ref_count object
+    GObject::Object::Struct.new(object.to_ptr)[:ref_count]
+  end
+
+  def is_floating? object
+    (GObject::Object::Struct.new(object.to_ptr)[:qdata].address & 2) == 2
+  end
+
+  def max_for_unsigned_type type
+    ( 1 << (FFI.type_size(type) * 8) ) - 1
+  end
+
+  def max_for_type type
+    ( 1 << (FFI.type_size(type) * 8 - 1) ) - 1
+  end
+
+  def min_for_type type
+    ~max_for_type(type)
+  end
+
+  def max_long
+    max_for_type :long
+  end
+
+  def min_long
+    min_for_type :long
+  end
+
+  def max_size_t
+    max_for_unsigned_type :size_t
+  end
+
+  def max_ssize_t
+    # FFI has no :ssize_t, but it's the same number of bits as :size_t
+    max_for_type :size_t
+  end
+
+  def min_ssize_t
+    min_for_type :size_t
+  end
+
+  def max_ushort
+    max_for_unsigned_type :ushort
+  end
+
+  def max_uint
+    max_for_unsigned_type :uint
+  end
+
+  def max_ulong
+    max_for_unsigned_type :ulong
+  end
+end
+

data/test/girffi_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require File.expand_path('gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
 class GirFFITest < MiniTest::Spec
   context "GirFFI" do
@@ -8,7 +8,7 @@ class GirFFITest < MiniTest::Spec
     end
 
     it "sets up xlib, which has no shared library" do
-      gir = GirFFI::IRepository.default
+      gir = GObjectIntrospection::IRepository.default
       gir.require 'xlib'
       assert_nil gir.shared_library('xlib'), "Precondition for test failed"
       GirFFI.setup :xlib

data/test/gtk_overrides_test.rb

@@ -1,32 +1,35 @@
-require File.expand_path('test_helper.rb', File.dirname(__FILE__))
-require 'gir_ffi/overrides/gtk'
+require File.expand_path('gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
-describe GirFFI::Overrides::Gtk do
+describe "Gtk's overrides" do
   before do
-    @gtk = Module.new 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 { }
+    stub(Gtk)._setup_method { }
 
-    @gtk.instance_eval do
-      include GirFFI::Overrides::Gtk
-    end
+    load 'ffi-gtk/base.rb'
   end
 
   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 }
+      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
+      Gtk.init
       assert_equal ["qux", "zonk"], ARGV.to_a
     end
   end
+
+  after do
+    restore_module :Gtk
+  end
 end