gir_ffi 0.6.4 → 0.6.5

data/tasks/test.rake

@@ -84,6 +84,7 @@ namespace :test do
     sh %{cd test/lib && make}
   end
 
+  task :introspection => :lib
   task :main => :lib
   task :overrides => :lib
   task :integration => :lib

data/test/ffi-glib/array_test.rb

@@ -42,12 +42,18 @@ describe GLib::Array do
       assert_equal arr.to_a, arr2.to_a
     end
 
-    it "raises an error if the element sizes don't match" do
+    it "warns the element sizes don't match" do
       arr = GLib::Array.new :gint32
       arr.append_vals [1, 2, 3]
-      assert_raises RuntimeError do
-        GLib::Array.wrap :gint8, arr.to_ptr
-      end
+      proc { GLib::Array.wrap :gint8, arr.to_ptr }.must_output nil, /sizes do not match/
+    end
+
+    it "handles a struct as the element type" do
+      vals = [1, 2, 3].map {|i| GObject::EnumValue.new.tap {|ev| ev.value = i} }
+      arr = GLib::Array.new GObject::EnumValue
+      arr.append_vals vals
+      arr2 = GLib::Array.wrap GObject::EnumValue, arr.to_ptr
+      arr2.to_a.must_equal arr.to_a
     end
   end
 
@@ -71,7 +77,7 @@ describe GLib::Array do
       arr = GLib::Array.new :gint32
       arr.append_vals [3, 2, 1]
       arr2 = GLib::Array.from :foo, arr
-      assert_equal arr, arr2
+      assert arr2.equal? arr
     end
 
     it "wraps its argument if given a pointer" do
@@ -81,8 +87,36 @@ describe GLib::Array do
       assert_instance_of FFI::Pointer, pointer
       arr2 = GLib::Array.from :gint32, pointer
       assert_instance_of GLib::Array, arr2
-      refute_equal arr, arr2
-      assert_equal arr.to_a, arr2.to_a
+      refute arr2.equal? arr
+      arr2.to_a.must_equal arr.to_a
+    end
+  end
+
+  describe "#==" do
+    it "returns true when comparing to an array with the same elements" do
+      arr = GLib::Array.from :gint32, [1, 2, 3]
+
+      arr.must_be :==, [1, 2, 3]
+    end
+
+    it "returns false when comparing to an array with different elements" do
+      arr = GLib::Array.from :gint32, [1, 2, 3]
+
+      arr.wont_be :==, [1, 2]
+    end
+
+    it "returns true when comparing to a GArray with the same elements" do
+      arr = GLib::Array.from :gint32, [1, 2, 3]
+      other = GLib::Array.from :gint32, [1, 2, 3]
+
+      arr.must_be :==, other
+    end
+
+    it "returns false when comparing to a GArray with different elements" do
+      arr = GLib::Array.from :gint32, [1, 2, 3]
+      other = GLib::Array.from :gint32, [1, 2]
+
+      arr.wont_be :==, other
     end
   end
 end

data/test/ffi-glib/hash_table_test.rb

@@ -17,7 +17,7 @@ describe GLib::HashTable do
     it "return its argument if given a GHashTable" do
       hsh = GLib::HashTable.from [:utf8, :gint32], {"foo" => 23, "bar" => 32}
       hsh2 = GLib::HashTable.from [:utf8, :gint32], hsh
-      assert_equal hsh, hsh2
+      assert hsh2.equal? hsh
     end
 
     it "wraps its argument if given a pointer" do
@@ -26,8 +26,8 @@ describe GLib::HashTable do
       assert_instance_of FFI::Pointer, pointer
       hsh2 = GLib::HashTable.from [:utf8, :gint32], pointer
       assert_instance_of GLib::HashTable, hsh2
-      refute_equal hsh, hsh2
-      assert_equal hsh.to_hash, hsh2.to_hash
+      refute hsh2.equal? hsh
+      hsh2.to_hash.must_equal hsh.to_hash
     end
   end
 

data/test/ffi-glib/list_test.rb

@@ -40,7 +40,7 @@ describe GLib::List do
     it "return its argument if given a GList" do
       lst = GLib::List.from :gint32, [3, 2, 1]
       lst2 = GLib::List.from :gint32, lst
-      assert_equal lst, lst2
+      assert lst2.equal? lst
     end
 
     it "wraps its argument if given a pointer" do
@@ -49,8 +49,36 @@ describe GLib::List do
       assert_instance_of FFI::Pointer, pointer
       lst2 = GLib::List.from :gint32, pointer
       assert_instance_of GLib::List, lst2
-      refute_equal lst, lst2
-      assert_equal lst.to_a, lst2.to_a
+      refute lst2.equal? lst
+      lst2.to_a.must_equal lst.to_a
+    end
+  end
+
+  describe "#==" do
+    it "returns true when comparing to an array with the same elements" do
+      list = GLib::List.from :gint32, [1, 2, 3]
+
+      list.must_be :==, [1, 2, 3]
+    end
+
+    it "returns false when comparing to an array with different elements" do
+      list = GLib::List.from :gint32, [1, 2, 3]
+
+      list.wont_be :==, [1, 2]
+    end
+
+    it "returns true when comparing to a list with the same elements" do
+      list = GLib::List.from :gint32, [1, 2, 3]
+      other = GLib::List.from :gint32, [1, 2, 3]
+
+      list.must_be :==, other
+    end
+
+    it "returns false when comparing to a list with different elements" do
+      list = GLib::List.from :gint32, [1, 2, 3]
+      other = GLib::List.from :gint32, [1, 2]
+
+      list.wont_be :==, other
     end
   end
 end

data/test/ffi-glib/ptr_array_test.rb

@@ -66,4 +66,32 @@ describe GLib::PtrArray do
     arr.add "test1"
     assert_equal ["test1"], arr.to_a
   end
+
+  describe "#==" do
+    it "returns true when comparing to an array with the same elements" do
+      arr = GLib::PtrArray.from :utf8, ["1", "2", "3"]
+
+      arr.must_be :==, ["1", "2", "3"]
+    end
+
+    it "returns false when comparing to an array with different elements" do
+      arr = GLib::PtrArray.from :utf8, ["1", "2", "3"]
+
+      arr.wont_be :==, ["1", "2"]
+    end
+
+    it "returns true when comparing to a GPtrArray with the same elements" do
+      arr = GLib::PtrArray.from :utf8, ["1", "2", "3"]
+      other = GLib::PtrArray.from :utf8, ["1", "2", "3"]
+
+      arr.must_be :==, other
+    end
+
+    it "returns false when comparing to a GPtrArray with different elements" do
+      arr = GLib::PtrArray.from :utf8, ["1", "2", "3"]
+      other = GLib::PtrArray.from :utf8, ["1", "2"]
+
+      arr.wont_be :==, other
+    end
+  end
 end

data/test/ffi-glib/s_list_test.rb

@@ -43,4 +43,32 @@ describe GLib::SList do
       assert_equal lst, lst2
     end
   end
+
+  describe "#==" do
+    it "returns true when comparing to an array with the same elements" do
+      list = GLib::SList.from :gint32, [1, 2, 3]
+
+      list.must_be :==, [1, 2, 3]
+    end
+
+    it "returns false when comparing to an array with different elements" do
+      list = GLib::SList.from :gint32, [1, 2, 3]
+
+      list.wont_be :==, [1, 2]
+    end
+
+    it "returns true when comparing to a list with the same elements" do
+      list = GLib::SList.from :gint32, [1, 2, 3]
+      other = GLib::SList.from :gint32, [1, 2, 3]
+
+      list.must_be :==, other
+    end
+
+    it "returns false when comparing to a list with different elements" do
+      list = GLib::SList.from :gint32, [1, 2, 3]
+      other = GLib::SList.from :gint32, [1, 2]
+
+      list.wont_be :==, other
+    end
+  end
 end

data/test/ffi-glib/sized_array_test.rb

@@ -75,8 +75,36 @@ describe GLib::SizedArray do
       arr = GLib::SizedArray.from :gint32, 3, [3, 2, 1]
       arr2 = GLib::SizedArray.from :gint32, 3, arr.to_ptr
       assert_instance_of GLib::SizedArray, arr2
-      refute_equal arr, arr2
-      assert_equal arr.to_a, arr2.to_a
+      refute arr2.equal? arr
+      arr2.to_ptr.must_equal arr.to_ptr
+    end
+  end
+
+  describe "#==" do
+    it "returns true when comparing to an array with the same elements" do
+      sized = GLib::SizedArray.from :int32, 3, [1, 2, 3]
+
+      sized.must_be :==, [1, 2, 3]
+    end
+
+    it "returns false when comparing to an array with different elements" do
+      sized = GLib::SizedArray.from :int32, 3, [1, 2, 3]
+
+      sized.wont_be :==, [1, 2]
+    end
+
+    it "returns true when comparing to a sized array with the same elements" do
+      sized = GLib::SizedArray.from :int32, 3, [1, 2, 3]
+      other = GLib::SizedArray.from :int32, 3, [1, 2, 3]
+
+      sized.must_be :==, other
+    end
+
+    it "returns false when comparing to a sized array with different elements" do
+      sized = GLib::SizedArray.from :int32, 3, [1, 2, 3]
+      other = GLib::SizedArray.from :int32, 2, [1, 2]
+
+      sized.wont_be :==, other
     end
   end
 
@@ -84,4 +112,3 @@ describe GLib::SizedArray do
     GLib::SizedArray.must_include Enumerable
   end
 end
-

data/test/ffi-glib/strv_test.rb

@@ -0,0 +1,31 @@
+require 'base_test_helper'
+
+describe GLib::Strv do
+  describe "#==" do
+    it "returns true when comparing to an array with the same elements" do
+      strv = GLib::Strv.from ["1", "2", "3"]
+
+      strv.must_be :==, ["1", "2", "3"]
+    end
+
+    it "returns false when comparing to an array with different elements" do
+      strv = GLib::Strv.from ["1", "2", "3"]
+
+      strv.wont_be :==, ["1", "2"]
+    end
+
+    it "returns true when comparing to a strv with the same elements" do
+      strv = GLib::Strv.from ["1", "2", "3"]
+      other = GLib::Strv.from ["1", "2", "3"]
+
+      strv.must_be :==, other
+    end
+
+    it "returns false when comparing to a strv with different elements" do
+      strv = GLib::Strv.from ["1", "2", "3"]
+      other = GLib::Strv.from ["1", "2"]
+
+      strv.wont_be :==, other
+    end
+  end
+end

data/test/ffi-gobject_test.rb

@@ -22,7 +22,7 @@ describe GObject do
       callback = FFI::Function.new(:bool, argtypes) { |a,b,c,d| true }
       ::GObject::Lib.g_signal_connect_data s, "incoming", callback, nil, nil, 0
       rv = GObject.signal_emit s, "incoming"
-      assert_equal true, rv.get_boolean
+      assert_equal true, rv.get_value
     end
 
     should "pass in extra arguments" do
@@ -94,7 +94,7 @@ describe GObject do
       s = Gio::SocketService.new
       GObject.signal_connect(s, "incoming") { true }
       rv = GObject.signal_emit s, "incoming"
-      assert_equal true, rv.get_boolean
+      assert_equal true, rv.get_value
     end
 
     should "require a block" do

data/test/gir_ffi/arg_helper_test.rb

@@ -52,7 +52,9 @@ describe GirFFI::ArgHelper do
     end
 
     describe "for pointers to arrays of enums" do
-      let(:enum) { FFI::Enum.new([:foo, 1, :bar, 2]) }
+      let(:enum) { Module.new {
+        extend GirFFI::EnumBase
+        self::Enum = FFI::Enum.new([:foo, 1, :bar, 2]) } }
       it "returns an empty array when passed a null pointer" do
         result = GirFFI::ArgHelper.ptr_to_typed_array enum, FFI::Pointer.new(0), 0
         result.must_equal []
@@ -69,7 +71,6 @@ describe GirFFI::ArgHelper do
         result = GirFFI::ArgHelper.ptr_to_typed_array enum, block, 2
         result.must_equal [:foo, :bar]
       end
-
     end
 
     describe "for pointers to arrays of base types" do

data/test/gir_ffi/class_base_test.rb

@@ -2,14 +2,72 @@ require 'gir_ffi_test_helper'
 
 describe GirFFI::ClassBase do
   describe "a simple descendant" do
-    before do
-      @klass = Class.new GirFFI::ClassBase
-    end
+    let(:klass) {
+      Class.new(GirFFI::ClassBase) do
+        self::Struct = Class.new(FFI::Struct) do
+          layout :foo, :int32
+        end
+      end
+    }
+    let(:object) { klass.wrap FFI::MemoryPointer.new(:int32) }
 
     it "has #from as a pass-through method" do
-      result = @klass.from :foo
+      result = klass.from :foo
       result.must_equal :foo
     end
+
+    describe "#==" do
+      it "returns true when comparing to an object of the same class and pointer" do
+        other = klass.wrap object.to_ptr
+
+        object.must_be :==, other
+      end
+
+      it "returns false when comparing to an object of the same class and different pointer" do
+        other = klass.wrap FFI::MemoryPointer.new(:int32)
+
+        object.wont_be :==, other
+      end
+
+      it "returns false when comparing to an object of a different class" do
+        other = Object.new
+
+        object.wont_be :==, other
+      end
+
+      it "returns true when comparing to an object of a subclass and the same pointer" do
+        subclass = Class.new(klass)
+        other = subclass.wrap object.to_ptr
+
+        object.must_be :==, other
+      end
+    end
+
+    describe "#eql?" do
+      it "returns true when comparing to an object of the same class and pointer" do
+        other = klass.wrap object.to_ptr
+
+        object.must_equal other
+      end
+
+      it "returns false when comparing to an object of the same class and different pointer" do
+        other = klass.wrap FFI::MemoryPointer.new(:int32)
+
+        object.wont_equal other
+      end
+
+      it "returns true when comparing to an object of a different class and same pointer" do
+        stub(other = Object.new).to_ptr { object.to_ptr }
+
+        object.wont_equal other
+      end
+
+      it "returns false when comparing to an object of a different class and different pointer" do
+        stub(other = Object.new).to_ptr { FFI::MemoryPointer.new(:int32) }
+
+        object.wont_equal other
+      end
+    end
   end
 
   describe "a descendant with multiple builders" do

data/test/gir_ffi/function_builder_test.rb

@@ -11,7 +11,7 @@ describe GirFFI::FunctionBuilder do
       def self.test_array_fixed_out_objects 
         _v1 = GirFFI::InOutPointer.for :c
         DummyLib.regress_test_array_fixed_out_objects _v1
-        _v2 = GLib::SizedArray.wrap([:pointer, ::Regress::TestObj], 2, _v1.to_value)
+        _v2 = GLib::SizedArray.wrap([:pointer, Regress::TestObj], 2, _v1.to_value)
         return _v2
       end
     CODE

data/test/gir_ffi/in_pointer_test.rb

@@ -15,12 +15,29 @@ describe GirFFI::InPointer do
 
     it "handles enum types" do
       e = Module.new do
+        extend GirFFI::EnumBase
         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 struct types" do
+      e = Class.new do
+        self::Struct = Class.new(FFI::Struct) do
+          layout :foo, :int32, :bar, :int32
+        end
+      end
+      struct = e::Struct.allocate
+      struct[:foo] = 42
+      struct[:bar] = 24
+      ptr = GirFFI::InPointer.from_array e, [struct]
+      ptr.wont_equal struct.to_ptr
+      new_struct = e::Struct.new ptr
+      new_struct[:foo].must_equal 42
+      new_struct[:bar].must_equal 24
+    end
+
     it "handles typed pointers" do
       p1 = GirFFI::InPointer.from :gint32, 42
       p2 = GirFFI::InPointer.from :gint32, 24

data/test/gir_ffi/info_ext/i_object_info_test.rb

@@ -0,0 +1,14 @@
+require 'gir_ffi_test_helper'
+
+describe GirFFI::InfoExt::IObjectInfo do
+  let(:klass) { Class.new do
+    include GirFFI::InfoExt::IObjectInfo
+  end }
+  let(:object_info) { klass.new }
+
+  describe "#to_ffitype" do
+    it "returns :pointer" do
+      object_info.to_ffitype.must_equal :pointer
+    end
+  end
+end