gir_ffi 0.2.3 → 0.3.0

data/test/integration/generated_gimarshallingtests_test.rb

@@ -38,20 +38,24 @@ describe "GIMarshallingTests" do
     end
 
     it "has a working function #inout" do
+      skip unless get_method_introspection_data 'GIMarshallingTests', 'BoxedStruct', 'inout'
       bx = GIMarshallingTests::BoxedStruct.new
       bx.long_ = 42
 
       res = GIMarshallingTests::BoxedStruct.inout bx
+
       assert_equal 42, bx.long_
       assert_equal 0, res.long_
     end
 
     it "has a working function #out" do
+      skip unless get_method_introspection_data 'GIMarshallingTests', 'BoxedStruct', 'out'
       res = GIMarshallingTests::BoxedStruct.out
       assert_equal 42, res.long_
     end
 
     it "has a working function #returnv" do
+      skip unless get_method_introspection_data 'GIMarshallingTests', 'BoxedStruct', 'returnv'
       res = GIMarshallingTests::BoxedStruct.returnv
       assert_equal 42, res.long_
       assert_equal ["0", "1", "2"], res.g_strv.to_a
@@ -136,7 +140,7 @@ describe "GIMarshallingTests" do
     it "creates instances with #new" do
       ob = GIMarshallingTests::Object.new 42
       assert_instance_of GIMarshallingTests::Object, ob
-      assert_equal 42, ob.int_
+      assert_equal 42, ob.int
     end
 
     it "has a working function #full_inout" do
@@ -196,7 +200,7 @@ describe "GIMarshallingTests" do
 
       it "has a working virtual method #method_with_default_implementation" do
         @obj.method_with_default_implementation 104
-        assert_equal 104, @obj.int_
+        assert_equal 104, @obj.int
       end
 
       # This function is only found in the header
@@ -236,7 +240,7 @@ describe "GIMarshallingTests" do
         pass
       end
 
-      it "has a property 'int'" do
+      it "has a property 'int' containing the argument to #new" do
         assert_equal 42, @obj.get_property("int")
         @obj.set_property("int", 13)
         assert_equal 13, @obj.get_property("int")
@@ -248,14 +252,10 @@ describe "GIMarshallingTests" do
         pass
       end
 
-      it "has a read-only field parent_instance containing the parent struct" do
-        assert_instance_of GObject::Object, @obj.parent_instance
-        assert_raises(NoMethodError) { @obj.parent_instance = nil }
-      end
-
-      it "has a read-only field int_ containing the argument to #new" do
-        assert_equal 42, @obj.int_
-        assert_raises(NoMethodError) { @obj.int_ = 1 }
+      it "has property accessors for the int property" do
+        assert_equal 42, @obj.int
+        @obj.int = 1
+        assert_equal 1, @obj.int
       end
     end
   end
@@ -276,13 +276,10 @@ describe "GIMarshallingTests" do
         @obj = GIMarshallingTests::OverridesObject.new
       end
 
-      it "has a read-only field parent_instance containing the parent struct" do
-        assert_instance_of GObject::Object, @obj.parent_instance
+      it "does not have field accessor methods" do
+        assert_raises(NoMethodError) { @obj.parent_instance }
         assert_raises(NoMethodError) { @obj.parent_instance = nil }
-      end
-
-      it "has a read-only field long_" do
-        assert_equal 0.0, @obj.long_
+        assert_raises(NoMethodError) { @obj.long_ }
         assert_raises(NoMethodError) { @obj.long_ = 1 }
       end
     end
@@ -371,8 +368,8 @@ describe "GIMarshallingTests" do
         pass
       end
 
-      it "has a read-only field parent_instance containing the parent struct" do
-        assert_instance_of GIMarshallingTests::Object, @so.parent_instance
+      it "does not have field accessors" do
+        assert_raises(NoMethodError) { @so.parent_instance }
         assert_raises(NoMethodError) { @so.parent_instance = nil }
       end
 
@@ -381,14 +378,14 @@ describe "GIMarshallingTests" do
 
       it "has a working inherited virtual method #method_with_default_implementation" do
         @so.method_with_default_implementation 104
-        assert_equal 104, @so.parent_instance.int_
+        assert_equal 104, @so.int
       end
 
       it "has a working inherited method #int8_in"
       it "has a working inherited method #int8_out"
 
       it "has a working inherited method #method" do
-        @so.parent_instance.set_property("int", 42)
+        @so.set_property("int", 42)
         @so.method
         pass
       end
@@ -414,13 +411,13 @@ describe "GIMarshallingTests" do
       end
 
       it "has a working inherited method #none_in" do
-        @so.parent_instance.set_property("int", 42)
+        @so.set_property("int", 42)
         @so.none_in
         pass
       end
 
       it "has a working inherited method #overridden_method" do
-        @so.parent_instance.set_property("int", 0)
+        @so.set_property("int", 0)
         @so.overridden_method
         pass
       end

data/test/integration/generated_gio_test.rb

@@ -34,6 +34,11 @@ describe "The generated Gio module" do
 
       @it.setup_and_call :get_qdata, 1
     end
+
+    it "knows its GType" do
+      instance_gtype = GObject.type_from_instance @it
+      @it.class.get_gtype.must_equal instance_gtype
+    end
   end
 
   context "the FileInfo class" do

data/test/integration/generated_gobject_test.rb

@@ -7,8 +7,8 @@ describe "The generated GObject module" do
 
   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
+      klass = GObject::TypeModule
+      ifcs = GObject.type_interfaces klass.get_gtype
       assert_equal 1, ifcs.size
     end
   end

data/test/integration/generated_gtk_test.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
 # Since the tests will call Gtk+ functions, Gtk+ must be initialized.
-require 'ffi-gtk2'
+require 'ffi-gtk3'
 Gtk.init
 
 # Tests generated methods and functions in the Gtk namespace.

data/test/integration/generated_pango_test.rb

@@ -0,0 +1,20 @@
+# coding: utf-8
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+
+require 'gir_ffi'
+
+GirFFI.setup :Gdk
+GirFFI.setup :Pango
+Gdk.init []
+
+# Tests generated methods and functions in the Pango namespace.
+describe "Building classes in the Pango namespace" do
+  describe "the relevant Pango::FontMap subclass" do
+    it "is a descendant from Pango::FontMap" do
+      ctx = Gdk.pango_context_get
+      result = ctx.get_font_map
+      result.class.ancestors.must_include Pango::FontMap
+    end
+  end
+end
+