gir_ffi 0.0.8 → 0.0.9

data/test/builder_test.rb

@@ -1,15 +1,15 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
 
-class BuilderTest < Test::Unit::TestCase
+class BuilderTest < MiniTest::Spec
   context "The GirFFI::Builder module" do
     setup do
       @gir = GirFFI::IRepository.default
     end
 
     context "building GObject::Object" do
-      setup do
-	cleanup_module :GObject
-	GirFFI::Builder.build_class @gir.find_by_name('GObject', 'Object')
+      before do
+	save_module :GObject
+	GirFFI::Builder.build_class get_function_introspection_data('GObject', 'Object')
       end
 
       should "create a Lib module in the parent namespace ready to attach functions from gobject-2.0" do
@@ -23,16 +23,20 @@ class BuilderTest < Test::Unit::TestCase
 
       should "not replace existing classes" do
 	oldclass = GObject::Object
-	GirFFI::Builder.build_class @gir.find_by_name('GObject', 'Object')
+	GirFFI::Builder.build_class get_function_introspection_data('GObject', 'Object')
 	assert_equal oldclass, GObject::Object
       end
+
+      after do
+        restore_module :GObject
+      end
     end
 
     context "building Gtk::Window" do
-      setup do
-	cleanup_module :Gtk
-	cleanup_module :GObject
-	GirFFI::Builder.build_class @gir.find_by_name('Gtk', 'Window')
+      before do
+	save_module :Gtk
+	save_module :GObject
+	GirFFI::Builder.build_class get_function_introspection_data('Gtk', 'Window')
       end
 
       should "build Gtk namespace" do
@@ -66,22 +70,16 @@ class BuilderTest < Test::Unit::TestCase
       should "result in Gtk::Window.new to succeed" do
 	assert_nothing_raised {Gtk::Window.new(:toplevel)}
       end
-    end
 
-    context "built Gtk::Widget" do
-      setup do
-        cleanup_module :Gtk
-	GirFFI::Builder.build_class @gir.find_by_name('Gtk', 'Widget')
-      end
-
-      should "not have regular #new as a constructor" do
-	assert_raises(NoMethodError) { Gtk::Widget.new }
+      after do
+	restore_module :Gtk
+	restore_module :GObject
       end
     end
 
     context "building Gtk" do
-      setup do
-	cleanup_module :Gtk
+      before do
+	save_module :Gtk
 	GirFFI::Builder.build_module 'Gtk'
       end
 
@@ -106,6 +104,10 @@ class BuilderTest < Test::Unit::TestCase
 	GirFFI::Builder.build_module 'Gtk'
 	assert_equal oldmodule, Gtk::Lib
       end
+
+      after do
+	restore_module :Gtk
+      end
     end
 
     context "looking at Gtk.main" do
@@ -159,10 +161,10 @@ class BuilderTest < Test::Unit::TestCase
     end
 
     context "looking at Regress.test_callback_destroy_notify" do
-      setup do
-	cleanup_module :GLib
-	cleanup_module :GObject
-	cleanup_module :Regress
+      before do
+	save_module :GLib
+	save_module :GObject
+	save_module :Regress
 	GirFFI::Builder.build_module 'GLib'
 	GirFFI::Builder.build_module 'GObject'
 	GirFFI::Builder.build_module 'Regress'
@@ -190,16 +192,21 @@ class BuilderTest < Test::Unit::TestCase
       should "define ffi enum type ConnectFlags" do
 	assert_equal({:after => 1, :swapped => 2}, GObject::ConnectFlags.to_h)
       end
+
+      after do
+	restore_module :Regress
+	restore_module :GObject
+	restore_module :GLib
+      end
     end
 
     context "building Regress::TestStructA" do
       setup do
-	@fieldnames = [:some_int, :some_int8, :some_double, :some_enum]
-	GirFFI::Builder.build_class @gir.find_by_name('Regress', 'TestStructA')
+	GirFFI::Builder.build_class get_function_introspection_data('Regress', 'TestStructA')
       end
 
       should "set up the correct struct members" do
-	assert_equal @fieldnames,
+	assert_equal [:some_int, :some_int8, :some_double, :some_enum],
 	  Regress::TestStructA::Struct.members
       end
 
@@ -212,13 +219,13 @@ class BuilderTest < Test::Unit::TestCase
       should "set up struct members with the correct types" do
 	tags = [:int, :int8, :double, Regress::TestEnum]
 	assert_equal tags.map {|t| FFI.find_type t},
-	  @fieldnames.map {|f| Regress::TestStructA::Struct.layout[f].type}
+	  Regress::TestStructA::Struct.layout.fields.map {|f| f.type}
       end
     end
 
     context "building GObject::TypeCValue" do
       setup do
-	GirFFI::Builder.build_class @gir.find_by_name('GObject', 'TypeCValue')
+	GirFFI::Builder.build_class get_function_introspection_data('GObject', 'TypeCValue')
       end
 
       should "set up the correct union members" do
@@ -238,7 +245,7 @@ class BuilderTest < Test::Unit::TestCase
 
     context "building GObject::ValueArray" do
       should "use provided constructor if present" do
-	GirFFI::Builder.build_class @gir.find_by_name('GObject', 'ValueArray')
+	GirFFI::Builder.build_class get_function_introspection_data('GObject', 'ValueArray')
 	assert_nothing_raised {
 	  GObject::ValueArray.new 2
 	}
@@ -247,7 +254,7 @@ class BuilderTest < Test::Unit::TestCase
 
     context "building Regress::TestBoxed" do
       setup do
-	GirFFI::Builder.build_class @gir.find_by_name('Regress', 'TestBoxed')
+	GirFFI::Builder.build_class get_function_introspection_data('Regress', 'TestBoxed')
       end
 
       should "set up #wrap" do
@@ -260,8 +267,8 @@ class BuilderTest < Test::Unit::TestCase
     end
 
     context "built Regress module" do
-      setup do
-	cleanup_module :Regress
+      before do
+	save_module :Regress
 	GirFFI::Builder.build_module 'Regress'
       end
 
@@ -279,12 +286,16 @@ class BuilderTest < Test::Unit::TestCase
       should "know its own module builder" do
 	assert GirFFI::Builder::Module === Regress.gir_ffi_builder
       end
+
+      after do
+        restore_module :Regress
+      end
     end
 
     context "built Regress::TestObj" do
-      setup do
-	cleanup_module :Regress
-	GirFFI::Builder.build_class @gir.find_by_name('Regress', 'TestObj')
+      before do
+	save_module :Regress
+	GirFFI::Builder.build_class get_function_introspection_data('Regress', 'TestObj')
       end
 
       should "make autocreated instance method available to all instances" do
@@ -319,12 +330,16 @@ class BuilderTest < Test::Unit::TestCase
 	    GirFFI::Builder.send(:ffi_function_argument_types, info)
 	end
       end
+
+      after do
+        restore_module :Regress
+      end
     end
 
     context "built Regress::TestSubObj" do
-      setup do
-	cleanup_module :Regress
-	GirFFI::Builder.build_class @gir.find_by_name('Regress', 'TestSubObj')
+      before do
+	save_module :Regress
+	GirFFI::Builder.build_class get_function_introspection_data('Regress', 'TestSubObj')
       end
 
       should "autocreate parent class' set_bare inside the parent class" do
@@ -346,11 +361,15 @@ class BuilderTest < Test::Unit::TestCase
 	subobj = Regress::TestSubObj.new
 	assert_equal 0, subobj.instance_method
       end
+
+      after do
+        restore_module :Regress
+      end
     end
 
     context "built Gio::ThreadedSocketService" do
-      setup do
-	cleanup_module :Gio
+      before do
+	save_module :Gio
 	GirFFI::Builder.build_module 'Gio'
       end
 
@@ -363,6 +382,10 @@ class BuilderTest < Test::Unit::TestCase
 	  assert_nothing_raised { Gio::ThreadedSocketService.new 2 }
 	end
       end
+
+      after do
+        restore_module :Gio
+      end
     end
   end
 end

data/test/class_base_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
 
-class ClassBaseTest < Test::Unit::TestCase
+class ClassBaseTest < MiniTest::Spec
   context "A class derived from GirFFI::Base" do
     # TODO: See if we can test some part of Base again.
     should "pass" do

data/test/function_definition_builder_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
 
-class FunctionDefinitionBuilderTest < Test::Unit::TestCase
+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'
@@ -68,7 +68,7 @@ class FunctionDefinitionBuilderTest < Test::Unit::TestCase
 	  _v4 = FFI::MemoryPointer.new(:pointer).write_pointer nil
 	  _v2 = ::Lib.regress_test_obj_new_from_file _v1, _v4
 	  GirFFI::ArgHelper.check_error(_v4)
-	  _v3 = ::Regress::TestObj.constructor_wrap(_v2)
+	  _v3 = self.constructor_wrap(_v2)
 	  return _v3
 	end"
 
@@ -111,5 +111,27 @@ class FunctionDefinitionBuilderTest < Test::Unit::TestCase
 
       assert_equal cws(expected), cws(code)
     end
+
+    it "builds the correct definition of GIMarshallingTests::Object#method_array_inout" do
+      go = get_method_introspection_data 'GIMarshallingTests', 'Object', 'method_array_inout'
+      fbuilder = GirFFI::Builder::Function.new go, Lib
+      code = fbuilder.generate
+
+      expected =
+        "def method_array_inout ints
+          _v1 = GirFFI::ArgHelper.gint32_array_to_inoutptr 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
+	end"
+
+      assert_equal cws(expected), cws(code)
+    end
+
   end
 end

data/test/g_object_overrides_test.rb

@@ -1,11 +1,9 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
 
-class GObjectOverridesTest < Test::Unit::TestCase
+class GObjectOverridesTest < MiniTest::Spec
   context "In the GObject module with overridden functions" do
     setup do
-      GirFFI.setup :GObject
       GirFFI.setup :Regress
-      GirFFI.setup :Gio
     end
 
     context "the Value class" do

data/test/g_object_test.rb

@@ -1,6 +1,6 @@
 require File.expand_path('test_helper.rb', File.dirname(__FILE__))
 
-class GObjectTest < Test::Unit::TestCase
+class GObjectTest < MiniTest::Spec
   context "The GirFFI::GObject helper module" do
     should "have type_init as a public method" do
       assert GirFFI::GObject.respond_to?('type_init')