tests, move pg geometric tests out of `base_test`.

3 files changed, 73 insertions, 106 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/geometric_test.rb b/activerecord/test/cases/adapters/postgresql/geometric_test.rb
index 6c0adbbeaa..228221e034 100644
--- a/activerecord/test/cases/adapters/postgresql/geometric_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/geometric_test.rb
@@ -11,12 +11,10 @@ class PostgresqlPointTest < ActiveRecord::TestCase
 
   def setup
     @connection = ActiveRecord::Base.connection
-    @connection.transaction do
-      @connection.create_table('postgresql_points') do |t|
-        t.point :x
-        t.point :y, default: [12.2, 13.3]
-        t.point :z, default: "(14.4,15.5)"
-      end
+    @connection.create_table('postgresql_points') do |t|
+      t.point :x
+      t.point :y, default: [12.2, 13.3]
+      t.point :z, default: "(14.4,15.5)"
     end
   end
 
@@ -70,3 +68,72 @@ class PostgresqlPointTest < ActiveRecord::TestCase
     assert_not p.changed?
   end
 end
+
+class PostgresqlGeometricTest < ActiveRecord::TestCase
+  class PostgresqlGeometric < ActiveRecord::Base; end
+
+  setup do
+    @connection = ActiveRecord::Base.connection
+    @connection.create_table("postgresql_geometrics") do |t|
+      t.column :a_line_segment, :lseg
+      t.column :a_box, :box
+      t.column :a_path, :path
+      t.column :a_polygon, :polygon
+      t.column :a_circle, :circle
+    end
+  end
+
+  teardown do
+    @connection.execute 'DROP TABLE IF EXISTS postgresql_geometrics'
+  end
+
+  def test_geometric_types
+    g = PostgresqlGeometric.new(
+      :a_line_segment => '(2.0, 3), (5.5, 7.0)',
+      :a_box          => '2.0, 3, 5.5, 7.0',
+      :a_path         => '[(2.0, 3), (5.5, 7.0), (8.5, 11.0)]',
+      :a_polygon      => '((2.0, 3), (5.5, 7.0), (8.5, 11.0))',
+      :a_circle       => '<(5.3, 10.4), 2>'
+    )
+
+    g.save!
+
+    h = PostgresqlGeometric.find(g.id)
+
+    assert_equal '[(2,3),(5.5,7)]', h.a_line_segment
+    assert_equal '(5.5,7),(2,3)', h.a_box # reordered to store upper right corner then bottom left corner
+    assert_equal '[(2,3),(5.5,7),(8.5,11)]', h.a_path
+    assert_equal '((2,3),(5.5,7),(8.5,11))', h.a_polygon
+    assert_equal '<(5.3,10.4),2>', h.a_circle
+  end
+
+  def test_alternative_format
+    g = PostgresqlGeometric.new(
+      :a_line_segment => '((2.0, 3), (5.5, 7.0))',
+      :a_box          => '(2.0, 3), (5.5, 7.0)',
+      :a_path         => '((2.0, 3), (5.5, 7.0), (8.5, 11.0))',
+      :a_polygon      => '2.0, 3, 5.5, 7.0, 8.5, 11.0',
+      :a_circle       => '((5.3, 10.4), 2)'
+    )
+
+    g.save!
+
+    h = PostgresqlGeometric.find(g.id)
+    assert_equal '[(2,3),(5.5,7)]', h.a_line_segment
+    assert_equal '(5.5,7),(2,3)', h.a_box   # reordered to store upper right corner then bottom left corner
+    assert_equal '((2,3),(5.5,7),(8.5,11))', h.a_path
+    assert_equal '((2,3),(5.5,7),(8.5,11))', h.a_polygon
+    assert_equal '<(5.3,10.4),2>', h.a_circle
+  end
+
+  def test_geometric_function
+    PostgresqlGeometric.create! a_path: '[(2.0, 3), (5.5, 7.0), (8.5, 11.0)]'  # [ ] is an open path
+    PostgresqlGeometric.create! a_path: '((2.0, 3), (5.5, 7.0), (8.5, 11.0))'  # ( ) is a closed path
+
+    objs = PostgresqlGeometric.find_by_sql "SELECT isopen(a_path) FROM postgresql_geometrics ORDER BY id ASC"
+    assert_equal [true, false], objs.map(&:isopen)
+
+    objs = PostgresqlGeometric.find_by_sql "SELECT isclosed(a_path) FROM postgresql_geometrics ORDER BY id ASC"
+    assert_equal [false, true], objs.map(&:isclosed)
+  end
+end
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 098d5b8451..67bb405629 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -898,93 +898,6 @@ class BasicsTest < ActiveRecord::TestCase
         assert_equal 'a text field', default.char3
       end
     end
-
-    class Geometric < ActiveRecord::Base; end
-    def test_geometric_content
-
-      # accepted format notes:
-      # ()'s aren't required
-      # values can be a mix of float or integer
-
-      g = Geometric.new(
-        :a_point        => '(5.0, 6.1)',
-        #:a_line         => '((2.0, 3), (5.5, 7.0))' # line type is currently unsupported in postgresql
-        :a_line_segment => '(2.0, 3), (5.5, 7.0)',
-        :a_box          => '2.0, 3, 5.5, 7.0',
-        :a_path         => '[(2.0, 3), (5.5, 7.0), (8.5, 11.0)]',  # [ ] is an open path
-        :a_polygon      => '((2.0, 3), (5.5, 7.0), (8.5, 11.0))',
-        :a_circle       => '<(5.3, 10.4), 2>'
-      )
-
-      assert g.save
-
-      # Reload and check that we have all the geometric attributes.
-      h = Geometric.find(g.id)
-
-      assert_equal [5.0, 6.1], h.a_point
-      assert_equal '[(2,3),(5.5,7)]', h.a_line_segment
-      assert_equal '(5.5,7),(2,3)', h.a_box   # reordered to store upper right corner then bottom left corner
-      assert_equal '[(2,3),(5.5,7),(8.5,11)]', h.a_path
-      assert_equal '((2,3),(5.5,7),(8.5,11))', h.a_polygon
-      assert_equal '<(5.3,10.4),2>', h.a_circle
-
-      # use a geometric function to test for an open path
-      objs = Geometric.find_by_sql ["select isopen(a_path) from geometrics where id = ?", g.id]
-
-      assert_equal true, objs[0].isopen
-
-      # test alternate formats when defining the geometric types
-
-      g = Geometric.new(
-        :a_point        => '5.0, 6.1',
-        #:a_line         => '((2.0, 3), (5.5, 7.0))' # line type is currently unsupported in postgresql
-        :a_line_segment => '((2.0, 3), (5.5, 7.0))',
-        :a_box          => '(2.0, 3), (5.5, 7.0)',
-        :a_path         => '((2.0, 3), (5.5, 7.0), (8.5, 11.0))',  # ( ) is a closed path
-        :a_polygon      => '2.0, 3, 5.5, 7.0, 8.5, 11.0',
-        :a_circle       => '((5.3, 10.4), 2)'
-      )
-
-      assert g.save
-
-      # Reload and check that we have all the geometric attributes.
-      h = Geometric.find(g.id)
-
-      assert_equal [5.0, 6.1], h.a_point
-      assert_equal '[(2,3),(5.5,7)]', h.a_line_segment
-      assert_equal '(5.5,7),(2,3)', h.a_box   # reordered to store upper right corner then bottom left corner
-      assert_equal '((2,3),(5.5,7),(8.5,11))', h.a_path
-      assert_equal '((2,3),(5.5,7),(8.5,11))', h.a_polygon
-      assert_equal '<(5.3,10.4),2>', h.a_circle
-
-      # use a geometric function to test for an closed path
-      objs = Geometric.find_by_sql ["select isclosed(a_path) from geometrics where id = ?", g.id]
-
-      assert_equal true, objs[0].isclosed
-
-      # test native ruby formats when defining the geometric types
-      g = Geometric.new(
-        :a_point        => [5.0, 6.1],
-        #:a_line         => '((2.0, 3), (5.5, 7.0))' # line type is currently unsupported in postgresql
-        :a_line_segment => '((2.0, 3), (5.5, 7.0))',
-        :a_box          => '(2.0, 3), (5.5, 7.0)',
-        :a_path         => '((2.0, 3), (5.5, 7.0), (8.5, 11.0))',  # ( ) is a closed path
-        :a_polygon      => '2.0, 3, 5.5, 7.0, 8.5, 11.0',
-        :a_circle       => '((5.3, 10.4), 2)'
-      )
-
-      assert g.save
-
-      # Reload and check that we have all the geometric attributes.
-      h = Geometric.find(g.id)
-
-      assert_equal [5.0, 6.1], h.a_point
-      assert_equal '[(2,3),(5.5,7)]', h.a_line_segment
-      assert_equal '(5.5,7),(2,3)', h.a_box   # reordered to store upper right corner then bottom left corner
-      assert_equal '((2,3),(5.5,7),(8.5,11))', h.a_path
-      assert_equal '((2,3),(5.5,7),(8.5,11))', h.a_polygon
-      assert_equal '<(5.3,10.4),2>', h.a_circle
-    end
   end
 
   class NumericData < ActiveRecord::Base
diff --git a/activerecord/test/schema/postgresql_specific_schema.rb b/activerecord/test/schema/postgresql_specific_schema.rb
index 7c44409d34..e7615392db 100644
--- a/activerecord/test/schema/postgresql_specific_schema.rb
+++ b/activerecord/test/schema/postgresql_specific_schema.rb
@@ -45,19 +45,6 @@ _SQL
   execute "CREATE DOMAIN schema_1.bpchar AS bpchar"
 
   execute <<_SQL
-  CREATE TABLE geometrics (
-    id serial primary key,
-    a_point point,
-    -- a_line line, (the line type is currently not implemented in postgresql)
-    a_line_segment lseg,
-    a_box box,
-    a_path path,
-    a_polygon polygon,
-    a_circle circle
-  );
-_SQL
-
-  execute <<_SQL
   CREATE TABLE postgresql_arrays (
     id SERIAL PRIMARY KEY,
     commission_by_quarter INTEGER[],