gir_ffi 0.1.0 → 0.2.0

data/test/integration/generated_regress_test.rb

@@ -33,19 +33,19 @@ class GeneratedRegressTest < MiniTest::Spec
       should "create an instance using #new_alternative_constructor1" do
 	tb = Regress::TestBoxed.new_alternative_constructor1 1
 	assert_instance_of Regress::TestBoxed, tb
-	assert_equal 1, tb[:some_int8]
+	assert_equal 1, tb.some_int8
       end
 
       should "create an instance using #new_alternative_constructor2" do
 	tb = Regress::TestBoxed.new_alternative_constructor2 1, 2
 	assert_instance_of Regress::TestBoxed, tb
-	assert_equal 1 + 2, tb[:some_int8]
+	assert_equal 1 + 2, tb.some_int8
       end
 
       should "create an instance using #new_alternative_constructor3" do
 	tb = Regress::TestBoxed.new_alternative_constructor3 "54"
 	assert_instance_of Regress::TestBoxed, tb
-	assert_equal 54, tb[:some_int8]
+	assert_equal 54, tb.some_int8
       end
 
       should "have non-zero positive result for #get_gtype" do
@@ -72,12 +72,12 @@ class GeneratedRegressTest < MiniTest::Spec
 	  end
 
 	  should "copy fields" do
-	    assert_equal 123, @tb2[:some_int8]
+	    assert_equal 123, @tb2.some_int8
 	  end
 
 	  should "create a true copy" do
-	    @tb[:some_int8] = 89
-	    assert_equal 123, @tb2[:some_int8]
+	    @tb.some_int8 = 89
+	    assert_equal 123, @tb2.some_int8
 	  end
 	end
       end
@@ -112,15 +112,48 @@ class GeneratedRegressTest < MiniTest::Spec
     end
 
     describe "TestFundamentalObject" do
-      it "must be tested"
+      it "must exist" do
+        Regress::TestFundamentalObject
+      end
+
+      it "does not have GObject::Object as an ancestor" do
+        refute_includes Regress::TestFundamentalObject.ancestors,
+          GObject::Object
+      end
+      # TODO: Test more, if possible (e.g., cannot be instantiated).
     end
 
     describe "TestFundamentalSubObject" do
-      it "must be tested"
+      before do
+        @so = Regress::TestFundamentalSubObject.new "foo"
+      end
+
+      it "can be instantiated" do
+        pass
+      end
+
+      it "is a subclass of TestFundamentalObject" do
+        assert_kind_of Regress::TestFundamentalObject, @so
+      end
+
+      it "stores the constructor parameter in the :data field" do
+        assert_equal "foo", @so.data
+      end
+
+      it "has a refcount of 1" do
+        assert_equal 1, @so.fundamental_object.refcount
+      end
     end
 
     describe "TestInterface" do
-      it "must be tested"
+      it "is a module" do
+        assert_instance_of Module, Regress::TestInterface
+      end
+
+      it "extends InterfaceBase" do
+        metaclass = class << Regress::TestInterface; self; end
+        assert_includes metaclass.ancestors, GirFFI::InterfaceBase
+      end
     end
 
     context "the Regress::TestObj class" do
@@ -167,6 +200,115 @@ class GeneratedRegressTest < MiniTest::Spec
           end
         end
 
+        describe "#get_property" do
+          it "gets the 'bare' property" do
+            obj = Regress::TestObj.new_from_file("bar")
+            @o.set_bare obj
+
+            obj2 = @o.get_property("bare")
+
+            assert_equal obj.to_ptr, obj2.to_ptr
+            assert_instance_of Regress::TestObj, obj2
+          end
+
+          it "gets the 'boxed' property" do
+            tb = Regress::TestBoxed.new_alternative_constructor1 75
+            @o.set_property "boxed", tb
+
+            tb2 = @o.get_property("boxed")
+
+            assert_instance_of Regress::TestBoxed, tb2
+            assert_equal 75, tb2.some_int8
+          end
+
+          it "gets the 'hash-table' property" do
+            ht = GLib::HashTable.new :utf8, :gint8
+            ht.insert "foo", 34
+            ht.insert "bar", 83
+
+            @o.set_property "hash-table", ht
+
+            ht2 = @o.get_property "hash-table"
+            assert_equal({"foo" => 34, "bar" => 83}, ht2.to_hash)
+          end
+
+          it "gets the 'float' property" do
+            @o.set_property "float", 3.14
+            assert_in_epsilon 3.14, @o.get_property("float")
+          end
+
+          it "gets the 'double' property" do
+            @o.set_property "double", 3.14
+            assert_in_epsilon 3.14, @o.get_property("double")
+          end
+
+          it "gets the 'int' property" do
+            @o.set_property "int", 42
+            assert_equal 42, @o.get_property("int")
+          end
+
+          it "gets the 'list' property" do
+            lst = GLib::List.new(:utf8).append("foo").append("bar")
+
+            @o.set_property "list", lst
+
+            lst2 = @o.get_property "list"
+            assert_equal ["foo", "bar"], lst2.to_a
+          end
+
+          it "gets the 'string' property" do
+            @o.set_property "string", "foobar"
+            assert_equal "foobar", @o.get_property("string")
+          end
+        end
+
+        describe "#set_property" do
+          it "sets the 'bare' property" do
+            obj = Regress::TestObj.new_from_file("bar")
+            @o.set_property "bare", obj
+            assert_equal obj.to_ptr, @o.bare.to_ptr
+          end
+
+          it "sets the 'boxed' property" do
+            tb = Regress::TestBoxed.new_alternative_constructor1 75
+            @o.set_property "boxed", tb
+            tb2 = @o.boxed
+            assert_equal 75, tb2.some_int8
+          end
+
+          it "sets the 'hash-table' property" do
+            @o.set_property("hash-table", {"foo" => 34, "bar" => 83})
+            assert_equal({"foo" => 34, "bar" => 83},
+              GLib::HashTable.wrap(:utf8, :gint32, @o.hash_table.to_ptr).to_hash)
+          end
+
+          it "sets the 'float' property" do
+            @o.set_property "float", 3.14
+            assert_in_epsilon 3.14, @o.some_float
+          end
+
+          it "sets the 'double' property" do
+            @o.set_property "double", 3.14
+            assert_in_epsilon 3.14, @o.some_double
+          end
+
+          it "sets the 'int' property" do
+            @o.set_property "int", 42
+            assert_equal 42, @o.some_int8
+          end
+
+          it "sets the 'list' property" do
+            @o.set_property "list", ["foo", "bar"]
+            assert_equal ["foo", "bar"],
+              GLib::List.wrap(:utf8, @o.list.to_ptr).to_a
+          end
+
+          it "sets the 'string' property" do
+            @o.set_property "string", "foobar"
+            assert_equal "foobar", @o.string
+          end
+        end
+
 	should "have a reference count of 1" do
 	  assert_equal 1, ref_count(@o)
 	end
@@ -184,7 +326,7 @@ class GeneratedRegressTest < MiniTest::Spec
 	  obj = Regress::TestObj.new_from_file("bar")
 	  @o.set_bare obj
 	  # TODO: What is the correct value to retrieve from the fields?
-	  assert_equal obj.to_ptr, @o[:bare]
+	  assert_equal obj.to_ptr, @o.bare.to_ptr
 	end
 
 	should "have a working #instance_method method" do
@@ -247,19 +389,19 @@ class GeneratedRegressTest < MiniTest::Spec
       context "an instance" do
 	setup do
 	  @obj = Regress::TestSimpleBoxedA.new
-	  @obj[:some_int] = 4236
-	  @obj[:some_int8] = 36
-	  @obj[:some_double] = 23.53
-	  @obj[:some_enum] = :value2
+	  @obj.some_int = 4236
+	  @obj.some_int8 = 36
+	  @obj.some_double = 23.53
+	  @obj.some_enum = :value2
 	end
 
 	context "its equals method" do
 	  setup do
 	    @ob2 = Regress::TestSimpleBoxedA.new
-	    @ob2[:some_int] = 4236
-	    @ob2[:some_int8] = 36
-	    @ob2[:some_double] = 23.53
-	    @ob2[:some_enum] = :value2
+	    @ob2.some_int = 4236
+	    @ob2.some_int8 = 36
+	    @ob2.some_double = 23.53
+	    @ob2.some_enum = :value2
 	  end
 
 	  should "return true if values are the same" do
@@ -267,12 +409,12 @@ class GeneratedRegressTest < MiniTest::Spec
 	  end
 
 	  should "return true if enum values differ" do
-	    @ob2[:some_enum] = :value3
+	    @ob2.some_enum = :value3
 	    assert_equal true, @obj.equals(@ob2)
 	  end
 
 	  should "return false if other values differ" do
-	    @ob2[:some_int] = 1
+	    @ob2.some_int = 1
 	    assert_equal false, @obj.equals(@ob2)
 	  end
 	end
@@ -287,15 +429,15 @@ class GeneratedRegressTest < MiniTest::Spec
 	  end
 
 	  should "copy fields" do
-	    assert_equal 4236, @ob2[:some_int]
-	    assert_equal 36, @ob2[:some_int8]
-	    assert_equal 23.53, @ob2[:some_double]
-	    assert_equal :value2, @ob2[:some_enum]
+	    assert_equal 4236, @ob2.some_int
+	    assert_equal 36, @ob2.some_int8
+	    assert_equal 23.53, @ob2.some_double
+	    assert_equal :value2, @ob2.some_enum
 	  end
 
 	  should "create a true copy" do
-	    @obj[:some_int8] = 89
-	    assert_equal 36, @ob2[:some_int8]
+	    @obj.some_int8 = 89
+	    assert_equal 36, @ob2.some_int8
 	  end
 	end
       end
@@ -305,17 +447,17 @@ class GeneratedRegressTest < MiniTest::Spec
       context "an instance" do
 	should "have a working clone method" do
 	  a = Regress::TestStructA.new
-	  a[:some_int] = 2556
-	  a[:some_int8] = -10
-	  a[:some_double] = 1.03455e20
-	  a[:some_enum] = :value2
+	  a.some_int = 2556
+	  a.some_int8 = -10
+	  a.some_double = 1.03455e20
+	  a.some_enum = :value2
 
 	  b = a.clone
 
-	  assert_equal 2556, b[:some_int]
-	  assert_equal(-10, b[:some_int8])
-	  assert_equal 1.03455e20, b[:some_double]
-	  assert_equal :value2, b[:some_enum]
+	  assert_equal 2556, b.some_int
+	  assert_equal(-10, b.some_int8)
+	  assert_equal 1.03455e20, b.some_double
+	  assert_equal :value2, b.some_enum
 	end
       end
     end
@@ -324,25 +466,26 @@ class GeneratedRegressTest < MiniTest::Spec
       describe "an instance" do
 	it "has a working method #clone" do
 	  a = Regress::TestStructB.new
-	  a[:some_int8] = 42
-	  a[:nested_a][:some_int] = 2556
-	  a[:nested_a][:some_int8] = -10
-	  a[:nested_a][:some_double] = 1.03455e20
-	  a[:nested_a][:some_enum] = :value2
+	  a.some_int8 = 42
+	  a.nested_a.some_int = 2556
+	  a.nested_a.some_int8 = -10
+	  a.nested_a.some_double = 1.03455e20
+	  a.nested_a.some_enum = :value2
 
 	  b = a.clone
 
-	  assert_equal 42, b[:some_int8]
-	  assert_equal 2556, b[:nested_a][:some_int]
-	  assert_equal(-10, b[:nested_a][:some_int8])
-	  assert_equal 1.03455e20, b[:nested_a][:some_double]
-	  assert_equal :value2, b[:nested_a][:some_enum]
+	  assert_equal 42, b.some_int8
+	  assert_equal 2556, b.nested_a.some_int
+	  assert_equal(-10, b.nested_a.some_int8)
+	  assert_equal 1.03455e20, b.nested_a.some_double
+	  assert_equal :value2, b.nested_a.some_enum
 	end
       end
     end
 
-    # XXX: TestStructC is not typedef'd in regress.h
-    # describe "TestStructC"
+    describe "TestStructC" do
+      it "needs to be tested"
+    end
 
     describe "TestSubObj" do
       it "is created with #new" do
@@ -366,7 +509,7 @@ class GeneratedRegressTest < MiniTest::Spec
         end
 
         it "has a field parent_instance" do
-          assert_instance_of Regress::TestObj::Struct, @tso[:parent_instance]
+          assert_instance_of Regress::TestObj, @tso.parent_instance
         end
       end
     end
@@ -386,26 +529,24 @@ class GeneratedRegressTest < MiniTest::Spec
 	  @obj = Regress::TestWi8021x.new
 	end
 
-	should "set its boolean struct member with #set_testbool" do
+	it "sets its boolean field with #set_testbool" do
 	  @obj.set_testbool true
-	  assert_equal 1, @obj[:testbool]
+	  assert_equal 1, @obj.testbool
 	  @obj.set_testbool false
-	  assert_equal 0, @obj[:testbool]
+	  assert_equal 0, @obj.testbool
 	end
 
-	should "get its boolean struct member with #get_testbool" do
-	  @obj[:testbool] = 0
+	it "gets its boolean field with #get_testbool" do
+	  @obj.set_testbool false
 	  assert_equal false, @obj.get_testbool
-	  @obj[:testbool] = 1
+	  @obj.set_testbool true
 	  assert_equal true, @obj.get_testbool
 	end
 
-	should "get its boolean struct member with #get_property" do
-	  @obj[:testbool] = 1
-	  gv = GObject::Value.new
-	  gv.init GObject.type_from_name "gboolean"
-	  @obj.get_property "testbool", gv
-	  assert_equal true, gv.get_boolean
+	it "gets its boolean field with #get_property" do
+	  @obj.set_testbool true
+	  val = @obj.get_property "testbool"
+	  assert_equal true, val
 	end
       end
     end
@@ -491,7 +632,7 @@ class GeneratedRegressTest < MiniTest::Spec
 
     should "have correct test_async_ready_callback" do
       a = 1
-      main_loop = GLib.main_loop_new nil, false
+      main_loop = GLib::MainLoop.new nil, false
 
       Regress.test_async_ready_callback Proc.new {
 	main_loop.quit
@@ -631,12 +772,29 @@ class GeneratedRegressTest < MiniTest::Spec
       assert_in_delta 5435.32, r, 0.001
     end
 
+    describe "#test_garray_container_return" do
+      before do
+        @arr = Regress.test_garray_container_return
+      end
+
+      it "returns an instance of GLib::PtrArray" do
+        @arr.must_be_instance_of GLib::PtrArray
+      end
+
+      it "returns the correct values" do
+        @arr.len.must_be :==, 1
+        ptr = @arr.pdata
+        ptr2 = ptr.read_pointer
+        ptr2.read_string.must_be :==, "regress"
+      end
+    end
+
     describe "#test_ghash_container_return" do
       before do
         @hash = Regress.test_ghash_container_return
       end
       
-      it "returns an instance of GLib::Hash" do
+      it "returns an instance of GLib::HashTable" do
         @hash.must_be_instance_of GLib::HashTable
       end
 
@@ -868,7 +1026,7 @@ class GeneratedRegressTest < MiniTest::Spec
 
     should "have correct test_simple_boxed_a_const_return" do
       result = Regress.test_simple_boxed_a_const_return
-      assert_equal [5, 6, 7.0], [result[:some_int], result[:some_int8], result[:some_double]]
+      assert_equal [5, 6, 7.0], [result.some_int, result.some_int8, result.some_double]
     end
 
     describe "the #test_simple_callback function" do

data/test/integration/pretty_print_test.rb

@@ -0,0 +1,11 @@
+require File.expand_path('../gir_ffi_test_helper.rb', File.dirname(__FILE__))
+
+describe "Pretty-printing the Regress module" do
+  before do
+    GirFFI.setup :Regress
+  end
+
+  it "runs without throwing an exception" do
+    Regress._builder.pretty_print
+  end
+end

data/test/type_builder_test.rb

@@ -2,54 +2,6 @@ require File.expand_path('gir_ffi_test_helper.rb', File.dirname(__FILE__))
 
 class TypeBuilderTest < MiniTest::Spec
   context "The Builder::Type class" do
-    should "use parent struct as default layout" do
-      @gir = GObjectIntrospection::IRepository.default
-      @gir.require 'GObject', nil
-
-      stub(info = Object.new).parent { @gir.find_by_name 'GObject', 'Object' }
-      stub(info).fields { [] }
-      stub(info).info_type { :object }
-      stub(info).safe_name { 'Bar' }
-      stub(info).namespace { 'Foo' }
-
-      @classbuilder = GirFFI::Builder::Type::Object.new info
-
-      spec = @classbuilder.send :layout_specification
-      assert_equal [:parent, GObject::Object::Struct, 0], spec
-    end
-
-    describe "for a layout with a fixed-length array" do
-      before do
-        stub(subtype = Object.new).pointer? { false }
-        stub(subtype).tag { :foo }
-
-        stub(@type = Object.new).pointer? { false }
-        stub(@type).tag { :array }
-        stub(@type).array_fixed_size { 2 }
-        stub(@type).param_type { subtype }
-
-        stub(field = Object.new).field_type { @type }
-        stub(field).name { "bar" }
-        stub(field).offset { 0 }
-
-        stub(@struct = Object.new).safe_name { 'Bar' }
-        stub(@struct).namespace { 'Foo' }
-        stub(@struct).fields { [ field ] }
-      end
-
-      it "creates the correct ffi type for the array" do
-        builder = GirFFI::Builder::Type::RegisteredType.new @struct
-        spec = builder.send :itypeinfo_to_ffitype_for_struct, @type
-        assert_equal [:foo, 2], spec
-      end
-
-      it "creates the correct layout specification" do
-        builder = GirFFI::Builder::Type::Struct.new @struct
-        spec = builder.send :layout_specification
-        assert_equal [:bar, [:foo, 2], 0], spec
-      end
-    end
-
     context "for Gtk::Widget" do
       setup do
 	@cbuilder = GirFFI::Builder::Type::Object.new get_introspection_data('Gtk', 'Widget')