Merge pull request #86 from tobias-/empty_collections

Failing test cases for empty collections

Author: phillipross

.editorconfig

@@ -0,0 +1,13 @@
+# editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+spaces_around_operators = true
+max_line_length = 130

postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/ComposedGeom.java

@@ -45,14 +45,12 @@ public abstract class ComposedGeom extends Geometry {
     /* JDK 1.5 Serialization */
     private static final long serialVersionUID = 0x100;
 
-    public static final Geometry[] EMPTY = new Geometry[0];
-
     /**
      * The Array containing the geometries
      * 
      * This is only to be exposed by concrete subclasses, to retain type safety.
      */
-    protected Geometry[] subgeoms = EMPTY;
+    protected Geometry[] subgeoms = createSubGeomArray(0);
 
     /**
      * Constructs an instance with the specified type
@@ -104,6 +102,11 @@ protected ComposedGeom(int type, String value, boolean haveM) throws SQLExceptio
             return;
         }
 
+        if (value.equals("EMPTY")) {
+            // Empty collection
+            return;
+        }
+
         String valueNoParans = GeometryTokenizer.removeLeadingAndTrailingStrings(value, "(", ")");
         List<String> tokens = GeometryTokenizer.tokenize(valueNoParans, ',');
 

postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/GeometryBuilder.java

@@ -57,10 +57,6 @@ public static Geometry geomFromString(String value, BinaryParser bp, boolean hav
         Geometry result;
         if (value.startsWith("00") || value.startsWith("01")) {
             result = bp.parse(value);
-        } else if (value.endsWith("EMPTY")) {
-            // We have a standard conforming representation for an empty
-            // geometry which is to be parsed as an empty GeometryCollection.
-            result = new GeometryCollection();
         } else if (value.startsWith("MULTIPOLYGON")) {
             result = new MultiPolygon(value, haveM);
         } else if (value.startsWith("MULTILINESTRING")) {

postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/Point.java

@@ -181,6 +181,9 @@ protected Point(String value, boolean haveM) throws SQLException {
         }
         String valueNoParans = GeometryTokenizer.removeLeadingAndTrailingStrings(value, "(", ")");
         List<String> tokens = GeometryTokenizer.tokenize(valueNoParans, ' ');
+        if (tokens.size() == 1 && "EMPTY".equals(tokens.get(0))) {
+            return;
+        }
         try {
             x = Double.valueOf(tokens.get(0)).doubleValue();
             y = Double.valueOf(tokens.get(1)).doubleValue();

postgis-jdbc-geometry/src/test/java/net/postgis/jdbc/geometry/DatatypesTest.java

@@ -22,12 +22,15 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  */
 
 package net.postgis.jdbc.geometry;
 
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.Test;
@@ -106,4 +109,34 @@ public void testMultiLineString() throws SQLException {
     }
 
 
-}
+    @Test
+    public void testCreateAndGetPoints() {
+        assertNotNull(new LineString().getPoints());
+        assertNotNull(new MultiLineString().getLines());
+        assertNotNull(new LinearRing(new Point[0]).getPoints());
+        assertNotNull(new MultiPoint().getPoints());
+        assertNotNull(new MultiPolygon().getPolygons());
+    }
+
+
+    @Test
+    public void testParseEmpty() throws SQLException {
+        assertTrue(GeometryBuilder.geomFromString("POINT EMPTY") instanceof Point);
+        assertTrue(GeometryBuilder.geomFromString("POLYGON EMPTY") instanceof Polygon);
+        assertTrue(GeometryBuilder.geomFromString("LINESTRING EMPTY") instanceof LineString);
+        assertTrue(GeometryBuilder.geomFromString("MULTILINESTRING EMPTY") instanceof MultiLineString);
+        assertTrue(GeometryBuilder.geomFromString("MULTIPOINT EMPTY") instanceof MultiPoint);
+        assertTrue(GeometryBuilder.geomFromString("MULTIPOLYGON EMPTY") instanceof MultiPolygon);
+    }
+
+    @Test
+    public void testCreateEmpty() throws SQLException {
+        new Point("POINT EMPTY");
+        new Polygon("POLYGON EMPTY");
+        new LineString("LINESTRING EMPTY");
+        new MultiLineString("MULTILINESTRING EMPTY");
+        new MultiPoint("MULTIPOINT EMPTY");
+        new MultiPolygon("MULTIPOLYGON EMPTY");
+    }
+
+}

postgis-jdbc/src/test/java/net/postgis/jdbc/ServerTest.java

@@ -28,7 +28,15 @@
 package net.postgis.jdbc;
 
 
-import net.postgis.tools.testutils.TestContainerController;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.UUID;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
@@ -37,8 +45,16 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import java.sql.*;
-import java.util.UUID;
+import net.postgis.jdbc.geometry.Geometry;
+import net.postgis.jdbc.geometry.GeometryBuilder;
+import net.postgis.jdbc.geometry.LineString;
+import net.postgis.jdbc.geometry.LinearRing;
+import net.postgis.jdbc.geometry.MultiLineString;
+import net.postgis.jdbc.geometry.MultiPoint;
+import net.postgis.jdbc.geometry.MultiPolygon;
+import net.postgis.jdbc.geometry.Point;
+import net.postgis.jdbc.geometry.Polygon;
+import net.postgis.tools.testutils.TestContainerController;
 
 
 public class ServerTest {
@@ -96,6 +112,126 @@ public void testServer() throws Exception {
 
     }
 
+    @Test
+    public void testColumnTypeSafetyNonEmpty1() throws SQLException {
+        String tableName = "polygraph_" + UUID.randomUUID().toString().replace('-', '_');
+
+        String createSQL = "create table " + tableName + " (point geometry(point,4326), polygon geometry(polygon,4326), line_string geometry(linestring,4326), multi_line_string geometry(multilinestring,4326), multi_point geometry(multipoint,4326), multi_polygon geometry(multipolygon,4326));";
+        String dropSQL = "drop table " + tableName;
+
+        statement.execute(createSQL);
+
+        final PreparedStatement prep = connection
+            .prepareStatement("INSERT INTO " + tableName + " VALUES (?, ?, ?, ?, ?, ?)");
+        prep.setObject(1, new PGgeometryLW(new Point("SRID=4326;POINT(2.8 1.7)")));
+        prep.setObject(2, new PGgeometryLW(new Polygon("SRID=4326;POLYGON((2 2, 2 -2, -2 -2, -2 2, 2 2))")));
+        prep.setObject(3, new PGgeometryLW(new LineString("SRID=4326;LINESTRING(0 0, 1 2)")));
+        prep.setObject(4, new PGgeometryLW(new MultiLineString("SRID=4326;MULTILINESTRING((0 0, 1 2), (1 2, 3 -1))")));
+        prep.setObject(5, new PGgeometryLW(new MultiPoint("SRID=4326;MULTIPOINT((2 3), (7 8))")));
+        prep.setObject(6, new PGgeometryLW(new MultiPolygon("SRID=4326;MULTIPOLYGON(((1 1, 1 -1, -1 -1, -1 1, 1 1)),((1 1, 3 1, 3 3, 1 3, 1 1)))")));
+
+        prep.execute();
+        statement.execute(dropSQL);
+    }
+
+    @Test
+    public void testColumnTypeSafetyNonEmpty2() throws SQLException {
+
+        String tableName = "polygraph_" + UUID.randomUUID().toString().replace('-', '_');
+
+        String createSQL = "create table " + tableName + " (point geometry(point,4326), polygon geometry(polygon,4326), line_string geometry(linestring,4326), multi_line_string geometry(multilinestring,4326), multi_point geometry(multipoint,4326), multi_polygon geometry(multipolygon,4326));";
+        String dropSQL = "drop table " + tableName;
+
+        statement.execute(createSQL);
+
+        final PreparedStatement prep = connection
+            .prepareStatement("INSERT INTO " + tableName + " VALUES (?, ?, ?, ?, ?, ?)");
+
+        prep.setObject(1, new PGgeometryLW(GeometryBuilder.geomFromString("SRID=4326;POINT(2.8 1.7)")));
+        prep.setObject(2, new PGgeometryLW(GeometryBuilder.geomFromString("SRID=4326;POLYGON((2 2, 2 -2, -2 -2, -2 2, 2 2))")));
+        prep.setObject(3, new PGgeometryLW(GeometryBuilder.geomFromString("SRID=4326;LINESTRING(0 0, 1 2)")));
+        prep.setObject(4, new PGgeometryLW(GeometryBuilder.geomFromString("SRID=4326;MULTILINESTRING((0 0, 1 2), (1 2, 3 -1))")));
+        prep.setObject(5, new PGgeometryLW(GeometryBuilder.geomFromString("SRID=4326;MULTIPOINT((2 3), (7 8))")));
+        prep.setObject(6, new PGgeometryLW(
+            GeometryBuilder.geomFromString("SRID=4326;MULTIPOLYGON(((1 1, 1 -1, -1 -1, -1 1, 1 1)),((1 1, 3 1, 3 3, 1 3, 1 1)))")
+        ));
+
+        prep.execute();
+        statement.execute(dropSQL);
+    }
+
+
+    @Test
+    public void testColumnTypeSafetyEmpty1() throws SQLException {
+        String tableName = "polygraph_" + UUID.randomUUID().toString().replace('-', '_');
+
+        String createSQL = "create table " + tableName + " (point geometry(point,4326), polygon geometry(polygon,4326), line_string geometry(linestring,4326), multi_line_string geometry(multilinestring,4326), multi_point geometry(multipoint,4326), multi_polygon geometry(multipolygon,4326));";
+        String dropSQL = "drop table " + tableName;
+
+        statement.execute(createSQL);
+
+        final PreparedStatement prep = connection
+            .prepareStatement("INSERT INTO " + tableName + " VALUES (?, ?, ?, ?, ?, ?)");
+
+        prep.setObject(1, withSRID(new Point(), 4326));
+        prep.setObject(2, withSRID(new Polygon(), 4326));
+        prep.setObject(3, withSRID(new LineString(), 4326));
+        prep.setObject(4, withSRID(new MultiLineString(), 4326));
+        prep.setObject(5, withSRID(new MultiPoint(), 4326));
+        prep.setObject(6, withSRID(new MultiPolygon(), 4326));
+
+        prep.execute();
+        statement.execute(dropSQL);
+    }
+
+    @Test
+    public void testColumnTypeSafetyEmpty2() throws SQLException {
+
+        String tableName = "polygraph_" + UUID.randomUUID().toString().replace('-', '_');
+
+        String createSQL = "create table " + tableName + " (point geometry(point,4326), polygon geometry(polygon,4326), line_string geometry(linestring,4326), multi_line_string geometry(multilinestring,4326), multi_point geometry(multipoint,4326), multi_polygon geometry(multipolygon,4326));";
+        String dropSQL = "drop table " + tableName;
+
+        statement.execute(createSQL);
+
+        final PreparedStatement prep = connection
+            .prepareStatement("INSERT INTO " + tableName + " VALUES (?, ?, ?, ?, ?, ?)");
+
+        prep.setObject(1, new PGgeometryLW(GeometryBuilder.geomFromString("SRID=4326;POINT EMPTY")));
+        prep.setObject(2, new PGgeometryLW(GeometryBuilder.geomFromString("SRID=4326;POLYGON EMPTY")));
+        prep.setObject(3, new PGgeometryLW(GeometryBuilder.geomFromString("SRID=4326;LINESTRING EMPTY")));
+        prep.setObject(4, new PGgeometryLW(GeometryBuilder.geomFromString("SRID=4326;MULTILINESTRING EMPTY")));
+        prep.setObject(5, new PGgeometryLW(GeometryBuilder.geomFromString("SRID=4326;MULTIPOINT EMPTY")));
+        prep.setObject(6, new PGgeometryLW(GeometryBuilder.geomFromString("SRID=4326;MULTIPOLYGON EMPTY")));
+
+        prep.execute();
+        statement.execute(dropSQL);
+    }
+
+
+    @Test
+    public void testColumnTypeSafetyEmpty3() throws SQLException {
+        String tableName = "polygraph_" + UUID.randomUUID().toString().replace('-', '_');
+
+        String createSQL = "create table " + tableName + " (point geometry(point,4326), polygon geometry(polygon,4326), line_string geometry(linestring,4326), multi_line_string geometry(multilinestring,4326), multi_point geometry(multipoint,4326), multi_polygon geometry(multipolygon,4326));";
+        String dropSQL = "drop table " + tableName;
+
+        statement.execute(createSQL);
+
+        final PreparedStatement prep = connection
+            .prepareStatement("INSERT INTO " + tableName + " VALUES (?, ?, ?, ?, ?, ?)");
+
+        prep.setObject(1, withSRID(new Point(), 4326));
+        prep.setObject(2, withSRID(new Polygon(new LinearRing[0]), 4326));
+        prep.setObject(3, withSRID(new LineString(new Point[0]), 4326));
+        prep.setObject(4, withSRID(new MultiLineString(new LineString[0]), 4326));
+        prep.setObject(5, withSRID(new MultiPoint(new Point[0]), 4326));
+        prep.setObject(6, withSRID(new MultiPolygon(new Polygon[0]), 4326));
+
+        prep.execute();
+        statement.execute(dropSQL);
+    }
+
 
     @BeforeClass
     public void initJdbcConnection(ITestContext ctx) throws Exception {
@@ -122,5 +258,8 @@ public void unallocateDatabaseResources() throws Exception {
         }
     }
 
-
-}
+    private static PGgeometryLW withSRID(Geometry geo, int srid) {
+        geo.setSrid(srid);
+        return new PGgeometryLW(geo);
+    }
+}