gir_ffi 0.14.0 → 0.15.3

data/test/gir_ffi/builders/unintrospectable_builder_test.rb

@@ -1,60 +1,60 @@
 # frozen_string_literal: true
 
-require 'gir_ffi_test_helper'
+require "gir_ffi_test_helper"
 
 GirFFI.setup :Gio
 GirFFI.setup :Gst
 
 describe GirFFI::Builders::UnintrospectableBuilder do
-  describe 'building the GLocalFile type' do
+  describe "building the GLocalFile type" do
     before do
-      Gio.file_new_for_path '/'
+      Gio.file_new_for_path "/"
 
-      @gtype = GObject.type_from_name 'GLocalFile'
+      @gtype = GObject.type_from_name "GLocalFile"
       @info = GirFFI::UnintrospectableTypeInfo.new(@gtype)
       @bldr = GirFFI::Builders::UnintrospectableBuilder.new(@info)
       @klass = @bldr.build_class
     end
 
-    it 'builds a class' do
+    it "builds a class" do
       assert_instance_of Class, @klass
     end
 
-    it 'builds a class derived from GObject::Object' do
+    it "builds a class derived from GObject::Object" do
       assert_includes @klass.registered_ancestors, GObject::Object
     end
 
-    it 'builds a class derived from Gio::File' do
+    it "builds a class derived from Gio::File" do
       assert_includes @klass.registered_ancestors, Gio::File
     end
 
-    it 'returns the same class when built again' do
+    it "returns the same class when built again" do
       other_bldr = GirFFI::Builders::UnintrospectableBuilder.new(@info)
       other_klass = other_bldr.build_class
 
       assert_equal @klass, other_klass
     end
 
-    describe 'its #find_signal method' do
+    describe "its #find_signal method" do
       it "returns nil for a signal that doesn't exist" do
-        @bldr.find_signal('foo').must_be_nil
+        _(@bldr.find_signal("foo")).must_be_nil
       end
 
-      it 'finds signals in ancestor classes' do
-        signal = @bldr.find_signal 'notify'
-        signal.name.must_equal 'notify'
+      it "finds signals in ancestor classes" do
+        signal = @bldr.find_signal "notify"
+        _(signal.name).must_equal "notify"
       end
     end
 
-    describe '#object_class_struct' do
-      it 'returns the parent class struct' do
-        @bldr.object_class_struct.must_equal GObject::ObjectClass
+    describe "#object_class_struct" do
+      it "returns the parent class struct" do
+        _(@bldr.object_class_struct).must_equal GObject::ObjectClass
       end
     end
   end
 
-  describe 'building the GstFakeSink type' do
-    let(:instance) { Gst::ElementFactory.make('fakesink', 'sink') }
+  describe "building the GstFakeSink type" do
+    let(:instance) { Gst::ElementFactory.make("fakesink", "sink") }
     let(:sink_class) { instance.class }
     let(:builder) { sink_class.gir_ffi_builder }
 
@@ -62,11 +62,22 @@ describe GirFFI::Builders::UnintrospectableBuilder do
       Gst.init []
     end
 
-    describe 'its #find_signal method' do
-      it 'finds signals that are not defined in the GIR' do
-        signal = builder.find_signal 'handoff'
-        signal.wont_be_nil
-        signal.name.must_equal 'handoff'
+    describe "its #find_signal method" do
+      it "finds signals that are not defined in the GIR" do
+        signal = builder.find_signal "handoff"
+        _(signal).wont_be_nil
+        _(signal.name).must_equal "handoff"
+      end
+    end
+
+    describe "its #find_property method" do
+      it "returns nil for a property that doesn't exist" do
+        _(builder.find_property("foo")).must_be_nil
+      end
+
+      it "finds properies in ancestor classes" do
+        property = builder.find_property "name"
+        _(property.name).must_equal "name"
       end
     end
   end

data/test/gir_ffi/builders/union_builder_test.rb

@@ -1,31 +1,28 @@
 # frozen_string_literal: true
 
-require 'gir_ffi_test_helper'
+require "gir_ffi_test_helper"
 
 describe GirFFI::Builders::UnionBuilder do
-  let(:union_info) { get_introspection_data('GObject', 'TypeCValue') }
+  let(:union_info) { get_introspection_data("Regress", "FooBUnion") }
   let(:builder) { GirFFI::Builders::UnionBuilder.new union_info }
 
-  describe '#setup_instance_method' do
+  describe "#setup_instance_method" do
     it "returns nil looking for a method that doesn't exist" do
-      builder.setup_instance_method('blub').must_be_nil
+      _(builder.setup_instance_method("blub")).must_be_nil
     end
   end
 
-  describe '#layout_specification' do
-    it 'returns the correct layout for GObject::TypeCValue' do
-      long_type = FFI.type_size(:long) == 8 ? :int64 : :int32
-      builder.layout_specification.must_equal [:v_int, :int32, 0,
-                                               :v_long, long_type, 0,
-                                               :v_int64, :int64, 0,
-                                               :v_double, :double, 0,
-                                               :v_pointer, :pointer, 0]
+  describe "#layout_specification" do
+    it "returns the correct layout for Regress::FooBUnion" do
+      _(builder.layout_specification).must_equal [:type, :int32, 0,
+                                                  :v, :double, 0,
+                                                  :rect, :pointer, 0]
     end
   end
 
-  describe '#layout_superclass' do
-    it 'returns GirFFI::Union' do
-      builder.layout_superclass.must_equal GirFFI::Union
+  describe "#layout_superclass" do
+    it "returns GirFFI::Union" do
+      _(builder.layout_superclass).must_equal GirFFI::Union
     end
   end
 end

data/test/gir_ffi/builders/user_defined_builder_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'gir_ffi_test_helper'
+require "gir_ffi_test_helper"
 
 GirFFI.setup :GIMarshallingTests
 GirFFI.setup :Regress
@@ -13,392 +13,396 @@ describe GirFFI::Builders::UserDefinedBuilder do
   let(:builder) { GirFFI::Builders::UserDefinedBuilder.new info }
   let(:info) { GirFFI::UserDefinedObjectInfo.new derived_class }
 
-  describe '#build_class' do
+  describe "#build_class" do
     before do
       builder.build_class
     end
 
-    describe 'with type info containing one integer property' do
+    describe "with type info containing one integer property" do
       let(:info) do
         GirFFI::UserDefinedObjectInfo.new derived_class do |it|
-          it.install_property GObject.param_spec_int('foo-bar', 'foo bar',
-                                                     'The Foo Bar Property',
+          it.install_property GObject.param_spec_int("foo-bar", "foo bar",
+                                                     "The Foo Bar Property",
                                                      10, 20, 15,
                                                      readable: true, writable: true)
         end
       end
 
-      it 'registers a type that is bigger than the parent' do
+      it "registers a type that is bigger than the parent" do
         gtype = derived_class.gtype
         q = GObject.type_query gtype
-        q.instance_size.must_be :>, GIMarshallingTests::Object::Struct.size
+        _(q.instance_size).must_be :>, GIMarshallingTests::Object::Struct.size
       end
 
       it "gives the type's Struct fields for the parent and the property" do
-        derived_class::Struct.members.must_equal [:parent, :foo_bar]
+        _(derived_class::Struct.members).must_equal [:parent, :foo_bar]
       end
 
-      it 'creates accessor functions for the property' do
+      it "creates accessor functions for the property" do
         obj = derived_class.new
         obj.foo_bar = 13
-        obj.foo_bar.must_equal 13
+        _(obj.foo_bar).must_equal 13
       end
 
-      it 'makes the property retrievable using #get_property' do
+      it "makes the property retrievable using #get_property" do
         obj = derived_class.new
         obj.foo_bar = 13
-        obj.get_property('foo-bar').must_equal 13
+        _(obj.get_property("foo-bar")).must_equal 13
       end
 
-      it 'makes the property settable using #set_property' do
+      it "makes the property settable using #set_property" do
         obj = derived_class.new
-        obj.set_property('foo-bar', 20)
-        obj.foo_bar.must_equal 20
+        obj.set_property("foo-bar", 20)
+        _(obj.foo_bar).must_equal 20
       end
 
-      it 'keeps parent properties accessible through their accessors' do
+      it "keeps parent properties accessible through their accessors" do
         obj = derived_class.new
         obj.int = 24
-        obj.int.must_equal 24
+        _(obj.int).must_equal 24
       end
 
-      it 'keeps parent properties accessible through get_property and set_property' do
+      it "keeps parent properties accessible through get_property and set_property" do
         obj = derived_class.new
-        obj.set_property('int', 24)
-        obj.get_property('int').must_equal 24
+        obj.set_property("int", 24)
+        _(obj.get_property("int")).must_equal 24
       end
     end
 
-    describe 'with type info containing properties of several different types' do
+    describe "with type info containing properties of several different types" do
       let(:info) do
         GirFFI::UserDefinedObjectInfo.new derived_class do |it|
-          it.install_property GObject.param_spec_string('string-prop', 'string property',
-                                                        'The String Property',
-                                                        'this is the default value',
+          it.install_property GObject.param_spec_string("string-prop", "string property",
+                                                        "The String Property",
+                                                        "this is the default value",
                                                         readable: true, writable: true)
-          it.install_property GObject.param_spec_int('int-prop', 'integer property',
-                                                     'The Integer Property',
+          it.install_property GObject.param_spec_int("int-prop", "integer property",
+                                                     "The Integer Property",
                                                      10, 20, 15,
                                                      readable: true, writable: true)
-          it.install_property GObject.param_spec_long('long-prop', 'long property',
-                                                      'The Long Property',
+          it.install_property GObject.param_spec_long("long-prop", "long property",
+                                                      "The Long Property",
                                                       10.0, 50.0, 42.0,
                                                       readable: true, writable: true)
         end
       end
 
-      it 'registers a type of the proper size' do
+      it "registers a type of the proper size" do
         expected_size = derived_class::Struct.size
         gtype = derived_class.gtype
         q = GObject.type_query gtype
-        q.instance_size.must_equal expected_size
+        _(q.instance_size).must_equal expected_size
       end
 
-      it "gives the type's Struct fields for the parent and the properties with the correct offsets" do
+      it "creates fields for the parents and properties in the type's Struct" do
         offsets = derived_class::Struct.offsets
         alignment = derived_class::Struct.alignment
-        alignment.must_equal 8 # TODO: Fix tests for platforms where this fails.
-        offsets.must_equal [[:parent, 0], [:string_prop, 32], [:int_prop, 40], [:long_prop, 48]]
+        _(alignment).must_equal 8 # TODO: Fix tests for platforms where this fails.
+        _(offsets).must_equal [[:parent, 0],
+                               [:string_prop, 32],
+                               [:int_prop, 40],
+                               [:long_prop, 48]]
       end
 
-      it 'creates accessor functions for the string property' do
+      it "creates accessor functions for the string property" do
         obj = derived_class.new
-        obj.string_prop = 'hello!'
-        obj.string_prop.must_equal 'hello!'
+        obj.string_prop = "hello!"
+        _(obj.string_prop).must_equal "hello!"
       end
 
-      it 'creates accessor functions for the integer property' do
+      it "creates accessor functions for the integer property" do
         obj = derived_class.new
         obj.int_prop = 13
-        obj.int_prop.must_equal 13
+        _(obj.int_prop).must_equal 13
       end
     end
 
-    describe 'with a boxed property' do
+    describe "with a boxed property" do
       let(:boxed_gtype) { GIMarshallingTests::BoxedStruct.gtype }
       let(:info) do
         GirFFI::UserDefinedObjectInfo.new derived_class do |it|
-          it.install_property GObject.param_spec_boxed('boxed-prop', 'boxed property',
-                                                       'The Boxed Property',
+          it.install_property GObject.param_spec_boxed("boxed-prop", "boxed property",
+                                                       "The Boxed Property",
                                                        boxed_gtype,
                                                        readable: true, writable: true)
         end
       end
 
-      it 'registers a type of the proper size' do
+      it "registers a type of the proper size" do
         expected_size = derived_class::Struct.size
         gtype = derived_class.gtype
         q = GObject.type_query gtype
-        q.instance_size.must_equal expected_size
+        _(q.instance_size).must_equal expected_size
       end
 
       it "gives the type's Struct fields for the parent and the property" do
-        derived_class::Struct.members.must_equal [:parent, :boxed_prop]
+        _(derived_class::Struct.members).must_equal [:parent, :boxed_prop]
       end
 
-      it 'creates accessor functions for the property' do
+      it "creates accessor functions for the property" do
         obj = derived_class.new
         boxed = GIMarshallingTests::BoxedStruct.new
         boxed.long_ = 423
         obj.boxed_prop = boxed
-        obj.boxed_prop.long_.must_equal 423
+        _(obj.boxed_prop.long_).must_equal 423
       end
     end
 
-    describe 'with an object property' do
+    describe "with an object property" do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
         GirFFI::UserDefinedObjectInfo.new derived_class do |it|
-          it.install_property GObject.param_spec_object('object-prop', 'object property',
-                                                        'The Object Property',
+          it.install_property GObject.param_spec_object("object-prop", "object property",
+                                                        "The Object Property",
                                                         object_gtype,
                                                         readable: true, writable: true)
         end
       end
 
-      it 'registers a type of the proper size' do
+      it "registers a type of the proper size" do
         expected_size = derived_class::Struct.size
         gtype = derived_class.gtype
         q = GObject.type_query gtype
-        q.instance_size.must_equal expected_size
+        _(q.instance_size).must_equal expected_size
       end
 
       it "gives the type's Struct fields for the parent and the property" do
-        derived_class::Struct.members.must_equal [:parent, :object_prop]
+        _(derived_class::Struct.members).must_equal [:parent, :object_prop]
       end
 
-      it 'creates accessor functions for the property' do
+      it "creates accessor functions for the property" do
         obj = derived_class.new
         object = GIMarshallingTests::Object.new 42
         object.int = 423
         obj.object_prop = object
-        obj.object_prop.int.must_equal 423
+        _(obj.object_prop.int).must_equal 423
       end
 
-      it 'allows clearing the property throught the setter method' do
+      it "allows clearing the property throught the setter method" do
         obj = derived_class.new
         obj.object_prop = nil
-        obj.object_prop.must_be_nil
+        _(obj.object_prop).must_be_nil
       end
 
-      it 'handles reference counting correctly when using the accessor' do
+      it "handles reference counting correctly when using the accessor" do
         obj = derived_class.new
         object = GIMarshallingTests::Object.new 42
         obj.object_prop = object
-        object_ref_count(object).must_equal 2
+        _(object_ref_count(object)).must_equal 2
       end
 
-      it 'handles reference counting correctly when using the set_property method' do
+      it "handles reference counting correctly when using the set_property method" do
         obj = derived_class.new
         object = GIMarshallingTests::Object.new 42
 
-        object_ref_count(object).must_equal 1
-        obj.set_property('object_prop', object)
-        object_ref_count(object).must_equal 4 # Due to extra Value#set_value + Value#get_value
+        _(object_ref_count(object)).must_equal 1
+        obj.set_property("object_prop", object)
+        # Expect 4 due to extra Value#set_value + Value#get_value
+        _(object_ref_count(object)).must_equal 4
       end
     end
 
-    describe 'with a boolean property' do
+    describe "with a boolean property" do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
         GirFFI::UserDefinedObjectInfo.new derived_class do |it|
-          it.install_property GObject.param_spec_boolean('the-prop', 'the property',
-                                                         'The Property',
+          it.install_property GObject.param_spec_boolean("the-prop", "the property",
+                                                         "The Property",
                                                          true,
                                                          readable: true, writable: true)
         end
       end
 
-      it 'creates accessor functions for the property' do
+      it "creates accessor functions for the property" do
         obj = derived_class.new
         obj.the_prop = true
-        obj.the_prop.must_equal true
+        _(obj.the_prop).must_equal true
       end
     end
 
-    describe 'with a char property' do
+    describe "with a char property" do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
         GirFFI::UserDefinedObjectInfo.new derived_class do |it|
-          it.install_property GObject.param_spec_char('the-prop', 'the property',
-                                                      'The Property',
+          it.install_property GObject.param_spec_char("the-prop", "the property",
+                                                      "The Property",
                                                       -20, 100, 15,
                                                       readable: true, writable: true)
         end
       end
 
-      it 'creates accessor functions for the property' do
+      it "creates accessor functions for the property" do
         obj = derived_class.new
         obj.the_prop = -13
-        obj.the_prop.must_equal(-13)
+        _(obj.the_prop).must_equal(-13)
       end
     end
 
-    describe 'with a uchar property' do
+    describe "with a uchar property" do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
         GirFFI::UserDefinedObjectInfo.new derived_class do |it|
-          it.install_property GObject.param_spec_uchar('the-prop', 'the property',
-                                                       'The Property',
+          it.install_property GObject.param_spec_uchar("the-prop", "the property",
+                                                       "The Property",
                                                        10, 100, 15,
                                                        readable: true, writable: true)
         end
       end
 
-      it 'creates accessor functions for the property' do
+      it "creates accessor functions for the property" do
         obj = derived_class.new
         obj.the_prop = 13
-        obj.the_prop.must_equal 13
+        _(obj.the_prop).must_equal 13
       end
     end
 
-    describe 'with a uint property' do
+    describe "with a uint property" do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
         GirFFI::UserDefinedObjectInfo.new derived_class do |it|
-          it.install_property GObject.param_spec_uint('the-prop', 'the property',
-                                                      'The Property',
+          it.install_property GObject.param_spec_uint("the-prop", "the property",
+                                                      "The Property",
                                                       10, 100, 15,
                                                       readable: true, writable: true)
         end
       end
 
-      it 'creates accessor functions for the property' do
+      it "creates accessor functions for the property" do
         obj = derived_class.new
         obj.the_prop = 423
-        obj.the_prop.must_equal 423
+        _(obj.the_prop).must_equal 423
       end
     end
 
-    describe 'with a ulong property' do
+    describe "with a ulong property" do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
         GirFFI::UserDefinedObjectInfo.new derived_class do |it|
-          it.install_property GObject.param_spec_ulong('the-prop', 'the property',
-                                                       'The Property',
+          it.install_property GObject.param_spec_ulong("the-prop", "the property",
+                                                       "The Property",
                                                        10, 100, 15,
                                                        readable: true, writable: true)
         end
       end
 
-      it 'creates accessor functions for the property' do
+      it "creates accessor functions for the property" do
         obj = derived_class.new
         obj.the_prop = 423_432
-        obj.the_prop.must_equal 423_432
+        _(obj.the_prop).must_equal 423_432
       end
     end
 
-    describe 'with a int64 property' do
+    describe "with a int64 property" do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
         GirFFI::UserDefinedObjectInfo.new derived_class do |it|
-          it.install_property GObject.param_spec_int64('the-prop', 'the property',
-                                                       'The Property',
+          it.install_property GObject.param_spec_int64("the-prop", "the property",
+                                                       "The Property",
                                                        10, 100, 15,
                                                        readable: true, writable: true)
         end
       end
 
-      it 'creates accessor functions for the property' do
+      it "creates accessor functions for the property" do
         obj = derived_class.new
         obj.the_prop = -423_432
-        obj.the_prop.must_equal(-423_432)
+        _(obj.the_prop).must_equal(-423_432)
       end
     end
 
-    describe 'with a uint64 property' do
+    describe "with a uint64 property" do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
         GirFFI::UserDefinedObjectInfo.new derived_class do |it|
-          it.install_property GObject.param_spec_uint64('the-prop', 'the property',
-                                                        'The Property',
+          it.install_property GObject.param_spec_uint64("the-prop", "the property",
+                                                        "The Property",
                                                         10, 100, 15,
                                                         readable: true, writable: true)
         end
       end
 
-      it 'creates accessor functions for the property' do
+      it "creates accessor functions for the property" do
         obj = derived_class.new
         obj.the_prop = 423_432
-        obj.the_prop.must_equal 423_432
+        _(obj.the_prop).must_equal 423_432
       end
     end
 
-    describe 'with a float property' do
+    describe "with a float property" do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
         GirFFI::UserDefinedObjectInfo.new derived_class do |it|
-          it.install_property GObject.param_spec_float('the-prop', 'the property',
-                                                       'The Property',
+          it.install_property GObject.param_spec_float("the-prop", "the property",
+                                                       "The Property",
                                                        10.0, 100.0, 15.0,
                                                        readable: true, writable: true)
         end
       end
 
-      it 'creates accessor functions for the property' do
+      it "creates accessor functions for the property" do
         obj = derived_class.new
         obj.the_prop = 42.23
-        obj.the_prop.must_be_within_epsilon 42.23
+        _(obj.the_prop).must_be_within_epsilon 42.23
       end
     end
 
-    describe 'with a double property' do
+    describe "with a double property" do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
         GirFFI::UserDefinedObjectInfo.new derived_class do |it|
-          it.install_property GObject.param_spec_double('the-prop', 'the property',
-                                                        'The Property',
+          it.install_property GObject.param_spec_double("the-prop", "the property",
+                                                        "The Property",
                                                         10.0, 100.0, 15.0,
                                                         readable: true, writable: true)
         end
       end
 
-      it 'creates accessor functions for the property' do
+      it "creates accessor functions for the property" do
         obj = derived_class.new
         obj.the_prop = 42.23
-        obj.the_prop.must_equal 42.23
+        _(obj.the_prop).must_equal 42.23
       end
     end
 
-    describe 'with an enum property' do
+    describe "with an enum property" do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
         GirFFI::UserDefinedObjectInfo.new derived_class do |it|
-          prop = GObject.param_spec_enum('the-prop', 'the property',
-                                         'The Property',
+          prop = GObject.param_spec_enum("the-prop", "the property",
+                                         "The Property",
                                          GIMarshallingTests::GEnum.gtype, 0,
                                          readable: true, writable: true)
           it.install_property prop
         end
       end
 
-      it 'creates accessor functions for the property' do
+      it "creates accessor functions for the property" do
         obj = derived_class.new
         obj.the_prop = :value2
-        obj.the_prop.must_equal :value2
+        _(obj.the_prop).must_equal :value2
       end
     end
 
-    describe 'with a flags property' do
+    describe "with a flags property" do
       let(:object_gtype) { GIMarshallingTests::Object.gtype }
       let(:info) do
         GirFFI::UserDefinedObjectInfo.new derived_class do |it|
-          prop = GObject.param_spec_flags('the-prop', 'the property',
-                                          'The Property',
+          prop = GObject.param_spec_flags("the-prop", "the property",
+                                          "The Property",
                                           GIMarshallingTests::Flags.gtype, 0,
                                           readable: true, writable: true)
           it.install_property prop
         end
       end
 
-      it 'creates accessor functions for the property' do
+      it "creates accessor functions for the property" do
         obj = derived_class.new
         obj.the_prop = { value2: true }
-        obj.the_prop.must_equal value2: true
+        _(obj.the_prop).must_equal value2: true
       end
     end
 
-    describe 'when deriving from a class with hidden struct size' do
+    describe "when deriving from a class with hidden struct size" do
       let(:parent_class) { Regress::TestInheritDrawable }
       let(:parent_size) do
         GObject.type_query(parent_class.gtype).instance_size
@@ -408,39 +412,39 @@ describe GirFFI::Builders::UserDefinedBuilder do
       end
       let(:info) do
         GirFFI::UserDefinedObjectInfo.new derived_class do |it|
-          it.install_property GObject.param_spec_int('int-prop', 'integer property',
-                                                     'Integer Property',
+          it.install_property GObject.param_spec_int("int-prop", "integer property",
+                                                     "Integer Property",
                                                      10, 20, 15,
                                                      readable: true, writable: true)
         end
       end
 
-      it 'registers a type that is bigger than the parent' do
+      it "registers a type that is bigger than the parent" do
         class_size = GObject.type_query(derived_class.gtype).instance_size
-        class_size.must_be :>, parent_size
+        _(class_size).must_be :>, parent_size
       end
 
-      it 'leaves enough space in derived struct layout' do
+      it "leaves enough space in derived struct layout" do
         struct_size = derived_class::Struct.size
-        struct_size.must_be :>, parent_size
+        _(struct_size).must_be :>, parent_size
       end
     end
 
-    describe 'with type info containing an overridden g_name' do
+    describe "with type info containing an overridden g_name" do
       let(:info) do
         GirFFI::UserDefinedObjectInfo.new derived_class do |it|
           it.g_name = "OtherName#{Sequence.next}"
         end
       end
 
-      it 'registers a type under the overridden name' do
+      it "registers a type under the overridden name" do
         registered_name = GObject.type_name(derived_class.gtype)
-        registered_name.must_equal info.g_name
-        registered_name.wont_equal derived_class.name
+        _(registered_name).must_equal info.g_name
+        _(registered_name).wont_equal derived_class.name
       end
     end
 
-    describe 'with type info containing a vfunc' do
+    describe "with type info containing a vfunc" do
       let(:info) do
         GirFFI::UserDefinedObjectInfo.new derived_class do |it|
           it.install_vfunc_implementation :method_int8_in, proc { |instance, in_|
@@ -449,14 +453,14 @@ describe GirFFI::Builders::UserDefinedBuilder do
         end
       end
 
-      it 'allows the vfunc to be called through its invoker' do
+      it "allows the vfunc to be called through its invoker" do
         obj = derived_class.new
         obj.method_int8_in 12
-        obj.int.must_equal 12
+        _(obj.int).must_equal 12
       end
     end
 
-    describe 'when using a default vfunc implementation' do
+    describe "when using a default vfunc implementation" do
       let(:base_class) { Regress::TestObj }
       let(:info) do
         GirFFI::UserDefinedObjectInfo.new derived_class do |it|
@@ -472,13 +476,13 @@ describe GirFFI::Builders::UserDefinedBuilder do
         end
       end
 
-      it 'allows the vfunc to be called through its invoker' do
+      it "allows the vfunc to be called through its invoker" do
         obj = derived_class.new
-        obj.do_matrix('bar').must_equal 44
+        _(obj.do_matrix("bar")).must_equal 44
       end
     end
 
-    describe 'with type info containing a vfunc from an included Interface' do
+    describe "with type info containing a vfunc from an included Interface" do
       let(:info) do
         derived_class.class_eval { include GIMarshallingTests::Interface }
         GirFFI::UserDefinedObjectInfo.new derived_class do |it|
@@ -487,38 +491,38 @@ describe GirFFI::Builders::UserDefinedBuilder do
         end
       end
 
-      it 'marks the type as conforming to the included Interface' do
+      it "marks the type as conforming to the included Interface" do
         iface_gtype = GIMarshallingTests::Interface.gtype
-        GObject.type_interfaces(derived_class.gtype).to_a.must_equal [iface_gtype]
+        _(GObject.type_interfaces(derived_class.gtype).to_a).must_equal [iface_gtype]
       end
 
-      it 'allows the vfunc to be called through its invoker' do
+      it "allows the vfunc to be called through its invoker" do
         obj = derived_class.new
         obj.test_int8_in 12
-        obj.int.must_equal 12
+        _(obj.int).must_equal 12
       end
     end
 
-    it 'keeps the gtype for an already registered class' do
+    it "keeps the gtype for an already registered class" do
       gtype = derived_class.gtype
       other_builder = GirFFI::Builders::UserDefinedBuilder.new info
       other_class = other_builder.build_class
-      other_class.gtype.must_equal gtype
+      _(other_class.gtype).must_equal gtype
     end
 
-    it 'creates a class with a new GType' do
-      derived_class.gtype.wont_equal GIMarshallingTests::Object.gtype
+    it "creates a class with a new GType" do
+      _(derived_class.gtype).wont_equal GIMarshallingTests::Object.gtype
     end
 
-    it 'makes the registered class return objects with the correct GType' do
+    it "makes the registered class return objects with the correct GType" do
       obj = derived_class.new
-      GObject.type_from_instance(obj).must_equal derived_class.gtype
+      _(GObject.type_from_instance(obj)).must_equal derived_class.gtype
     end
   end
 
-  describe '#object_class_struct' do
-    it 'returns the parent class struct' do
-      builder.object_class_struct.must_equal GIMarshallingTests::ObjectClass
+  describe "#object_class_struct" do
+    it "returns the parent class struct" do
+      _(builder.object_class_struct).must_equal GIMarshallingTests::ObjectClass
     end
   end
 end