gir_ffi 0.6.3 → 0.6.4

data/test/gir_ffi/argument_builder_test.rb

@@ -86,13 +86,27 @@ describe GirFFI::ArgumentBuilder do
         stub(type_info).flattened_tag { :object }
       end
 
+      it "has the correct value for #pre" do
+        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for :object" ]
+      end
+
+      it "has the correct value for #post" do
+        builder.post.must_equal [ "_v2 = Bar::Foo.wrap(_v1.to_value)" ]
+      end
+    end
+
+    describe "for :struct" do
+      before do
+        stub(type_info).flattened_tag { :struct }
+      end
+
       describe "when not allocated by the caller" do
         before do
           stub(argument_info).caller_allocates? { false }
         end
 
         it "has the correct value for #pre" do
-          builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for :object" ]
+          builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for :struct" ]
         end
 
         it "has the correct value for #post" do
@@ -106,7 +120,7 @@ describe GirFFI::ArgumentBuilder do
         end
 
         it "has the correct value for #pre" do
-          builder.pre.must_equal [ "_v1 = Bar::Foo._allocate" ]
+          builder.pre.must_equal [ "_v1 = Bar::Foo.new" ]
         end
 
         it "has the correct value for #post" do
@@ -115,32 +129,45 @@ describe GirFFI::ArgumentBuilder do
       end
     end
 
-    describe "for :struct" do
+    describe "for :strv" do
       before do
-        stub(type_info).flattened_tag { :struct }
+        stub(type_info).flattened_tag { :strv }
       end
 
-      describe "when not allocated by the caller" do
+      it "has the correct value for #pre" do
+        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for :strv" ]
+      end
+
+      it "has the correct value for #post" do
+        builder.post.must_equal [ "_v2 = GLib::Strv.wrap(_v1.to_value)" ]
+      end
+    end
+
+    describe "for :array" do
+      before do
+        stub(type_info).flattened_tag { :array }
+        stub(type_info).element_type { :foo }
+      end
+
+      context "when allocated by the callee" do
         before do
           stub(argument_info).caller_allocates? { false }
         end
-
         it "has the correct value for #pre" do
-          builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for :struct" ]
+          builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for :array" ]
         end
 
         it "has the correct value for #post" do
-          builder.post.must_equal [ "_v2 = Bar::Foo.wrap(_v1.to_value)" ]
+          builder.post.must_equal [ "_v2 = GLib::Array.wrap(:foo, _v1.to_value)" ]
         end
       end
 
-      describe "when allocated by the caller" do
+      context "when allocated by the caller" do
         before do
           stub(argument_info).caller_allocates? { true }
         end
-
         it "has the correct value for #pre" do
-          builder.pre.must_equal [ "_v1 = Bar::Foo._allocate" ]
+          builder.pre.must_equal [ "_v1 = GLib::Array.new :foo" ]
         end
 
         it "has the correct value for #post" do
@@ -149,32 +176,32 @@ describe GirFFI::ArgumentBuilder do
       end
     end
 
-    describe "for :strv" do
+    describe "for :ptr_array" do
       before do
-        stub(type_info).flattened_tag { :strv }
+        stub(type_info).flattened_tag { :ptr_array }
+        stub(type_info).element_type { :foo }
       end
 
       it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for :strv" ]
+        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for :ptr_array" ]
       end
 
       it "has the correct value for #post" do
-        builder.post.must_equal [ "_v2 = GLib::Strv.wrap(_v1.to_value)" ]
+        builder.post.must_equal [ "_v2 = GLib::PtrArray.wrap(:foo, _v1.to_value)" ]
       end
     end
 
-    describe "for :array" do
+    describe "for :error" do
       before do
-        stub(type_info).flattened_tag { :array }
-        stub(type_info).element_type { :foo }
+        stub(type_info).flattened_tag { :error }
       end
 
       it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for :array" ]
+        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.for :error" ]
       end
 
       it "has the correct value for #post" do
-        builder.post.must_equal [ "_v2 = GLib::Array.wrap(:foo, _v1.to_value)" ]
+        builder.post.must_equal [ "_v2 = GLib::Error.wrap(_v1.to_value)" ]
       end
     end
 
@@ -331,7 +358,7 @@ describe GirFFI::ArgumentBuilder do
       end
 
       it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.from :pointer, GLib::Strv.from(foo)" ]
+        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.from :strv, GLib::Strv.from(foo)" ]
       end
 
       it "has the correct value for #post" do
@@ -339,13 +366,28 @@ describe GirFFI::ArgumentBuilder do
       end
     end
 
+    describe "for :ptr_array" do
+      before do
+        stub(type_info).flattened_tag { :ptr_array }
+        stub(type_info).element_type { :foo }
+      end
+
+      it "has the correct value for #pre" do
+        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.from :ptr_array, GLib::PtrArray.from(:foo, foo)" ]
+      end
+
+      it "has the correct value for #post" do
+        builder.post.must_equal [ "_v2 = GLib::PtrArray.wrap(:foo, _v1.to_value)" ]
+      end
+    end
+
     describe "for :utf8" do
       before do
         stub(type_info).flattened_tag { :utf8 }
       end
 
       it "has the correct value for #pre" do
-        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.from :pointer, GirFFI::InPointer.from(:utf8, foo)" ]
+        builder.pre.must_equal [ "_v1 = GirFFI::InOutPointer.from :utf8, GirFFI::InPointer.from(:utf8, foo)" ]
       end
 
       it "has the correct value for #post" do
@@ -367,7 +409,7 @@ describe GirFFI::ArgumentBuilder do
         it "has the correct value for #pre" do
           builder.pre.must_equal [
             "GirFFI::ArgHelper.check_fixed_array_size 3, foo, \"foo\"",
-            "_v1 = GirFFI::InOutPointer.from :pointer, GLib::SizedArray.from(:bar, 3, foo)"
+            "_v1 = GirFFI::InOutPointer.from :c, GLib::SizedArray.from(:bar, 3, foo)"
           ]
         end
 
@@ -387,7 +429,7 @@ describe GirFFI::ArgumentBuilder do
         it "has the correct value for #pre" do
           # TODO: Perhaps this should include a length check as well.
           builder.pre.must_equal [
-            "_v1 = GirFFI::InOutPointer.from :pointer, GLib::SizedArray.from(:bar, -1, foo)"
+            "_v1 = GirFFI::InOutPointer.from :c, GLib::SizedArray.from(:bar, -1, foo)"
           ]
         end
 

data/test/gir_ffi/builder_test.rb

@@ -77,7 +77,7 @@ describe GirFFI::Builder do
     end
 
     should "set up struct members with the correct types" do
-      tags = [:int, :int8, :double, Regress::TestEnum]
+      tags = [:int, :int8, :double, Regress::TestEnum::Enum]
       assert_equal tags.map {|t| FFI.find_type t},
         Regress::TestStructA::Struct.layout.fields.map {|f| f.type}
     end

data/test/gir_ffi/function_builder_test.rb

@@ -83,7 +83,6 @@ describe GirFFI::FunctionBuilder do
       def self.gvalue_in value
         _v1 = ::GObject::Value.from(value)
         DummyLib.gi_marshalling_tests_gvalue_in _v1
-        
       end
     CODE
 
@@ -101,7 +100,6 @@ describe GirFFI::FunctionBuilder do
         len = arr.nil? ? 0 : arr.length
         _v2 = len
         DummyLib.regress_test_array_int_null_in _v1, _v2
-        
       end
     CODE
 
@@ -134,7 +132,7 @@ describe GirFFI::FunctionBuilder do
 
     expected = <<-CODE
       def method_array_inout ints
-        _v1 = GirFFI::InOutPointer.from :pointer, GLib::SizedArray.from(:gint32, -1, ints)
+        _v1 = GirFFI::InOutPointer.from :c, GLib::SizedArray.from(:gint32, -1, ints)
         length = ints.nil? ? 0 : ints.length
         _v2 = GirFFI::InOutPointer.from :gint32, length
         DummyLib.gi_marshalling_tests_object_method_array_inout self, _v1, _v2

data/test/gir_ffi/in_out_pointer_test.rb

@@ -22,8 +22,9 @@ describe GirFFI::InOutPointer do
       GirFFI::InOutPointer.from :gboolean, false
     end
 
-    it "handles :utf8" do
-      GirFFI::InOutPointer.from :utf8, "Hello"
+    it "handles :utf8 pointers" do
+      str_ptr = GirFFI::InPointer.from :utf8, "Hello"
+      GirFFI::InOutPointer.from :utf8, str_ptr
     end
   end
 
@@ -71,7 +72,8 @@ describe GirFFI::InOutPointer do
 
     describe "for :utf8 values" do
       it "returns a pointer to the held value" do
-        ptr = GirFFI::InOutPointer.from :utf8, "Some value"
+        str_ptr = GirFFI::InPointer.from :utf8, "Some value"
+        ptr = GirFFI::InOutPointer.from :utf8, str_ptr
         assert_equal "Some value", ptr.to_value.read_string
       end
     end

data/test/gir_ffi/in_pointer_test.rb

@@ -14,10 +14,21 @@ describe GirFFI::InPointer do
     end
 
     it "handles enum types" do
-      e = FFI::Enum.new [:foo, :bar, :baz]
+      e = Module.new do
+        self::Enum = FFI::Enum.new [:foo, :bar, :baz]
+      end
       ptr = GirFFI::InPointer.from_array e, [:bar, :foo, :baz]
       ptr.read_array_of_int32(3).must_equal [1, 0, 2]
     end
+
+    it "handles typed pointers" do
+      p1 = GirFFI::InPointer.from :gint32, 42
+      p2 = GirFFI::InPointer.from :gint32, 24
+
+      ptr = GirFFI::InPointer.from_array [:pointer, :uint32], [p1, p2]
+
+      ptr.read_array_of_pointer(2).must_equal [p1, p2]
+    end
   end
 
   describe "an instance created with .from_array :gint32" do
@@ -75,6 +86,20 @@ describe GirFFI::InPointer do
     end
   end
 
+  describe "an instance created with .from :guint32" do
+    before do
+      @result = GirFFI::InPointer.from :guint32, 12345
+    end
+
+    it "returns a pointer with an address equal to the given value" do
+      assert_equal 12345, @result.address
+    end
+
+    it "is an instance of GirFFI::InPointer" do
+      assert_instance_of GirFFI::InPointer, @result
+    end
+  end
+
   describe "an instance created with .from :filename" do
     before do
       @result = GirFFI::InPointer.from :filename, "foo"
@@ -97,7 +122,12 @@ describe GirFFI::InPointer do
     end
 
     it "handles enum types" do
-      e = FFI::Enum.new [:foo, :bar, :baz]
+      e = Module.new do
+        self::Enum = FFI::Enum.new [:foo, :bar, :baz]
+        def self.[](val)
+          self::Enum[val]
+        end
+      end
       ptr = GirFFI::InPointer.from e, :bar
       ptr.address.must_equal 1
     end

data/test/gir_ffi/info_ext/i_arg_info_test.rb

@@ -1,10 +1,10 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::InfoExt::IArgInfo do
-  let(:testclass) { Class.new do
+  let(:klass) { Class.new do
     include GirFFI::InfoExt::IArgInfo
   end }
-  let(:arg_info) { testclass.new }
+  let(:arg_info) { klass.new }
 
   describe "#cast_signal_argument" do
     describe "with info for an enum" do

data/test/gir_ffi/info_ext/i_callable_info_test.rb

@@ -1,10 +1,10 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::InfoExt::ICallableInfo do
-  let(:testclass) { Class.new do
+  let(:klass) { Class.new do
     include GirFFI::InfoExt::ICallableInfo
   end }
-  let(:callable_info) { testclass.new }
+  let(:callable_info) { klass.new }
 
   describe "#argument_ffi_types" do
     describe "for a simple callable with several arguments" do

data/test/gir_ffi/info_ext/i_field_info_test.rb

@@ -1,37 +1,31 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::InfoExt::IFieldInfo do
+  let(:klass) { Class.new do
+    include GirFFI::InfoExt::IFieldInfo
+  end }
+  let(:field_info) { klass.new }
   describe "#layout_specification" do
     it "returns an array of name, typespec and offset" do
-      testclass = Class.new do
-        include GirFFI::InfoExt::IFieldInfo
-      end
+      mock(type = Object.new).to_ffitype { :bar }
 
-      mock(type = Object.new).layout_specification_type { :bar }
+      mock(field_info).name { "foo" }
+      mock(field_info).field_type { type }
+      mock(field_info).offset { 0 }
 
-      field = testclass.new
-      mock(field).name { "foo" }
-      mock(field).field_type { type }
-      mock(field).offset { 0 }
-
-      result = field.layout_specification
+      result = field_info.layout_specification
 
       assert_equal [:foo, :bar, 0], result
     end
 
     it "keeps a complex typespec intact" do
-      testclass = Class.new do
-        include GirFFI::InfoExt::IFieldInfo
-      end
-
-      mock(type = Object.new).layout_specification_type { [:bar, 2] }
+      mock(type = Object.new).to_ffitype { [:bar, 2] }
 
-      field = testclass.new
-      mock(field).name { "foo" }
-      mock(field).field_type { type }
-      mock(field).offset { 0 }
+      mock(field_info).name { "foo" }
+      mock(field_info).field_type { type }
+      mock(field_info).offset { 0 }
 
-      result = field.layout_specification
+      result = field_info.layout_specification
 
       assert_equal [:foo, [:bar, 2], 0], result
     end

data/test/gir_ffi/info_ext/i_function_info_test.rb

@@ -1,11 +1,11 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::InfoExt::IFunctionInfo do
-  let(:testclass) { Class.new do
+  let(:klass) { Class.new do
     include GirFFI::InfoExt::ICallableInfo
     include GirFFI::InfoExt::IFunctionInfo
   end }
-  let(:function_info) { testclass.new }
+  let(:function_info) { klass.new }
 
   describe "#argument_ffi_types" do
     before do

data/test/gir_ffi/info_ext/i_signal_info_test.rb

@@ -1,10 +1,10 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::InfoExt::ISignalInfo do
-  let(:testclass) { Class.new do
+  let(:klass) { Class.new do
     include GirFFI::InfoExt::ISignalInfo
   end }
-  let(:signal_info) { testclass.new }
+  let(:signal_info) { klass.new }
 
   describe "#cast_back_signal_arguments" do
     # TODO: Move to integration tests

data/test/gir_ffi/info_ext/i_type_info_test.rb

@@ -1,24 +1,24 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::InfoExt::ITypeInfo do
-  let(:testclass) { Class.new do
+  let(:klass) { Class.new do
     include GirFFI::InfoExt::ITypeInfo
   end }
-  let(:type_info) { testclass.new }
-  let(:elmtype_info) { testclass.new }
-  let(:keytype_info) { testclass.new }
-  let(:valtype_info) { testclass.new }
+  let(:type_info) { klass.new }
+  let(:elmtype_info) { klass.new }
+  let(:keytype_info) { klass.new }
+  let(:valtype_info) { klass.new }
 
-  describe "#layout_specification_type" do
+  describe "#to_ffitype" do
     it "returns an array with elements subtype and size for type :array" do
       mock(type_info).pointer? { false }
       stub(type_info).tag { :array }
       mock(type_info).array_fixed_size { 2 }
 
-      mock(elmtype_info).layout_specification_type { :foo }
+      mock(elmtype_info).to_ffitype { :foo }
       mock(type_info).param_type(0) { elmtype_info }
 
-      result = type_info.layout_specification_type
+      result = type_info.to_ffitype
       assert_equal [:foo, 2], result
     end
   end

data/test/gir_ffi/info_ext/safe_constant_name_test.rb

@@ -1,10 +1,10 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::InfoExt::SafeConstantName do
-  let(:testclass) { Class.new do
+  let(:klass) { Class.new do
     include GirFFI::InfoExt::SafeConstantName
   end }
-  let(:info) { testclass.new }
+  let(:info) { klass.new }
 
   describe "#safe_name" do
     it "makes names starting with an underscore safe" do

data/test/gir_ffi/info_ext/safe_function_name_test.rb

@@ -1,10 +1,10 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::InfoExt::SafeFunctionName do
-  let(:testclass) { Class.new do
+  let(:klass) { Class.new do
     include GirFFI::InfoExt::SafeFunctionName
   end }
-  let(:info) { testclass.new }
+  let(:info) { klass.new }
 
   describe "#safe_name" do
     it "keeps lower case names lower case" do

data/test/gir_ffi/return_value_builder_test.rb

@@ -179,11 +179,12 @@ describe GirFFI::ReturnValueBuilder do
   describe "for :ptr_array" do
     before do
       stub(type_info).flattened_tag { :ptr_array }
+      stub(type_info).element_type { :foo }
     end
 
     it "wraps the result in #post" do
       builder.callarg.must_equal "_v1"
-      builder.post.must_equal [ "_v2 = GLib::PtrArray.wrap(_v1)" ]
+      builder.post.must_equal [ "_v2 = GLib::PtrArray.wrap(:foo, _v1)" ]
     end
 
     it "returns the wrapped result" do
@@ -260,6 +261,22 @@ describe GirFFI::ReturnValueBuilder do
     end
   end
 
+  describe "for :error" do
+    before do
+      stub(type_info).flattened_tag { :error }
+    end
+
+    it "wraps the result in #post" do
+      builder.callarg.must_equal "_v1"
+      builder.post.must_equal [ "_v2 = GLib::Error.wrap(_v1)" ]
+    end
+
+    it "returns the wrapped result" do
+      builder.callarg.must_equal "_v1"
+      builder.retval.must_equal "_v2"
+    end
+  end
+
   describe "for :c" do
     describe "with fixed size" do
       before do

data/test/gir_ffi/zero_terminated_test.rb

@@ -39,6 +39,16 @@ describe GirFFI::ZeroTerminated do
         flunk
       end
     end
+
+    it "works for :int8" do
+      zt = GirFFI::ZeroTerminated.from :int8, [1, 2, 3]
+      arr = []
+      zt.each do |int|
+        arr << int
+      end
+      arr.must_equal [1, 2, 3]
+    end
+
   end
 
   it "includes Enumerable" do

data/test/gir_ffi_test_helper.rb

@@ -2,25 +2,6 @@ require 'introspection_test_helper'
 
 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
-
 # Need a dummy module for some tests.
 module DummyLib
 end