gir_ffi 0.0.8 → 0.0.9

data/test/i_repository_test.rb

@@ -1,10 +1,10 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
 
 module GirFFI
-  class IRepositoryTest < Test::Unit::TestCase
+  class IRepositoryTest < MiniTest::Spec
     context "An IRepository object" do
       should "not be created by calling new()" do
-	assert_raise NoMethodError do
+	assert_raises NoMethodError do
 	  IRepository.new
 	end
       end
@@ -23,7 +23,7 @@ module GirFFI
 
     context "The namespace method" do
       should "raise an error if the namespace doesn't exist" do
-	assert_raise RuntimeError do
+	assert_raises RuntimeError do
 	  IRepository.default.require 'VeryUnlikelyGObjectNamespaceName', nil
 	end
       end
@@ -44,7 +44,6 @@ module GirFFI
     context "Enumerating the infos" do
       setup do
 	@gir = IRepository.default
-	@gir.require 'Gtk', nil
       end
 
       should "yield more than one object" do

data/test/lib/Makefile.am

@@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.7
 
 # We need to build a shared library, which can be dlopened
 # it does not work with noinst_LTLIBRARIES
-testlib_LTLIBRARIES = libregress.la
+testlib_LTLIBRARIES = libregress.la libgimarshallingtests.la
 
 testlibdir = $(prefix)/unused
 install-testlibLTLIBRARIES: # prevent it from being installed
@@ -12,6 +12,10 @@ libregress_la_SOURCES = $(GI_DATADIR)/tests/regress.c $(GI_DATADIR)/tests/regres
 libregress_la_CFLAGS = $(GIO_CFLAGS) $(CAIRO_CFLAGS)
 libregress_la_LDFLAGS = -module -avoid-version $(GIO_LIBS) $(CAIRO_LIBS)
 
+libgimarshallingtests_la_SOURCES = $(GI_DATADIR)/tests/gimarshallingtests.c $(GI_DATADIR)/tests/gimarshallingtests.h
+libgimarshallingtests_la_CFLAGS = $(GIO_CFLAGS)
+libgimarshallingtests_la_LDFLAGS = -module -avoid-version
+
 # g-i doesn't ship these as shared libraries anymore; we build them here
 Regress-1.0.gir: libregress.la Makefile
 	$(AM_V_GEN) g-ir-scanner --include=cairo-1.0 --include=Gio-2.0 \
@@ -24,7 +28,19 @@ Regress-1.0.gir: libregress.la Makefile
 Regress-1.0.typelib: Regress-1.0.gir Makefile
 	$(AM_V_GEN) g-ir-compiler $< -o $@
 
+GIMarshallingTests-1.0.gir: libgimarshallingtests.la Makefile
+	$(AM_V_GEN) g-ir-scanner --include=Gio-2.0 \
+	--namespace=GIMarshallingTests --nsversion=1.0 \
+	--symbol-prefix=gi_marshalling_tests \
+	--warn-all --warn-error \
+	--library=libgimarshallingtests.la \
+	--libtool="$(top_builddir)/libtool" \
+	--output $@ \
+	$(libgimarshallingtests_la_SOURCES)
+GIMarshallingTests-1.0.typelib: GIMarshallingTests-1.0.gir Makefile
+	$(AM_V_GEN) g-ir-compiler $< -o $@
+
 .la.so:
 	test -L $@ || $(LN_S) .libs/$@ $@
 
-all: $(testlib_LTLIBRARIES:.la=.so) Regress-1.0.typelib
+all: $(testlib_LTLIBRARIES:.la=.so) Regress-1.0.typelib GIMarshallingTests-1.0.typelib

data/test/module_builder_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
 
-class ModuleBuilderTest < Test::Unit::TestCase
+class ModuleBuilderTest < MiniTest::Spec
   context "The Builder::Module object" do
     context "for Gtk" do
       setup do

data/test/test_helper.rb

@@ -1,7 +1,10 @@
-require 'shoulda'
+require 'minitest/spec'
+require 'minitest/autorun'
 require 'rr'
 require 'ffi'
 
+Thread.abort_on_exception = true
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'gir_ffi'
@@ -12,15 +15,18 @@ if RUBY_PLATFORM == 'java'
 end
 
 # Since the tests will call Gtk+ functions, Gtk+ must be initialized.
-GirFFI.setup :Gtk
+GirFFI.setup :Gtk, '2.0'
 Gtk.init
 
 GirFFI::IRepository.prepend_search_path File.join(File.dirname(__FILE__), 'lib')
 module GirFFI
   class IRepository
     def shared_library_with_regress namespace
-      if namespace == "Regress"
+      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
@@ -35,7 +41,7 @@ end
 module Lib
 end
 
-class Test::Unit::TestCase
+class MiniTest::Unit::TestCase
   include RR::Adapters::TestUnit
   def cws code
     code.gsub(/(^\s*|\s*$)/, "")
@@ -53,12 +59,26 @@ class Test::Unit::TestCase
     gir.find_by_name(namespace, klass).find_method function
   end
 
-  def cleanup_module name
+  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 SAVED_MODULES.has_key? name
+      if Object.const_defined? name
+        Object.send(:remove_const, name)
+      end
+      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
@@ -66,4 +86,67 @@ class Test::Unit::TestCase
   def is_floating? object
     (GObject::Object::Struct.new(object.to_ptr)[:qdata].address & 2) == 2
   end
+
+  def assert_nothing_raised
+    yield
+    assert true
+  end
+
+  def assert_not_nil it
+    refute_nil it
+  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
+
+class MiniTest::Spec
+  class << self
+    alias :setup :before
+    alias :teardown :after
+    alias :should :it
+    alias :context :describe
+  end
 end

data/test/type_builder_test.rb

@@ -1,12 +1,9 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
 
-class TypeBuilderTest < Test::Unit::TestCase
+class TypeBuilderTest < MiniTest::Spec
   context "The Builder::Type class" do
-    setup do
-      @gir = GirFFI::IRepository.default
-    end
-
     should "use parent struct as default layout" do
+      @gir = GirFFI::IRepository.default
       @gir.require 'GObject', nil
 
       stub(info = Object.new).parent { @gir.find_by_name 'GObject', 'Object' }
@@ -23,7 +20,7 @@ class TypeBuilderTest < Test::Unit::TestCase
 
     context "for Gtk::Widget" do
       setup do
-	@cbuilder = GirFFI::Builder::Type::Object.new @gir.find_by_name('Gtk', 'Widget')
+	@cbuilder = GirFFI::Builder::Type::Object.new get_function_introspection_data('Gtk', 'Widget')
       end
 
       context "looking at Gtk::Widget#show" do
@@ -42,19 +39,19 @@ class TypeBuilderTest < Test::Unit::TestCase
 
     context 'the find_signal method' do
       should 'find the signal "test" for TestObj' do
-	builder = GirFFI::Builder::Type::Object.new @gir.find_by_name('Regress', 'TestObj')
+	builder = GirFFI::Builder::Type::Object.new get_function_introspection_data('Regress', 'TestObj')
 	sig = builder.find_signal 'test'
 	assert_equal 'test', sig.name
       end
 
       should 'find the signal "test" for TestSubObj' do
-	builder = GirFFI::Builder::Type::Object.new @gir.find_by_name('Regress', 'TestSubObj')
+	builder = GirFFI::Builder::Type::Object.new get_function_introspection_data('Regress', 'TestSubObj')
 	sig = builder.find_signal 'test'
 	assert_equal 'test', sig.name
       end
 
       should 'find the signal "changed" for Gtk::Entry' do
-	builder = GirFFI::Builder::Type::Object.new @gir.find_by_name('Gtk', 'Entry')
+	builder = GirFFI::Builder::Type::Object.new get_function_introspection_data('Gtk', 'Entry')
 	sig = builder.find_signal 'changed'
 	assert_equal 'changed', sig.name
       end
@@ -62,7 +59,7 @@ class TypeBuilderTest < Test::Unit::TestCase
 
     context "for GObject::TypeCValue (a union)" do
       setup do
-	@cbuilder = GirFFI::Builder::Type::Union.new @gir.find_by_name('GObject', 'TypeCValue')
+	@cbuilder = GirFFI::Builder::Type::Union.new get_function_introspection_data('GObject', 'TypeCValue')
       end
 
       should "not raise an error looking for a method that doesn't exist" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gir_ffi
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Matijs van Zuijlen
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 +02:00
-default_executable: 
+date: 2011-05-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi
@@ -35,19 +34,19 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: minitest
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 37
+        hash: 11
         segments: 
         - 2
-        - 11
-        - 3
-        version: 2.11.3
+        - 0
+        - 2
+        version: 2.0.2
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -90,6 +89,7 @@ files:
 - lib/gir_ffi/builder/module.rb
 - lib/gir_ffi/builder/function.rb
 - lib/gir_ffi/builder/type/base.rb
+- lib/gir_ffi/builder/type/constant.rb
 - lib/gir_ffi/builder/type/interface.rb
 - lib/gir_ffi/builder/type/struct_based.rb
 - lib/gir_ffi/builder/type/struct.rb
@@ -146,8 +146,10 @@ files:
 - test/generated_gtk_test.rb
 - test/type_builder_test.rb
 - test/builder_test.rb
+- test/glib_overrides_test.rb
 - test/gtk_overrides_test.rb
 - test/generated_gio_test.rb
+- test/generated_gimarshallingtests_test.rb
 - tasks/test.rake
 - tasks/setup.rb
 - tasks/notes.rake
@@ -164,7 +166,6 @@ files:
 - README.rdoc
 - History.txt
 - Rakefile
-has_rdoc: true
 homepage: http://www.github.com/mvz/ruby-gir-ffi
 licenses: []
 
@@ -195,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: FFI-based GObject binding using the GObject Introspection Repository
@@ -206,10 +207,12 @@ test_files:
 - test/function_definition_builder_test.rb
 - test/g_object_overrides_test.rb
 - test/g_object_test.rb
+- test/generated_gimarshallingtests_test.rb
 - test/generated_gio_test.rb
 - test/generated_gtk_test.rb
 - test/generated_regress_test.rb
 - test/girffi_test.rb
+- test/glib_overrides_test.rb
 - test/gtk_overrides_test.rb
 - test/i_object_info_test.rb
 - test/i_repository_test.rb