Changeset: 7feec13c0c28 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7feec13c0c28
Modified Files:
geom/sql/Tests/functions/Tests/ST_Boundary.sql
geom/sql/Tests/functions/Tests/ST_Boundary.stable.out
geom/sql/Tests/functions/Tests/ST_Contains.stable.out
geom/sql/Tests/functions/Tests/loadTestGeometries.sql
geom/sql/Tests/functions/Tests/loadTestGeometries.stable.out
Branch: geo
Log Message:
mtests: more geometries loaded at the beginning, ST_Boundary + ST_Contains new
results approved
diffs (93 lines):
diff --git a/geom/sql/Tests/functions/Tests/ST_Boundary.sql
b/geom/sql/Tests/functions/Tests/ST_Boundary.sql
--- a/geom/sql/Tests/functions/Tests/ST_Boundary.sql
+++ b/geom/sql/Tests/functions/Tests/ST_Boundary.sql
@@ -6,6 +6,6 @@ SELECT ST_Boundary(ST_GeomFromText('POLY
SELECT ST_Boundary(ST_GeomFromText('MULTILINESTRING((1 1 1,0 0 0.5, -1 1 1),(1
1 0.5,0 0 0.5, -1 1 0.5, 1 1 0.5) )'));
-SELECT geom AS "GEOMETRY", ST_Boundary(geom) AS "BOUNDARY" FROM geometries
WHERE id<7;
+SELECT geom AS "GEOMETRY", ST_Boundary(geom) AS "BOUNDARY" FROM geometries
WHERE id<9;
diff --git a/geom/sql/Tests/functions/Tests/ST_Boundary.stable.out
b/geom/sql/Tests/functions/Tests/ST_Boundary.stable.out
--- a/geom/sql/Tests/functions/Tests/ST_Boundary.stable.out
+++ b/geom/sql/Tests/functions/Tests/ST_Boundary.stable.out
@@ -58,7 +58,7 @@ Ready.
[ "POLYGON ((10 10, 10 20, 20 20, 20 10, 10 10))", "LINESTRING (10 10, 10
20, 20 20, 20 10, 10 10)" ]
[ "MULTIPOINT (10 20, 30 40)", "GEOMETRYCOLLECTION EMPTY" ]
[ "MULTILINESTRING ((30 40, 40 50), (50 60, 60 70))", "MULTIPOINT (30 40, 40
50, 50 60, 60 70)" ]
-[ "MULTIPOLYGON (((10 10, 10 20, 20 20, 20 10, 10 10), (30 30, 30 40, 40 40,
40 30, 30 30)))", "MULTILINESTRING ((10 10, 10 20, 20 20, 20 10, 10 10), (30
30, 30 40, 40 40, 40 30, 30 30))" ]
+[ "MULTILINESTRING ((30 40, 40 50, 30 40), (50 60, 60 70))", "MULTIPOINT (50
60, 60 70)" ]
# 16:00:23 >
# 16:00:23 > "Done."
diff --git a/geom/sql/Tests/functions/Tests/ST_Contains.stable.out
b/geom/sql/Tests/functions/Tests/ST_Contains.stable.out
--- a/geom/sql/Tests/functions/Tests/ST_Contains.stable.out
+++ b/geom/sql/Tests/functions/Tests/ST_Contains.stable.out
@@ -62,8 +62,11 @@ Ready.
[ "POLYGON ((10 10, 10 20, 20 20, 20 10, 10 10))", true ]
[ "MULTIPOINT (10 20, 30 40)", false ]
[ "MULTILINESTRING ((30 40, 40 50), (50 60, 60 70))", false ]
+[ "MULTILINESTRING ((30 40, 40 50, 30 40), (50 60, 60 70))", false ]
+[ "MULTILINESTRING ((30 40, 40 50, 30 40), (50 60, 40 50, 20 30, 50 60))",
false ]
[ "MULTIPOLYGON (((10 10, 10 20, 20 20, 20 10, 10 10), (30 30, 30 40, 40 40,
40 30, 30 30)))", true ]
[ "GEOMETRYCOLLECTION (POINT (10 20), LINESTRING (10 20, 30 40), POLYGON ((10
10, 10 20, 20 20, 20 10, 10 10)))", true ]
+[ "GEOMETRYCOLLECTION (POINT (10 20), LINESTRING (10 20, 30 40, 10 20),
POLYGON ((10 10, 10 20, 20 20, 20 10, 10 10)))", true ]
# 17:07:03 >
# 17:07:03 > "Done."
diff --git a/geom/sql/Tests/functions/Tests/loadTestGeometries.sql
b/geom/sql/Tests/functions/Tests/loadTestGeometries.sql
--- a/geom/sql/Tests/functions/Tests/loadTestGeometries.sql
+++ b/geom/sql/Tests/functions/Tests/loadTestGeometries.sql
@@ -1,17 +1,23 @@
CREATE TABLE geometries(id serial, geom geometry);
--simple geometries
---1
+--1 closed
INSERT INTO geometries(geom) VALUES(ST_WKTToSQL('POINT(10 20)'));
---2
+--2
INSERT INTO geometries(geom) VALUES(ST_WKTToSQL('LINESTRING(10 20, 30 40, 50
60)'));
---3
+--3 closed
INSERT INTO geometries(geom) VALUES(ST_WKTToSQL('POLYGON((10 10, 10 20, 20 20,
20 10, 10 10))'));
---4
+--4 closed
INSERT INTO geometries(geom) VALUES(ST_WKTToSQL('MULTIPOINT(10 20, 30 40)'));
--5
INSERT INTO geometries(geom) VALUES(ST_WKTToSQL('MULTILINESTRING((30 40, 40
50), (50 60, 60 70))'));
--6
+INSERT INTO geometries(geom) VALUES(ST_WKTToSQL('MULTILINESTRING((30 40, 40
50, 30 40), (50 60, 60 70))'));
+--7 closed
+INSERT INTO geometries(geom) VALUES(ST_WKTToSQL('MULTILINESTRING((30 40, 40
50, 30 40), (50 60, 40 50, 20 30, 50 60))'));
+--8
INSERT INTO geometries(geom) VALUES(ST_WKTToSQL('MULTIPOLYGON(((10 10, 10 20,
20 20, 20 10, 10 10),(30 30, 30 40, 40 40, 40 30, 30 30)))'));
---7
+--9
INSERT INTO geometries(geom) VALUES(ST_WKTToSQL('GEOMETRYCOLLECTION(POINT(10
20),LINESTRING(10 20, 30 40),POLYGON((10 10, 10 20, 20 20, 20 10, 10 10)))'));
+--10 closed
+INSERT INTO geometries(geom) VALUES(ST_WKTToSQL('GEOMETRYCOLLECTION(POINT(10
20),LINESTRING(10 20, 30 40, 10 20),POLYGON((10 10, 10 20, 20 20, 20 10, 10
10)))'));
diff --git a/geom/sql/Tests/functions/Tests/loadTestGeometries.stable.out
b/geom/sql/Tests/functions/Tests/loadTestGeometries.stable.out
--- a/geom/sql/Tests/functions/Tests/loadTestGeometries.stable.out
+++ b/geom/sql/Tests/functions/Tests/loadTestGeometries.stable.out
@@ -65,11 +65,17 @@ Ready.
[ 1 ]
#INSERT INTO geometries(geom) VALUES(ST_WKTToSQL('MULTIPOINT(10 20, 30 40)'));
[ 1 ]
-#INSERT INTO geometries(geom) VALUES(ST_WKTToSQL('MULTILINESTRING((10 20, 30
40), (40 50, 60 70))'));
+#INSERT INTO geometries(geom) VALUES(ST_WKTToSQL('MULTILINESTRING((30 40, 40
50), (50 60, 60 70))'));
+[ 1 ]
+#INSERT INTO geometries(geom) VALUES(ST_WKTToSQL('MULTILINESTRING((30 40, 40
50, 30 40), (50 60, 60 70))'));
+[ 1 ]
+#INSERT INTO geometries(geom) VALUES(ST_WKTToSQL('MULTILINESTRING((30 40, 40
50, 30 40), (50 60, 40 50, 20 30, 50 60))'));
[ 1 ]
#INSERT INTO geometries(geom) VALUES(ST_WKTToSQL('MULTIPOLYGON(((10 10, 10 20,
20 20, 20 10, 10 10),(30 30, 30 40, 40 40, 40 30, 30 30)))'));
[ 1 ]
-#INSERT INTO geometries(geom) VALUES(ST_WKTToSQL('GEOMETRYCOLLECTION(POINT(10
20),LINESTRING(10 20, 30 40)),POLYGON((10 10, 10 20, 20 20, 20 10, 10 10))'));
+#INSERT INTO geometries(geom) VALUES(ST_WKTToSQL('GEOMETRYCOLLECTION(POINT(10
20),LINESTRING(10 20, 30 40),POLYGON((10 10, 10 20, 20 20, 20 10, 10 10)))'));
+[ 1 ]
+#INSERT INTO geometries(geom) VALUES(ST_WKTToSQL('GEOMETRYCOLLECTION(POINT(10
20),LINESTRING(10 20, 30 40, 10 20),POLYGON((10 10, 10 20, 20 20, 20 10, 10
10)))'));
[ 1 ]
# 15:39:26 >
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
