ffi-geos 1.2.2 → 2.3.0

data/test/interrupt_tests.rb

@@ -39,7 +39,7 @@ class InterruptTests < Minitest::Test
 
       begin
         buffer = geom.buffer(1, 8)
-      rescue => e
+      rescue StandardError => e
         # no-op
       ensure
         assert_match(/^InterruptedException/, e.message)
@@ -62,7 +62,7 @@ class InterruptTests < Minitest::Test
 
       begin
         buffer = geom.buffer(1, 8)
-      rescue => e
+      rescue StandardError => e
         # no-op
       ensure
         assert_match(/^InterruptedException/, e.message)
@@ -87,7 +87,7 @@ class InterruptTests < Minitest::Test
 
       begin
         buffer = geom.buffer(1, 8)
-      rescue => e
+      rescue StandardError => e
         # no-op
       ensure
         assert_match(/^InterruptedException/, e.message)
@@ -114,7 +114,7 @@ class InterruptTests < Minitest::Test
       prc_1 = proc {
         interrupt_called
         called << :prc_1
-        prev.call if prev
+        prev&.call
       }
 
       Geos::Interrupt.register(prc_0)
@@ -122,13 +122,13 @@ class InterruptTests < Minitest::Test
 
       begin
         buffer = geom.buffer(1, 8)
-      rescue => e
+      rescue StandardError => e
         # no-op
       ensure
         assert_match(/^InterruptedException/, e.message)
         assert_nil(buffer)
         assert_interrupt_called(1)
-        assert_equal([ :prc_1, :prc_0 ], called)
+        assert_equal([:prc_1, :prc_0], called)
       end
     end
   end
@@ -160,7 +160,7 @@ class InterruptTests < Minitest::Test
 
     begin
       buffer = geom.buffer(1, 8)
-    rescue => e
+    rescue StandardError => e
       assert_match(/^InterruptedException/, e.message)
       assert_nil(buffer)
     end

data/test/line_string_tests.rb

@@ -80,7 +80,11 @@ class LineStringTests < Minitest::Test
     # straight right
     simple_tester(
       :offset_curve,
-      'LINESTRING (10 -2, 0 -2)',
+      if Geos::GEOS_NICE_VERSION >= '031100'
+        'LINESTRING (0 -2, 10 -2)'
+      else
+        'LINESTRING (10 -2, 0 -2)'
+      end,
       'LINESTRING (0 0, 10 0)',
       -2,
       quad_segs: 0,
@@ -91,7 +95,11 @@ class LineStringTests < Minitest::Test
     # outside curve
     simple_tester(
       :offset_curve,
-      'LINESTRING (12 10, 12 0, 10 -2, 0 -2)',
+      if Geos::GEOS_NICE_VERSION >= '031100'
+        'LINESTRING (0 -2, 10 -2, 12 0, 12 10)'
+      else
+        'LINESTRING (12 10, 12 0, 10 -2, 0 -2)'
+      end,
       'LINESTRING (0 0, 10 0, 10 10)',
       -2,
       quad_segs: 1,
@@ -250,8 +258,8 @@ class LineStringTests < Minitest::Test
 
     wkt = 'LINESTRING (0 0, 10 10)'
 
-    affine_tester(:rotate, 'LINESTRING (30 10, 20 20)', wkt, Math::PI / 2, [ 10.0, 20.0 ])
-    affine_tester(:rotate, 'LINESTRING (-3 1, 7 -9)', wkt, -Math::PI / 2, [ -1.0, 2.0 ])
+    affine_tester(:rotate, 'LINESTRING (30 10, 20 20)', wkt, Math::PI / 2, [10.0, 20.0])
+    affine_tester(:rotate, 'LINESTRING (-3 1, 7 -9)', wkt, -Math::PI / 2, [-1.0, 2.0])
     affine_tester(:rotate, 'LINESTRING (2 2, -8 -8)', wkt, Math::PI, read('POINT(1 1)'))
     affine_tester(:rotate, 'LINESTRING (0.5 -0.5, -9.5 9.5)', wkt, Math::PI / 2, read('LINESTRING(0 0, 1 0)'))
   end
@@ -264,7 +272,7 @@ class LineStringTests < Minitest::Test
 
     affine_tester(:rotate_x, 'LINESTRING Z (1 -1 -1, 10 -10 -10)', wkt, Math::PI)
     affine_tester(:rotate_x, 'LINESTRING Z (1 -1 1, 10 -10 10)', wkt, Math::PI / 2)
-    affine_tester(:rotate_x, 'LINESTRING Z (1 1 -1, 10 10 -10)', wkt, Math::PI + Math::PI / 2)
+    affine_tester(:rotate_x, 'LINESTRING Z (1 1 -1, 10 10 -10)', wkt, Math::PI + (Math::PI / 2))
     affine_tester(:rotate_x, wkt, wkt, Math::PI * 2)
   end
 
@@ -276,7 +284,7 @@ class LineStringTests < Minitest::Test
 
     affine_tester(:rotate_y, 'LINESTRING Z (-1 1 -1, -10 10 -10)', wkt, Math::PI)
     affine_tester(:rotate_y, 'LINESTRING Z (1 1 -1, 10 10 -10)', wkt, Math::PI / 2)
-    affine_tester(:rotate_y, 'LINESTRING Z (-1 1 1, -10 10 10)', wkt, Math::PI + Math::PI / 2)
+    affine_tester(:rotate_y, 'LINESTRING Z (-1 1 1, -10 10 10)', wkt, Math::PI + (Math::PI / 2))
     affine_tester(:rotate_y, wkt, wkt, Math::PI * 2)
   end
 
@@ -287,7 +295,7 @@ class LineStringTests < Minitest::Test
 
     affine_tester(:rotate_z, 'LINESTRING (-1 -1, -10 -10)', wkt, Math::PI)
     affine_tester(:rotate_z, 'LINESTRING (-1 1, -10 10)', wkt, Math::PI / 2)
-    affine_tester(:rotate_z, 'LINESTRING (1 -1, 10 -10)', wkt, Math::PI + Math::PI / 2)
+    affine_tester(:rotate_z, 'LINESTRING (1 -1, 10 -10)', wkt, Math::PI + (Math::PI / 2))
     affine_tester(:rotate_z, wkt, wkt, Math::PI * 2)
   end
 
@@ -300,11 +308,11 @@ class LineStringTests < Minitest::Test
   end
 
   def test_scale_hash
-    affine_tester(:scale, 'LINESTRING (5 5, 50 50)', 'LINESTRING (1 1, 10 10)', :x => 5, :y => 5)
-    affine_tester(:scale, 'LINESTRING (3 2, 30 20)', 'LINESTRING (1 1, 10 10)', :x => 3, :y => 2)
+    affine_tester(:scale, 'LINESTRING (5 5, 50 50)', 'LINESTRING (1 1, 10 10)', x: 5, y: 5)
+    affine_tester(:scale, 'LINESTRING (3 2, 30 20)', 'LINESTRING (1 1, 10 10)', x: 3, y: 2)
 
     writer.output_dimensions = 3
-    affine_tester(:scale, 'LINESTRING Z (40 40 40, 80 80 80)', 'LINESTRING Z (10 20 -5, 20 40 -10)', :x => 4, :y => 2, :z => -8)
+    affine_tester(:scale, 'LINESTRING Z (40 40 40, 80 80 80)', 'LINESTRING Z (10 20 -5, 20 40 -10)', x: 4, y: 2, z: -8)
   end
 
   def test_trans_scale
@@ -326,11 +334,11 @@ class LineStringTests < Minitest::Test
   end
 
   def test_trans_scale_hash
-    affine_tester(:trans_scale, 'LINESTRING (2 2, 11 11)', 'LINESTRING (1 1, 10 10)', :delta_x => 1, :delta_y => 1, :x_factor => 1, :y_factor => 1)
+    affine_tester(:trans_scale, 'LINESTRING (2 2, 11 11)', 'LINESTRING (1 1, 10 10)', delta_x: 1, delta_y: 1, x_factor: 1, y_factor: 1)
 
     writer.output_dimensions = 3
-    affine_tester(:trans_scale, 'LINESTRING Z (15 28 1, 60 91 10)', 'LINESTRING Z (1 1 1, 10 10 10)', :delta_x => 2, :delta_y => 3, :x_factor => 5, :y_factor => 7)
-    affine_tester(:trans_scale, 'LINESTRING Z (3 1 1, 12 10 10)', 'LINESTRING Z (1 1 1, 10 10 10)', :delta_x => 2, :z_factor => 2)
+    affine_tester(:trans_scale, 'LINESTRING Z (15 28 1, 60 91 10)', 'LINESTRING Z (1 1 1, 10 10 10)', delta_x: 2, delta_y: 3, x_factor: 5, y_factor: 7)
+    affine_tester(:trans_scale, 'LINESTRING Z (3 1 1, 12 10 10)', 'LINESTRING Z (1 1 1, 10 10 10)', delta_x: 2, z_factor: 2)
   end
 
   def test_translate
@@ -341,10 +349,10 @@ class LineStringTests < Minitest::Test
   end
 
   def test_translate_hash
-    affine_tester(:translate, 'LINESTRING (5 12, 15 22)', 'LINESTRING (0 0, 10 10)', :x => 5, :y => 12)
+    affine_tester(:translate, 'LINESTRING (5 12, 15 22)', 'LINESTRING (0 0, 10 10)', x: 5, y: 12)
 
     writer.output_dimensions = 3
-    affine_tester(:translate, 'LINESTRING Z (-3 -7 3, 7 3 13)', 'LINESTRING Z (0 0 0, 10 10 10)', :x => -3, :y => -7, :z => 3)
+    affine_tester(:translate, 'LINESTRING Z (-3 -7 3, 7 3 13)', 'LINESTRING Z (0 0 0, 10 10 10)', x: -3, y: -7, z: 3)
   end
 
   def test_line_interpolate_point

data/test/point_tests.rb

@@ -163,8 +163,8 @@ class PointTests < Minitest::Test
 
     wkt = 'POINT (1 1)'
 
-    affine_tester(:rotate, 'POINT (29 11)', wkt, Math::PI / 2, [ 10.0, 20.0 ])
-    affine_tester(:rotate, 'POINT (-2 0)', wkt, -Math::PI / 2, [ -1.0, 2.0 ])
+    affine_tester(:rotate, 'POINT (29 11)', wkt, Math::PI / 2, [10.0, 20.0])
+    affine_tester(:rotate, 'POINT (-2 0)', wkt, -Math::PI / 2, [-1.0, 2.0])
     affine_tester(:rotate, 'POINT (19 1)', wkt, Math::PI / 2, read('POINT(10 10)'))
     affine_tester(:rotate, 'POINT (-0.5 0.5)', wkt, Math::PI / 2, read('LINESTRING(0 0, 1 0)'))
   end
@@ -177,7 +177,7 @@ class PointTests < Minitest::Test
 
     affine_tester(:rotate_x, 'POINT Z (1 -1 -1)', wkt, Math::PI)
     affine_tester(:rotate_x, 'POINT Z (1 -1 1)', wkt, Math::PI / 2)
-    affine_tester(:rotate_x, 'POINT Z (1 1 -1)', wkt, Math::PI + Math::PI / 2)
+    affine_tester(:rotate_x, 'POINT Z (1 1 -1)', wkt, Math::PI + (Math::PI / 2))
     affine_tester(:rotate_x, wkt, wkt, Math::PI * 2)
   end
 
@@ -189,7 +189,7 @@ class PointTests < Minitest::Test
 
     affine_tester(:rotate_y, 'POINT Z (-1 1 -1)', wkt, Math::PI)
     affine_tester(:rotate_y, 'POINT Z (1 1 -1)', wkt, Math::PI / 2)
-    affine_tester(:rotate_y, 'POINT Z (-1 1 1)', wkt, Math::PI + Math::PI / 2)
+    affine_tester(:rotate_y, 'POINT Z (-1 1 1)', wkt, Math::PI + (Math::PI / 2))
     affine_tester(:rotate_y, wkt, wkt, Math::PI * 2)
   end
 
@@ -200,7 +200,7 @@ class PointTests < Minitest::Test
 
     affine_tester(:rotate_z, 'POINT (-1 -1)', wkt, Math::PI)
     affine_tester(:rotate_z, 'POINT (-1 1)', wkt, Math::PI / 2)
-    affine_tester(:rotate_z, 'POINT (1 -1)', wkt, Math::PI + Math::PI / 2)
+    affine_tester(:rotate_z, 'POINT (1 -1)', wkt, Math::PI + (Math::PI / 2))
     affine_tester(:rotate_z, wkt, wkt, Math::PI * 2)
   end
 

data/test/polygon_tests.rb

@@ -79,8 +79,7 @@ class PolygonTests < Minitest::Test
 
   def test_snap_to_grid_with_illegal_result
     assert_raises(Geos::InvalidGeometryError) do
-      read('POLYGON ((1 1, 10 10, 10 10, 1 1))').
-        snap_to_grid
+      read('POLYGON ((1 1, 10 10, 10 10, 1 1))').snap_to_grid
     end
   end
 
@@ -110,13 +109,13 @@ class PolygonTests < Minitest::Test
       'POLYGON ((30 10, 30 15, 25 15, 25 10, 30 10))',
       wkt,
       Math::PI / 2,
-      [ 10.0, 20.0 ])
+      [10.0, 20.0])
 
     affine_tester(:rotate,
       'POLYGON ((-3 1, -3 -4, 2 -4, 2 1, -3 1))',
       wkt,
       -Math::PI / 2,
-      [ -1.0, 2.0 ])
+      [-1.0, 2.0])
 
     affine_tester(:rotate,
       'POLYGON ((2 2, -3 2, -3 -3, 2 -3, 2 2))',
@@ -148,7 +147,7 @@ class PolygonTests < Minitest::Test
     affine_tester(:rotate_x,
       'POLYGON Z ((0 0 0, 5 0 0, 5 0 -5, 0 0 -5, 0 0 0))',
       wkt,
-      Math::PI + Math::PI / 2)
+      Math::PI + (Math::PI / 2))
 
     affine_tester(:rotate_x,
       wkt,
@@ -174,7 +173,7 @@ class PolygonTests < Minitest::Test
     affine_tester(:rotate_y,
       'POLYGON Z ((0 0 0, 0 0 5, 0 5 5, 0 5 0, 0 0 0))',
       wkt,
-      Math::PI + Math::PI / 2)
+      Math::PI + (Math::PI / 2))
 
     affine_tester(:rotate_y,
       wkt,
@@ -196,7 +195,7 @@ class PolygonTests < Minitest::Test
     affine_tester(:rotate_z,
       'POLYGON ((0 0, 0 -5, 5 -5, 5 0, 0 0))',
       'POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0))',
-      Math::PI + Math::PI / 2)
+      Math::PI + (Math::PI / 2))
 
     affine_tester(:rotate_z,
       'POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0))',

data/test/prepared_geometry_tests.rb

@@ -17,14 +17,14 @@ class PreparedGeometryTests < Minitest::Test
 
   def relationship_tester(method, *expected)
     [
-      [ POINT_A, POINT_A ],
-      [ POINT_A, LINESTRING_A ],
-      [ POINT_B, LINESTRING_A ],
-      [ LINESTRING_B, LINESTRING_A ],
-      [ LINESTRING_C, LINESTRING_A ],
-      [ LINESTRING_D, LINESTRING_A ],
-      [ POLYGON_A, POLYGON_B ],
-      [ POLYGON_A, POINT_C ]
+      [POINT_A, POINT_A],
+      [POINT_A, LINESTRING_A],
+      [POINT_B, LINESTRING_A],
+      [LINESTRING_B, LINESTRING_A],
+      [LINESTRING_C, LINESTRING_A],
+      [LINESTRING_D, LINESTRING_A],
+      [POLYGON_A, POLYGON_B],
+      [POLYGON_A, POINT_C]
     ].each_with_index do |(geom_a, geom_b), i|
       geom_a = read(geom_a).to_prepared
       geom_b = read(geom_b)

data/test/strtree_tests.rb

@@ -8,7 +8,7 @@ class STRtreeTests < Minitest::Test
   def setup_tree
     @tree = Geos::STRtree.new(3)
     @item_1 = { item_1: :test }
-    @item_2 = [ :test ]
+    @item_2 = [:test]
     @item_3 = Object.new
 
     @geom_1 = read('LINESTRING(0 0, 10 10)')
@@ -183,9 +183,9 @@ class STRtreeTests < Minitest::Test
     skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree)
 
     tree = Geos::STRtree.new(
-      [ read('LINESTRING(0 0, 10 10)'), item_1 = { item_1: :test } ],
-      [ read('LINESTRING(20 20, 30 30)'), item_2 = [ :test ] ],
-      [ read('LINESTRING(20 20, 30 30)'), item_3 = Object.new ]
+      [read('LINESTRING(0 0, 10 10)'), item_1 = { item_1: :test }],
+      [read('LINESTRING(20 20, 30 30)'), item_2 = [:test]],
+      [read('LINESTRING(20 20, 30 30)'), item_3 = Object.new]
     )
 
     assert_equal([item_1],
@@ -233,7 +233,7 @@ class STRtreeTests < Minitest::Test
   end
 
   def test_nearest
-    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest)
+    skip unless ENV['FORCE_TESTS'] || (defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest))
 
     geom_1 = read('POINT (3 3)')
     geom_2 = read('POINT (2 7)')
@@ -250,7 +250,7 @@ class STRtreeTests < Minitest::Test
   end
 
   def test_nearest_with_depth
-    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest)
+    skip unless ENV['FORCE_TESTS'] || (defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest))
 
     number_of_geoms = 100
     geoms = []
@@ -284,7 +284,7 @@ class STRtreeTests < Minitest::Test
   end
 
   def test_nearest_with_empty_tree
-    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest)
+    skip unless ENV['FORCE_TESTS'] || (defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest))
 
     tree = Geos::STRtree.new(10)
     geom_1 = read('POINT (3 3)')
@@ -294,7 +294,7 @@ class STRtreeTests < Minitest::Test
   end
 
   def test_nearest_with_some_empty_geometries
-    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest)
+    skip unless ENV['FORCE_TESTS'] || (defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest))
 
     geom_1 = read('LINESTRING EMPTY')
     geom_2 = read('POINT (2 7)')
@@ -312,7 +312,8 @@ class STRtreeTests < Minitest::Test
   end
 
   def test_nearest_with_only_empty_geometries
-    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest)
+    skip unless ENV['FORCE_TESTS'] || (defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest))
+    skip if Geos::GEOS_NICE_VERSION > '030900'
 
     geom_1 = read('LINESTRING EMPTY')
     geom_2 = read('POINT (2 7)')
@@ -326,7 +327,7 @@ class STRtreeTests < Minitest::Test
   end
 
   def test_disallowed_inserts_on_nearest
-    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest)
+    skip unless ENV['FORCE_TESTS'] || (defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest))
 
     setup_tree
 
@@ -338,7 +339,7 @@ class STRtreeTests < Minitest::Test
   end
 
   def test_nearest_item
-    skip unless ENV['FORCE_TESTS'] || defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest_item)
+    skip unless ENV['FORCE_TESTS'] || (defined?(Geos::STRtree) && Geos::STRtree.method_defined?(:nearest_item))
 
     geom_1 = read('POINT (3 3)')
     geom_2 = read('POINT (2 7)')
@@ -346,7 +347,7 @@ class STRtreeTests < Minitest::Test
     geom_4 = read('POINT (3 8)')
 
     item_1 = { item_1: :test }
-    item_2 = [ :test ]
+    item_2 = [:test]
     item_3 = Object.new
 
     tree = Geos::STRtree.new(2)

data/test/test_helper.rb

@@ -1,19 +1,17 @@
-# encoding: BINARY; frozen_string_literal: true
+# frozen_string_literal: true
 
-if RUBY_VERSION >= '1.9'
-  require 'simplecov'
+require 'simplecov'
 
-  SimpleCov.command_name('Unit Tests')
-  SimpleCov.merge_timeout(3600)
-  SimpleCov.start do
-    add_filter '/test/'
-    add_filter '/.bundle/'
-  end
+SimpleCov.command_name('Unit Tests')
+SimpleCov.merge_timeout(3600)
+SimpleCov.start do
+  add_filter '/test/'
+  add_filter '/.bundle/'
 end
 
 require 'rubygems'
 require 'minitest/autorun'
-require 'minitest/reporters' if RUBY_VERSION >= '1.9'
+require 'minitest/reporters'
 
 if ENV['USE_BINARY_GEOS']
   require 'geos'
@@ -25,17 +23,28 @@ puts "Ruby version #{RUBY_VERSION}-p#{RUBY_PATCHLEVEL} - #{RbConfig::CONFIG['RUB
 puts "ffi version #{Gem.loaded_specs['ffi'].version}" if Gem.loaded_specs['ffi']
 
 if Geos.respond_to?(:version)
-  puts "GEOS version #{Geos.version}"
+  puts "GEOS version #{Geos.version} (#{Geos::GEOS_NICE_VERSION})"
 else
-  puts "GEOS version #{Geos::GEOS_VERSION}"
+  puts "GEOS version #{Geos::GEOS_VERSION} (#{Geos::GEOS_NICE_VERSION})"
 end
 
 puts "ffi-geos version #{Geos::VERSION}" if defined?(Geos::VERSION)
 puts "Using #{Geos::FFIGeos.geos_library_path}" if defined?(Geos::FFIGeos)
+puts "Process #{$PID}"
 
 module TestHelper
   TOLERANCE = 0.0000000000001
 
+  EMPTY_GEOMETRY = if Geos::GEOS_NICE_VERSION >= '030800'
+    'POINT EMPTY'
+  else
+    'GEOMETRYCOLLECTION EMPTY'
+  end
+
+  EMPTY_BLOCK = proc do
+    # no-op
+  end
+
   def self.included(base)
     base.class_eval do
       attr_reader :reader, :reader_hex, :writer
@@ -49,16 +58,16 @@ module TestHelper
     @writer = Geos::WktWriter.new
   end
 
-  def read(*args)
-    if args[0][0] != '0'
-      reader.read(*args)
+  def read(*args, **options)
+    if args[0][0] == '0'
+      reader_hex.read_hex(*args, **options)
     else
-      reader_hex.read_hex(*args)
+      reader.read(*args, **options)
     end
   end
 
-  def write(*args)
-    writer.write(*args)
+  def write(*args, **options)
+    writer.write(*args, **options)
   end
 
   def geom_from_geom_or_wkt(geom_or_wkt)
@@ -69,11 +78,12 @@ module TestHelper
     end
   end
 
-  def srid_copy_tester(method, expected, expected_srid, srid_policy, wkt, *args)
+  def srid_copy_tester(method, expected, expected_srid, srid_policy, wkt, *args, **options)
     geom = read(wkt)
     geom.srid = 4326
     Geos.srid_copy_policy = srid_policy
-    geom_b = geom.send(method, *args)
+
+    geom_b = geom.__safe_send__(method, *args, **options)
     assert_equal(4326, geom.srid)
     assert_equal(expected_srid, geom_b.srid)
     assert_equal(expected, write(geom_b))
@@ -104,90 +114,98 @@ module TestHelper
     assert(geom.eql_exact?(result, tolerance), "Expected geom.eql_exact? to be within #{tolerance}")
   end
 
-  def snapped_tester(method, expected, geom, *args)
+  def snapped_tester(method, expected, geom, *args, **options)
     geom = geom_from_geom_or_wkt(geom)
 
-    result = geom.send(method, *args)
+    result = geom.__safe_send__(method, *args, **options)
     assert_equal(expected, write(result.snap_to_grid(1)))
   end
 
-  def simple_tester(method, expected, geom, *args)
+  def simple_tester(method, expected, geom, *args, **options)
     geom = geom_from_geom_or_wkt(geom)
-    result = geom.send(method, *args)
+
+    result = geom.__safe_send__(method, *args, **options)
     result = write(result) if result.is_a?(Geos::Geometry)
 
-    assert_equal(expected, result)
+    if expected.nil?
+      assert_nil(result)
+    else
+      assert_equal(expected, result)
+    end
   end
 
-  def simple_bang_tester(method, expected, wkt, *args)
+  def simple_bang_tester(method, expected, wkt, *args, **options)
     geom = read(wkt)
-    result = geom.send(method, *args)
+    result = geom.__safe_send__(method, *args, **options)
 
     assert_equal(wkt, write(geom))
     assert_equal(expected, write(result))
 
     geom = read(wkt)
-    geom.send("#{method}!", *args)
+    geom.__safe_send__("#{method}!", *args, **options)
 
     assert_equal(expected, write(geom))
   end
 
-  def comparison_tester(method, expected, geom_a, geom_b, *args)
-    geom_a = geom_from_geom_or_wkt(geom_a)
-    geom_b = geom_from_geom_or_wkt(geom_b)
+  def comparison_tester(method, expected, geom_a, geom_b, *args, **options)
+    geom_a = geom_from_geom_or_wkt(geom_a).normalize
+    geom_b = geom_from_geom_or_wkt(geom_b).normalize
 
-    simple_tester(method, expected, geom_a, geom_b, *args)
+    simple_tester(method, expected, geom_a, geom_b, *args, **options)
   end
 
-  def array_tester(method, expected, geom, *args)
+  def array_tester(method, expected, geom, *args, **options)
     geom = geom_from_geom_or_wkt(geom)
-    result = geom.send(method, *args)
+    result = geom.__safe_send__(method, *args, **options)
 
     case result
       when Geos::Geometry
-        result = [ write(result) ]
+        result = [write(result)]
       when Array
-        result = result.collect { |r|
+        result = result.collect do |r|
           write(r)
-        }
+        end
     end
 
     assert_equal(expected, result)
   end
 
-  def affine_tester(method, expected, wkt, *args)
+  def affine_tester(method, expected, wkt, *args, **options)
     writer.trim = true
 
     geom = read(wkt)
-    geom.send("#{method}!", *args).snap_to_grid!(0.1)
+    geom.__safe_send__("#{method}!", *args, **options).snap_to_grid!(0.1)
 
     assert_equal(expected, write(geom))
 
     geom = read(wkt)
-    geom2 = geom.send(method, *args).snap_to_grid(0.1)
+    geom_2 = geom.__safe_send__(method, *args, **options).snap_to_grid(0.1)
 
     assert_equal(wkt, write(geom))
-    assert_equal(expected, write(geom2, :trim => true))
+    assert_equal(expected, write(geom_2, trim: true))
   end
 end
 
-if RUBY_VERSION >= '1.9'
-  Minitest::Reporters.use!(Minitest::Reporters::SpecReporter.new)
-end
-
-if !Fixnum.method_defined?(:negative?)
-  class Fixnum
-    def negative?
-      self < 0
+class Object
+  if RUBY_VERSION >= '2.7'
+    def __safe_send__(method_name, *args, **kwargs)
+      send(method_name, *args, **kwargs)
     end
-  end
-end
-
-if !Fixnum.method_defined?(:positive?)
-  class Fixnum
-    def positive?
-      self > 0
+  else
+    def __safe_send__(method_name, *args, **kwargs)
+      raise NoMethodError unless respond_to?(method_name)
+
+      arity = method(method_name).arity
+
+      if arity.zero?
+        send(method_name)
+      elsif arity.negative? && !kwargs.empty?
+        send(method_name, *args, **kwargs)
+      else
+        send(method_name, *args)
+      end
     end
   end
 end
 
+Minitest::Reporters.use!(Minitest::Reporters::SpecReporter.new)