ffi-geos 0.5.0 → 1.0.0

data/test/interrupt_tests.rb

@@ -3,7 +3,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class InterruptTests < MiniTest::Unit::TestCase
+class InterruptTests < Minitest::Test
   include TestHelper
 
   def interrupt_method

data/test/line_string_tests.rb

@@ -3,9 +3,14 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class LineStringTests < MiniTest::Unit::TestCase
+class LineStringTests < Minitest::Test
   include TestHelper
 
+  def setup
+    super
+    writer.trim = true
+  end
+
   def test_default_srid
     geom = read('LINESTRING (0 0, 10 10)')
     assert_equal(0, geom.srid)
@@ -33,7 +38,6 @@ class LineStringTests < MiniTest::Unit::TestCase
   def test_line_string_array
     skip unless ENV['FORCE_TESTS'] || Geos::LineString.method_defined?(:[])
 
-    writer.trim = true
     geom = read('LINESTRING(0 0, 1 1, 2 2, 3 3, 4 4)')
 
     assert_equal('POINT (0 0)', write(geom[0]))
@@ -55,7 +59,6 @@ class LineStringTests < MiniTest::Unit::TestCase
   def test_line_string_enumerable
     skip unless ENV['FORCE_TESTS'] || Geos::LineString.method_defined?(:select)
 
-    writer.trim = true
     geom = read('LINESTRING(0 0, 1 1, 2 2, 3 3, 10 0, 2 2)')
 
     assert_equal(2, geom.select { |point| point == read('POINT(2 2)') }.length)
@@ -64,17 +67,9 @@ class LineStringTests < MiniTest::Unit::TestCase
   def test_offset_curve
     skip unless ENV['FORCE_TESTS'] || Geos::LineString.method_defined?(:offset_curve)
 
-    tester = lambda { |expected, g, width, style|
-      geom = read(g)
-      buffered = geom.offset_curve(width, style)
-
-      assert_equal(expected, write(buffered))
-    }
-
-    writer.rounding_precision = 0
-
     # straight left
-    tester[
+    simple_tester(
+      :offset_curve,
       'LINESTRING (0 2, 10 2)',
       'LINESTRING (0 0, 10 0)',
       2, {
@@ -82,10 +77,11 @@ class LineStringTests < MiniTest::Unit::TestCase
         :join => :round,
         :mitre_limit => 2
       }
-    ]
+    )
 
     # straight right
-    tester[
+    simple_tester(
+      :offset_curve,
       'LINESTRING (10 -2, 0 -2)',
       'LINESTRING (0 0, 10 0)',
       -2, {
@@ -93,10 +89,11 @@ class LineStringTests < MiniTest::Unit::TestCase
         :join => :round,
         :mitre_limit => 2
       }
-    ]
+    )
 
     # outside curve
-    tester[
+    simple_tester(
+      :offset_curve,
       'LINESTRING (12 10, 12 0, 10 -2, 0 -2)',
       'LINESTRING (0 0, 10 0, 10 10)',
       -2, {
@@ -104,10 +101,11 @@ class LineStringTests < MiniTest::Unit::TestCase
         :join => :round,
         :mitre_limit => 2
       }
-    ]
+    )
 
     # inside curve
-    tester[
+    simple_tester(
+      :offset_curve,
       'LINESTRING (0 2, 8 2, 8 10)',
       'LINESTRING (0 0, 10 0, 10 10)',
       2, {
@@ -115,7 +113,7 @@ class LineStringTests < MiniTest::Unit::TestCase
         :join => :round,
         :mitre_limit => 2
       }
-    ]
+    )
   end
 
   def test_closed
@@ -139,30 +137,60 @@ class LineStringTests < MiniTest::Unit::TestCase
   def test_point_n
     skip unless ENV['FORCE_TESTS'] || Geos::LineString.method_defined?(:point_n)
 
-    writer.rounding_precision = 0
-
-    tester = lambda { |expected, geom, n|
-      assert_equal(expected, write(geom.point_n(n)))
-    }
-
     geom = read('LINESTRING (10 10, 10 14, 14 14, 14 10)')
-    tester['POINT (10 10)', geom, 0]
-    tester['POINT (10 14)', geom, 1]
-    tester['POINT (14 14)', geom, 2]
-    tester['POINT (14 10)', geom, 3]
+    simple_tester(:point_n, 'POINT (10 10)', geom, 0)
+    simple_tester(:point_n, 'POINT (10 14)', geom, 1)
+    simple_tester(:point_n, 'POINT (14 14)', geom, 2)
+    simple_tester(:point_n, 'POINT (14 10)', geom, 3)
 
-    assert_raises(RuntimeError) do
-      tester['POINT (0 0)', geom, 4]
+    assert_raises(Geos::IndexBoundsError) do
+      geom.point_n(4)
     end
 
     geom = read('LINEARRING (11 11, 11 12, 12 11, 11 11)')
-    tester['POINT (11 11)', geom, 0]
-    tester['POINT (11 12)', geom, 1]
-    tester['POINT (12 11)', geom, 2]
-    tester['POINT (11 11)', geom, 3]
+    simple_tester(:point_n, 'POINT (11 11)', geom, 0)
+    simple_tester(:point_n, 'POINT (11 12)', geom, 1)
+    simple_tester(:point_n, 'POINT (12 11)', geom, 2)
+    simple_tester(:point_n, 'POINT (11 11)', geom, 3)
 
     assert_raises(NoMethodError) do
-      tester[nil, read('POINT (0 0)'), 0]
+      read('POINT (0 0)').point_n(0)
     end
   end
+
+  def test_to_linear_ring
+    simple_tester(:to_linear_ring, 'LINEARRING (0 0, 0 5, 5 5, 5 0, 0 0)', 'LINESTRING (0 0, 0 5, 5 5, 5 0, 0 0)')
+    simple_tester(:to_linear_ring, 'LINEARRING (0 0, 0 5, 5 5, 5 0, 0 0)', 'LINESTRING (0 0, 0 5, 5 5, 5 0)')
+
+    writer.output_dimensions = 3
+    simple_tester(:to_linear_ring, 'LINEARRING Z (0 0 0, 0 5 0, 5 5 0, 5 0 0, 0 0 0)', 'LINESTRING Z (0 0 0, 0 5 0, 5 5 0, 5 0 0, 0 0 0)')
+    simple_tester(:to_linear_ring, 'LINEARRING Z (0 0 0, 0 5 0, 5 5 0, 5 0 0, 0 0 0)', 'LINESTRING Z (0 0 0, 0 5 0, 5 5 0, 5 0 0)')
+  end
+
+  def test_to_linear_ring_with_srid
+    wkt = 'LINESTRING (0 0, 5 0, 5 5, 0 5, 0 0)'
+    expected = 'LINEARRING (0 0, 5 0, 5 5, 0 5, 0 0)'
+
+    srid_copy_tester(:to_linear_ring, expected, 0, :zero, wkt)
+    srid_copy_tester(:to_linear_ring, expected, 4326, :lenient, wkt)
+    srid_copy_tester(:to_linear_ring,  expected, 4326, :strict, wkt)
+  end
+
+  def test_to_polygon
+    simple_tester(:to_polygon, 'POLYGON ((0 0, 0 5, 5 5, 5 0, 0 0))', 'LINESTRING (0 0, 0 5, 5 5, 5 0, 0 0)')
+    simple_tester(:to_polygon, 'POLYGON ((0 0, 0 5, 5 5, 5 0, 0 0))', 'LINESTRING (0 0, 0 5, 5 5, 5 0)')
+
+    writer.output_dimensions = 3
+    simple_tester(:to_polygon, 'POLYGON Z ((0 0 0, 0 5 0, 5 5 0, 5 0 0, 0 0 0))', 'LINESTRING Z (0 0 0, 0 5 0, 5 5 0, 5 0 0, 0 0 0)')
+    simple_tester(:to_polygon, 'POLYGON Z ((0 0 0, 0 5 0, 5 5 0, 5 0 0, 0 0 0))', 'LINESTRING Z (0 0 0, 0 5 0, 5 5 0, 5 0 0)')
+  end
+
+  def test_to_polygon_with_srid
+    wkt = 'LINESTRING (0 0, 5 0, 5 5, 0 5, 0 0)'
+    expected = 'POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0))'
+
+    srid_copy_tester(:to_polygon, expected, 0, :zero, wkt)
+    srid_copy_tester(:to_polygon, expected, 4326, :lenient, wkt)
+    srid_copy_tester(:to_polygon,  expected, 4326, :strict, wkt)
+  end
 end

data/test/linear_ring_tests.rb

@@ -3,7 +3,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class LinearRingTests < MiniTest::Unit::TestCase
+class LinearRingTests < Minitest::Test
   include TestHelper
 
   def setup
@@ -26,8 +26,6 @@ class LinearRingTests < MiniTest::Unit::TestCase
   end
 
   def test_to_polygon_with_srid
-    writer.trim = true
-
     wkt = 'LINEARRING (0 0, 5 0, 5 5, 0 5, 0 0)'
     expected = 'POLYGON ((0 0, 5 0, 5 5, 0 5, 0 0))'
 
@@ -35,4 +33,13 @@ class LinearRingTests < MiniTest::Unit::TestCase
     srid_copy_tester(:to_polygon, expected, 4326, :lenient, wkt)
     srid_copy_tester(:to_polygon,  expected, 4326, :strict, wkt)
   end
+
+  def test_to_line_string_with_srid
+    wkt = 'LINEARRING (0 0, 5 0, 5 5, 0 5, 0 0)'
+    expected = 'LINESTRING (0 0, 5 0, 5 5, 0 5, 0 0)'
+
+    srid_copy_tester(:to_line_string, expected, 0, :zero, wkt)
+    srid_copy_tester(:to_line_string, expected, 4326, :lenient, wkt)
+    srid_copy_tester(:to_line_string,  expected, 4326, :strict, wkt)
+  end
 end

data/test/misc_tests.rb

@@ -3,7 +3,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class MiscTests < MiniTest::Unit::TestCase
+class MiscTests < Minitest::Test
   include TestHelper
 
   def thread_tester(name, dims, byte_order, polygon, pause)

data/test/point_tests.rb

@@ -3,9 +3,14 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class PointTests < MiniTest::Unit::TestCase
+class PointTests < Minitest::Test
   include TestHelper
 
+  def setup
+    super
+    writer.trim = true
+  end
+
   def test_default_srid
     geom = read('POINT(0 0)')
     assert_equal(0, geom.srid)

data/test/polygon_tests.rb

@@ -3,12 +3,12 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class PolygonTests < MiniTest::Unit::TestCase
+class PolygonTests < Minitest::Test
   include TestHelper
 
   def setup
     super
-    writer.rounding_precision = 2
+    writer.trim = true
   end
 
   def test_default_srid

data/test/prepared_geometry_tests.rb

@@ -3,7 +3,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class PreparedGeometryTests < MiniTest::Unit::TestCase
+class PreparedGeometryTests < Minitest::Test
   include TestHelper
 
   POINT_A = 'POINT(0 0)'

data/test/strtree_tests.rb

@@ -3,7 +3,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class STRtreeTests < MiniTest::Unit::TestCase
+class STRtreeTests < Minitest::Test
   include TestHelper
 
   def setup_tree
@@ -28,7 +28,7 @@ class STRtreeTests < MiniTest::Unit::TestCase
 
     @tree.query(read('POINT(5 5)'))
 
-    assert_raises(RuntimeError) do
+    assert_raises(Geos::STRtree::AlreadyBuiltError) do
       @tree.insert(read('POINT(0 0)'), 'test')
     end
   end

data/test/test_helper.rb

@@ -59,13 +59,19 @@ module TestHelper
     writer.write(*args)
   end
 
+  def geom_from_geom_or_wkt(geom_or_wkt)
+    if geom_or_wkt.is_a?(String)
+      read(geom_or_wkt)
+    else
+      geom_or_wkt
+    end
+  end
+
   def srid_copy_tester(method, expected, expected_srid, srid_policy, wkt, *args)
     geom = read(wkt)
     geom.srid = 4326
-
     Geos.srid_copy_policy = srid_policy
     geom_b = geom.send(method, *args)
-
     assert_equal(4326, geom.srid)
     assert_equal(expected_srid, geom_b.srid)
     assert_equal(expected, write(geom_b))
@@ -95,9 +101,56 @@ module TestHelper
   def assert_geom_eql_exact(geom, result, tolerance = TOLERANCE)
     assert(geom.eql_exact?(result, tolerance), "Expected geom.eql_exact? to be within #{tolerance}")
   end
+
+  def simple_tester(method, expected, geom, *args)
+    geom = geom_from_geom_or_wkt(geom)
+    result = geom.send(method, *args)
+
+    if result.is_a?(Geos::Geometry)
+      result = write(result)
+    end
+
+    assert_equal(expected, result)
+  end
+
+  def simple_bang_tester(method, expected, wkt, *args)
+    geom = read(wkt)
+    result = geom.send(method, *args)
+
+    assert_equal(wkt, write(geom))
+    assert_equal(expected, write(result))
+
+    geom = read(wkt)
+    geom.send("#{method}!", *args)
+
+    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)
+
+    simple_tester(method, expected, geom_a, geom_b, *args)
+  end
+
+  def array_tester(method, expected, geom, *args)
+    geom = geom_from_geom_or_wkt(geom)
+    result = geom.send(method, *args)
+
+    case result
+      when Geos::Geometry
+        result = [ write(result) ]
+      when Array
+        result = result.collect { |r|
+          write(r)
+        }
+    end
+
+    assert_equal(expected, result)
+  end
 end
 
 if RUBY_VERSION >= '1.9'
-  MiniTest::Reporters.use!(MiniTest::Reporters::SpecReporter.new)
+  Minitest::Reporters.use!(Minitest::Reporters::SpecReporter.new)
 end
 

data/test/tools_tests.rb

@@ -3,7 +3,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class ToolsTests < MiniTest::Unit::TestCase
+class ToolsTests < Minitest::Test
   include TestHelper
 
   def test_check_geometry
@@ -16,7 +16,7 @@ class ToolsTests < MiniTest::Unit::TestCase
     assert(Geos::Tools.bool_result(1))
     refute(Geos::Tools.bool_result(0))
 
-    assert_raises(RuntimeError) do
+    assert_raises(Geos::UnexpectedBooleanResultError) do
       Geos::Tools.bool_result(-1)
     end
   end

data/test/utils_tests.rb

@@ -3,9 +3,14 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class UtilsTests < MiniTest::Unit::TestCase
+class UtilsTests < Minitest::Test
   include TestHelper
 
+  def setup
+    super
+    writer.trim = true
+  end
+
   def test_orientation_index
     skip unless ENV['FORCE_TESTS'] || (defined?(Geos::Utils) && Geos::Utils.respond_to?(:orientation_index))
 
@@ -44,19 +49,16 @@ class UtilsTests < MiniTest::Unit::TestCase
   end
 
   def test_create_point
-    cs = Geos::CoordinateSequence.new(1, 2)
-    cs.set_x(0, 10)
-    cs.set_y(0, 20)
-
-    create_method_tester('POINT(10 20)', :create_point, cs, Geos::GEOS_POINT, Geos::Point)
+    cs = Geos::CoordinateSequence.new([[ 10, 20 ]])
+    create_method_tester('POINT (10 20)', :create_point, cs, Geos::GEOS_POINT, Geos::Point)
   end
 
   def test_create_point_with_x_and_y_arguments
-    assert_equal('POINT (10 20)', write(Geos.create_point(10, 20), :trim => true))
+    assert_equal('POINT (10 20)', write(Geos.create_point(10, 20)))
   end
 
   def test_create_point_with_x_y_and_z_arguments
-    assert_equal('POINT Z (10 20 30)', write(Geos.create_point(10, 20, 30), :trim => true, :output_dimensions => 3))
+    assert_equal('POINT Z (10 20 30)', write(Geos.create_point(10, 20, 30), :output_dimensions => 3))
   end
 
   def test_create_point_with_too_many_arguments
@@ -67,22 +69,21 @@ class UtilsTests < MiniTest::Unit::TestCase
 
   def test_bad_create_point
     cs = Geos::CoordinateSequence.new(0, 0)
-    assert_raises(RuntimeError) do
+    assert_raises(ArgumentError) do
       Geos.create_point(cs)
     end
   end
 
   def test_create_line_string
-    cs = Geos::CoordinateSequence.new(2, 3)
-    cs.set_x(0, 10)
-    cs.set_y(0, 20)
-    cs.set_z(0, 30)
-    cs.set_x(1, 30)
-    cs.set_y(1, 20)
-    cs.set_z(1, 10)
+    cs = Geos::CoordinateSequence.new([
+     [ 10, 20, 30 ],
+     [ 30, 20, 10 ]
+    ])
+
+    writer.output_dimensions = 3
 
     create_method_tester(
-      'LINESTRING (10 20 30, 30 20 10)',
+      'LINESTRING Z (10 20 30, 30 20 10)',
       :create_line_string,
       cs,
       Geos::GEOS_LINESTRING,
@@ -118,28 +119,23 @@ class UtilsTests < MiniTest::Unit::TestCase
 
   def test_create_bad_line_string
     cs = Geos::CoordinateSequence.new(1, 0)
-    assert_raises(RuntimeError) do
+    assert_raises(ArgumentError) do
       Geos::create_line_string(cs)
     end
   end
 
   def test_create_linear_ring
-    cs = Geos::CoordinateSequence.new(4,3)
-    cs.set_x(0, 7)
-    cs.set_y(0, 8)
-    cs.set_z(0, 9)
-    cs.set_x(1, 3)
-    cs.set_y(1, 3)
-    cs.set_z(1, 3)
-    cs.set_x(2, 11)
-    cs.set_y(2, 15.2)
-    cs.set_z(2, 2)
-    cs.set_x(3, 7)
-    cs.set_y(3, 8)
-    cs.set_z(3, 9)
+    cs = Geos::CoordinateSequence.new([
+      [ 7, 8, 9 ],
+      [ 3, 3, 3 ],
+      [ 11, 15.2, 2 ],
+      [ 7, 8, 9 ]
+    ])
+
+    writer.output_dimensions = 3
 
     create_method_tester(
-      'LINEARRING (7 8 9, 3 3 3, 11 15.2 2, 7 8 9)',
+      'LINEARRING Z (7 8 9, 3 3 3, 11 15.2 2, 7 8 9)',
       :create_linear_ring,
       cs,
       Geos::GEOS_LINEARRING,
@@ -176,7 +172,7 @@ class UtilsTests < MiniTest::Unit::TestCase
   def test_bad_create_linear_ring
     cs = Geos::CoordinateSequence.new(1, 0)
 
-    assert_raises(RuntimeError) do
+    assert_raises(ArgumentError) do
       Geos::create_linear_ring(cs)
     end
   end
@@ -196,7 +192,7 @@ class UtilsTests < MiniTest::Unit::TestCase
     assert_instance_of(Geos::Polygon, geom)
     assert_equal('Polygon', geom.geom_type)
     assert_equal(Geos::GEOS_POLYGON, geom.type_id)
-    assert_equal('POLYGON ((0 0, 0 10, 10 10, 10 0, 0 0))', write(geom, :trim => true))
+    assert_equal('POLYGON ((0 0, 0 10, 10 10, 10 0, 0 0))', write(geom))
   end
 
   def test_create_polygon_with_coordinate_sequences
@@ -220,7 +216,7 @@ class UtilsTests < MiniTest::Unit::TestCase
     assert_instance_of(Geos::Polygon, geom)
     assert_equal('Polygon', geom.geom_type)
     assert_equal(Geos::GEOS_POLYGON, geom.type_id)
-    assert_equal('POLYGON ((0 0, 0 10, 10 10, 10 0, 0 0), (2 2, 2 4, 4 4, 4 2, 2 2))', write(geom, :trim => true))
+    assert_equal('POLYGON ((0 0, 0 10, 10 10, 10 0, 0 0), (2 2, 2 4, 4 4, 4 2, 2 2))', write(geom))
   end
 
   def test_create_polygon_with_holes
@@ -265,7 +261,6 @@ class UtilsTests < MiniTest::Unit::TestCase
   def test_create_multi_point
     skip unless ENV['FORCE_TESTS'] || Geos.respond_to?(:create_multi_point)
 
-    writer.rounding_precision = 0
     assert_equal('MULTIPOINT EMPTY', write(Geos.create_multi_point))
     assert_equal('MULTIPOINT (0 0, 10 10)', write(Geos.create_multi_point(
       read('POINT(0 0)'),
@@ -287,7 +282,6 @@ class UtilsTests < MiniTest::Unit::TestCase
   def test_create_multi_line_string
     skip unless ENV['FORCE_TESTS'] || Geos.respond_to?(:create_multi_line_string)
 
-    writer.rounding_precision = 0
     assert_equal('MULTILINESTRING EMPTY', write(Geos.create_multi_line_string))
     assert_equal('MULTILINESTRING ((0 0, 10 10), (10 10, 20 20))', write(Geos.create_multi_line_string(
       read('LINESTRING(0 0, 10 10)'),
@@ -309,7 +303,6 @@ class UtilsTests < MiniTest::Unit::TestCase
   def test_create_multi_polygon
     skip unless ENV['FORCE_TESTS'] || Geos.respond_to?(:create_multi_polygon)
 
-    writer.rounding_precision = 0
     assert_equal('MULTIPOLYGON EMPTY', write(Geos.create_multi_polygon))
     assert_equal('MULTIPOLYGON (((0 0, 0 5, 5 5, 5 0, 0 0)), ((10 10, 10 15, 15 15, 15 10, 10 10)))', write(Geos.create_multi_polygon(
       read('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'),
@@ -331,7 +324,6 @@ class UtilsTests < MiniTest::Unit::TestCase
   def test_create_geometry_collection
     skip unless ENV['FORCE_TESTS'] || Geos.respond_to?(:create_geometry_collection)
 
-    writer.rounding_precision = 0
     assert_equal('GEOMETRYCOLLECTION EMPTY', write(Geos.create_geometry_collection))
     assert_equal('GEOMETRYCOLLECTION (POLYGON ((0 0, 0 5, 5 5, 5 0, 0 0)), POLYGON ((10 10, 10 15, 15 15, 15 10, 10 10)))',
       write(Geos.create_geometry_collection(
@@ -423,25 +415,25 @@ class UtilsTests < MiniTest::Unit::TestCase
     # GEOS taking ownership of CoordinateSequences and deleting them out from
     # under us and GC blowing up.
 
-    assert_raises(RuntimeError) do
+    assert_raises(ArgumentError) do
       cs = Geos::CoordinateSequence.new(0, 2)
       Geos.create_point(cs)
       GC.start
     end
 
-    assert_raises(RuntimeError) do
+    assert_raises(ArgumentError) do
       cs = Geos::CoordinateSequence.new(1, 2)
       Geos.create_line_string(cs)
       GC.start
     end
 
-    assert_raises(RuntimeError) do
+    assert_raises(ArgumentError) do
       cs = Geos::CoordinateSequence.new(1, 2)
       Geos.create_linear_ring(cs)
       GC.start
     end
 
-    assert_raises(RuntimeError) do
+    assert_raises(Geos::GEOSException) do
       cs = Geos::CoordinateSequence.new([
         [0, 0],
         [0, 5],