gir_ffi 0.6.4 → 0.6.5

data/test/integration/generated_pango_test.rb

@@ -17,7 +17,7 @@ describe Pango do
         scripts = GLib::SizedArray.new Pango::Script, size, ptr
       end
 
-      scripts.to_a.must_equal [:han, :katakana, :hiragana]
+      scripts.must_be :==, [:han, :katakana, :hiragana]
     end
   end
 end

data/test/integration/generated_regress_test.rb

@@ -499,8 +499,8 @@ describe Regress do
 
         obj2 = instance.get_property("bare")
 
-        assert_equal obj.to_ptr, obj2.to_ptr
         assert_instance_of Regress::TestObj, obj2
+        obj2.must_equal obj
       end
 
       it "gets the 'boxed' property" do
@@ -545,7 +545,7 @@ describe Regress do
         instance.set_property "list", lst
 
         lst2 = instance.get_property "list"
-        assert_equal ["foo", "bar"], lst2.to_a
+        lst2.must_be :==, ["foo", "bar"]
       end
 
       it "gets the 'string' property" do
@@ -558,7 +558,7 @@ describe Regress do
       it "sets the 'bare' property" do
         obj = Regress::TestObj.new_from_file("bar")
         instance.set_property "bare", obj
-        assert_equal obj.to_ptr, instance.bare.to_ptr
+        instance.bare.must_equal obj
       end
 
       it "sets the 'boxed' property" do
@@ -595,8 +595,7 @@ describe Regress do
 
       it "sets the 'list' property" do
         instance.set_property "list", ["foo", "bar"]
-        assert_equal ["foo", "bar"],
-          GLib::List.wrap(:utf8, instance.list.to_ptr).to_a
+        instance.list.must_be :==, ["foo",  "bar"]
       end
 
       it "sets the 'string' property" do
@@ -667,9 +666,9 @@ describe Regress do
 
     it "has a working method #set_bare" do
       obj = Regress::TestObj.new_from_file("bar")
+      # XXX: Sometimes uses set_property, and it shouldn't?
       instance.set_bare obj
-      # TODO: What is the correct value to retrieve from the fields?
-      assert_equal obj.to_ptr, instance.bare.to_ptr
+      instance.bare.must_equal obj
     end
 
     it "has a working method #skip_inout_param" do
@@ -723,8 +722,7 @@ describe Regress do
         o = Regress::TestSubObj.new
         GObject.signal_connect(o, "test", 2) { |i, d| a = d; b = i }
         GObject.signal_emit o, "test"
-        # TODO: store o's identity somewhere so we can make o == b.
-        assert_equal [2, o.to_ptr], [a, b.to_ptr]
+        assert_equal [2, o], [a, b]
       end
     end
 
@@ -935,15 +933,45 @@ describe Regress do
   end
 
   describe "Regress::TestStructC" do
-    it "must be tested" do
-      skip
+    let(:instance) { Regress::TestStructC.new }
+    it "has a writable field another_int" do
+      instance.another_int.must_equal 0
+      instance.another_int = 42
+      instance.another_int.must_equal 42
+    end
+
+    it "has a writable field obj" do
+      o = Regress::TestSubObj.new
+      instance.obj.must_equal nil
+      instance.obj = o
+      instance.obj.must_equal o
     end
   end
+
   describe "Regress::TestStructD" do
-    it "must be tested" do
-      skip
+    let(:instance) { Regress::TestStructD.new }
+    it "has a writable field array1" do
+      instance.array1.must_be :==, []
+      struct = Regress::TestStructA.new
+      instance.array1 = [struct]
+      instance.array1.must_be :==, [struct]
+    end
+
+    it "has a writable field array2" do
+      instance.array2.must_be :==, []
+      o = Regress::TestSubObj.new
+      instance.array2 = [o]
+      instance.array2.must_be :==, [o]
+    end
+
+    it "has a writable field field" do
+      instance.field.must_equal nil
+      o = Regress::TestSubObj.new
+      instance.field = o
+      instance.field.must_equal o
     end
   end
+
   describe "Regress::TestStructE" do
     it "must be tested" do
       skip
@@ -1077,16 +1105,13 @@ describe Regress do
   end
 
   it "has a working function #test_array_fixed_out_objects" do
-    result = Regress.test_array_fixed_out_objects.to_a
+    result = Regress.test_array_fixed_out_objects
+    gtype = Regress::TestObj.get_gtype
 
-    assert_equal 2, result.length
+    result.size.must_equal 2
 
     result.each {|o|
       assert_instance_of Regress::TestObj, o
-    }
-
-    gtype = Regress::TestObj.get_gtype
-    result.each {|o|
       assert_equal gtype, GObject.type_from_instance(o)
     }
   end
@@ -1104,11 +1129,11 @@ describe Regress do
   end
 
   it "has a working function #test_array_fixed_size_int_out" do
-    assert_equal [0, 1, 2, 3, 4], Regress.test_array_fixed_size_int_out.to_a
+    Regress.test_array_fixed_size_int_out.must_be :==, [0, 1, 2, 3, 4]
   end
 
   it "has a working function #test_array_fixed_size_int_return" do
-    assert_equal [0, 1, 2, 3, 4], Regress.test_array_fixed_size_int_return.to_a
+    Regress.test_array_fixed_size_int_return.must_be :==, [0, 1, 2, 3, 4]
   end
 
   it "has a working function #test_array_gint16_in" do
@@ -1134,7 +1159,7 @@ describe Regress do
   end
 
   it "has a working function #test_array_int_full_out" do
-    assert_equal [0, 1, 2, 3, 4], Regress.test_array_int_full_out.to_a
+    Regress.test_array_int_full_out.must_be :==, [0, 1, 2, 3, 4]
   end
 
   it "has a working function #test_array_int_in" do
@@ -1142,11 +1167,11 @@ describe Regress do
   end
 
   it "has a working function #test_array_int_inout" do
-    assert_equal [3, 4], Regress.test_array_int_inout([5, 2, 3]).to_a
+    Regress.test_array_int_inout([5, 2, 3]).must_be :==, [3, 4]
   end
 
   it "has a working function #test_array_int_none_out" do
-    assert_equal [1, 2, 3, 4, 5], Regress.test_array_int_none_out.to_a
+    Regress.test_array_int_none_out.must_be :==, [1, 2, 3, 4, 5]
   end
 
   it "has a working function #test_array_int_null_in" do
@@ -1158,7 +1183,7 @@ describe Regress do
   end
 
   it "has a working function #test_array_int_out" do
-    assert_equal [0, 1, 2, 3, 4], Regress.test_array_int_out.to_a
+    Regress.test_array_int_out.must_be :==, [0, 1, 2, 3, 4]
   end
 
   it "has a working function #test_async_ready_callback" do
@@ -1323,7 +1348,7 @@ describe Regress do
   # TODO: Find a way to test encoding issues.
   it "has a working function #test_filename_return" do
     arr = Regress.test_filename_return
-    assert_equal ["åäö", "/etc/fstab"], arr.to_a
+    arr.must_be :==, ["åäö", "/etc/fstab"]
   end
 
   it "has a working function #test_float" do
@@ -1414,12 +1439,12 @@ describe Regress do
   it "has a working function #test_glist_container_return" do
     list = Regress.test_glist_container_return
     assert_instance_of GLib::List, list
-    assert_equal ["1", "2", "3"], list.to_a
+    list.must_be :==, ["1", "2", "3"]
   end
 
   it "has a working function #test_glist_everything_return" do
     list = Regress.test_glist_everything_return
-    assert_equal ["1", "2", "3"], list.to_a
+    list.must_be :==, ["1", "2", "3"]
   end
 
   it "has a working function #test_glist_nothing_in" do
@@ -1436,12 +1461,12 @@ describe Regress do
 
   it "has a working function #test_glist_nothing_return" do
     list = Regress.test_glist_nothing_return
-    assert_equal ["1", "2", "3"], list.to_a
+    list.must_be :==, ["1", "2", "3"]
   end
 
   it "has a working function #test_glist_nothing_return2" do
     list = Regress.test_glist_nothing_return2
-    assert_equal ["1", "2", "3"], list.to_a
+    list.must_be :==, ["1", "2", "3"]
   end
 
   it "has a working function #test_glist_null_in" do
@@ -1458,12 +1483,12 @@ describe Regress do
   it "has a working function #test_gslist_container_return" do
     slist = Regress.test_gslist_container_return
     assert_instance_of GLib::SList, slist
-    assert_equal ["1", "2", "3"], slist.to_a
+    slist.must_be :==, ["1", "2", "3"]
   end
 
   it "has a working function #test_gslist_everything_return" do
     slist = Regress.test_gslist_everything_return
-    assert_equal ["1", "2", "3"], slist.to_a
+    slist.must_be :==, ["1", "2", "3"]
   end
 
   it "has a working function #test_gslist_nothing_in" do
@@ -1480,12 +1505,12 @@ describe Regress do
 
   it "has a working function #test_gslist_nothing_return" do
     slist = Regress.test_gslist_nothing_return
-    assert_equal ["1", "2", "3"], slist.to_a
+    slist.must_be :==, ["1", "2", "3"]
   end
 
   it "has a working function #test_gslist_nothing_return2" do
     slist = Regress.test_gslist_nothing_return2
-    assert_equal ["1", "2", "3"], slist.to_a
+    slist.must_be :==, ["1", "2", "3"]
   end
 
   it "has a working function #test_gslist_null_in" do
@@ -1630,27 +1655,27 @@ describe Regress do
 
   it "has a working function #test_strv_in_gvalue" do
     gv = Regress.test_strv_in_gvalue
-    assert_equal ['one', 'two', 'three'], gv.get_value.to_a
+    gv.get_value.must_be :==, ['one', 'two', 'three']
   end
 
   it "has a working function #test_strv_out" do
     arr = Regress.test_strv_out
-    assert_equal ["thanks", "for", "all", "the", "fish"], arr.to_a
+    arr.must_be :==, ["thanks", "for", "all", "the", "fish"]
   end
 
   it "has a working function #test_strv_out_c" do
     arr = Regress.test_strv_out_c
-    assert_equal ["thanks", "for", "all", "the", "fish"], arr.to_a
+    arr.must_be :==, ["thanks", "for", "all", "the", "fish"]
   end
 
   it "has a working function #test_strv_out_container" do
     arr = Regress.test_strv_out_container
-    assert_equal ['1', '2', '3'], arr.to_a
+    arr.must_be :==, ['1', '2', '3']
   end
 
   it "has a working function #test_strv_outarg" do
     arr = Regress.test_strv_outarg
-    assert_equal ['1', '2', '3'], arr.to_a
+    arr.must_be :==, ['1', '2', '3']
   end
 
   it "has a working function #test_timet" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2013-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -91,22 +91,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 10.0.3
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - matijs@matijs.net
@@ -267,6 +251,7 @@ files:
 - test/gir_ffi/callback_test.rb
 - test/gir_ffi/base_argument_builder_test.rb
 - test/gir_ffi/class_base_test.rb
+- test/gir_ffi/type_map_test.rb
 - test/gir_ffi/argument_builder_test.rb
 - test/gir_ffi/return_value_builder_test.rb
 - test/gir_ffi/user_defined_type_info_test.rb
@@ -277,6 +262,7 @@ files:
 - test/gir_ffi/info_ext/i_signal_info_test.rb
 - test/gir_ffi/info_ext/safe_constant_name_test.rb
 - test/gir_ffi/info_ext/safe_function_name_test.rb
+- test/gir_ffi/info_ext/i_object_info_test.rb
 - test/gir_ffi/info_ext/i_field_info_test.rb
 - test/gir_ffi/info_ext/i_function_info_test.rb
 - test/gir_ffi/interface_base_test.rb
@@ -296,6 +282,7 @@ files:
 - test/ffi-glib/ruby_closure_test.rb
 - test/ffi-glib/variant_test.rb
 - test/ffi-glib/sized_array_test.rb
+- test/ffi-glib/strv_test.rb
 - test/ffi-gobject_introspection/i_repository_test.rb
 - test/ffi-gobject_introspection/i_constant_info_test.rb
 - test/ffi-gobject_introspection/i_base_info_test.rb
@@ -356,6 +343,7 @@ test_files:
 - test/ffi-glib/ruby_closure_test.rb
 - test/ffi-glib/s_list_test.rb
 - test/ffi-glib/sized_array_test.rb
+- test/ffi-glib/strv_test.rb
 - test/ffi-glib/variant_test.rb
 - test/ffi-gobject/gobject_test.rb
 - test/ffi-gobject/object_class_test.rb
@@ -395,6 +383,7 @@ test_files:
 - test/gir_ffi/info_ext/i_callable_info_test.rb
 - test/gir_ffi/info_ext/i_field_info_test.rb
 - test/gir_ffi/info_ext/i_function_info_test.rb
+- test/gir_ffi/info_ext/i_object_info_test.rb
 - test/gir_ffi/info_ext/i_signal_info_test.rb
 - test/gir_ffi/info_ext/i_type_info_test.rb
 - test/gir_ffi/info_ext/safe_constant_name_test.rb
@@ -402,6 +391,7 @@ test_files:
 - test/gir_ffi/interface_base_test.rb
 - test/gir_ffi/object_base_test.rb
 - test/gir_ffi/return_value_builder_test.rb
+- test/gir_ffi/type_map_test.rb
 - test/gir_ffi/unintrospectable_type_info_test.rb
 - test/gir_ffi/user_defined_property_info_test.rb
 - test/gir_ffi/user_defined_type_info_test.rb