Strabon
changeset 1087:d8fb1142494d
Changed test dataset and expected results.
| author | Panayiotis Smeros <psmeros@di.uoa.gr> |
|---|---|
| date | Fri Apr 26 15:00:44 2013 +0300 (2013-04-26) |
| parents | 7ae5cf379571 |
| children | a460c0497dcd |
| files | testsuite/src/test/resources/geoSPARQL/SfSpatialRelationsTest/SfDisjointTest.srx testsuite/src/test/resources/geoSPARQL/SfSpatialRelationsTest/SfEqualsTest.srx testsuite/src/test/resources/geoSPARQL/SfSpatialRelationsTest/SfSpatialRelationsTest.nt |
line diff
1.1 --- a/testsuite/src/test/resources/geoSPARQL/SfSpatialRelationsTest/SfDisjointTest.srx Fri Apr 26 13:00:01 2013 +0300 1.2 +++ b/testsuite/src/test/resources/geoSPARQL/SfSpatialRelationsTest/SfDisjointTest.srx Fri Apr 26 15:00:44 2013 +0300 1.3 @@ -10,7 +10,7 @@ 1.4 <uri>http://example.org#A</uri> 1.5 </binding> 1.6 <binding name='x'> 1.7 - <uri>http://example.org#F</uri> 1.8 + <uri>http://example.org#E</uri> 1.9 </binding> 1.10 </result> 1.11 <result> 1.12 @@ -18,12 +18,12 @@ 1.13 <uri>http://example.org#A</uri> 1.14 </binding> 1.15 <binding name='x'> 1.16 - <uri>http://example.org#E</uri> 1.17 + <uri>http://example.org#D</uri> 1.18 </binding> 1.19 </result> 1.20 <result> 1.21 <binding name='y'> 1.22 - <uri>http://example.org#B</uri> 1.23 + <uri>http://example.org#A</uri> 1.24 </binding> 1.25 <binding name='x'> 1.26 <uri>http://example.org#F</uri> 1.27 @@ -39,23 +39,15 @@ 1.28 </result> 1.29 <result> 1.30 <binding name='y'> 1.31 - <uri>http://example.org#C</uri> 1.32 + <uri>http://example.org#B</uri> 1.33 </binding> 1.34 <binding name='x'> 1.35 - <uri>http://example.org#F</uri> 1.36 + <uri>http://example.org#D</uri> 1.37 </binding> 1.38 </result> 1.39 <result> 1.40 <binding name='y'> 1.41 - <uri>http://example.org#C</uri> 1.42 - </binding> 1.43 - <binding name='x'> 1.44 - <uri>http://example.org#E</uri> 1.45 - </binding> 1.46 - </result> 1.47 - <result> 1.48 - <binding name='y'> 1.49 - <uri>http://example.org#D</uri> 1.50 + <uri>http://example.org#B</uri> 1.51 </binding> 1.52 <binding name='x'> 1.53 <uri>http://example.org#F</uri> 1.54 @@ -66,8 +58,48 @@ 1.55 <uri>http://example.org#D</uri> 1.56 </binding> 1.57 <binding name='x'> 1.58 + <uri>http://example.org#A</uri> 1.59 + </binding> 1.60 + </result> 1.61 + <result> 1.62 + <binding name='y'> 1.63 + <uri>http://example.org#D</uri> 1.64 + </binding> 1.65 + <binding name='x'> 1.66 + <uri>http://example.org#B</uri> 1.67 + </binding> 1.68 + </result> 1.69 + <result> 1.70 + <binding name='y'> 1.71 + <uri>http://example.org#D</uri> 1.72 + </binding> 1.73 + <binding name='x'> 1.74 + <uri>http://example.org#G</uri> 1.75 + </binding> 1.76 + </result> 1.77 + <result> 1.78 + <binding name='y'> 1.79 <uri>http://example.org#E</uri> 1.80 </binding> 1.81 + <binding name='x'> 1.82 + <uri>http://example.org#A</uri> 1.83 + </binding> 1.84 + </result> 1.85 + <result> 1.86 + <binding name='y'> 1.87 + <uri>http://example.org#E</uri> 1.88 + </binding> 1.89 + <binding name='x'> 1.90 + <uri>http://example.org#B</uri> 1.91 + </binding> 1.92 + </result> 1.93 + <result> 1.94 + <binding name='y'> 1.95 + <uri>http://example.org#E</uri> 1.96 + </binding> 1.97 + <binding name='x'> 1.98 + <uri>http://example.org#G</uri> 1.99 + </binding> 1.100 </result> 1.101 <result> 1.102 <binding name='y'> 1.103 @@ -90,12 +122,20 @@ 1.104 <uri>http://example.org#F</uri> 1.105 </binding> 1.106 <binding name='x'> 1.107 - <uri>http://example.org#C</uri> 1.108 + <uri>http://example.org#G</uri> 1.109 </binding> 1.110 </result> 1.111 <result> 1.112 <binding name='y'> 1.113 - <uri>http://example.org#F</uri> 1.114 + <uri>http://example.org#G</uri> 1.115 + </binding> 1.116 + <binding name='x'> 1.117 + <uri>http://example.org#E</uri> 1.118 + </binding> 1.119 + </result> 1.120 + <result> 1.121 + <binding name='y'> 1.122 + <uri>http://example.org#G</uri> 1.123 </binding> 1.124 <binding name='x'> 1.125 <uri>http://example.org#D</uri> 1.126 @@ -103,35 +143,11 @@ 1.127 </result> 1.128 <result> 1.129 <binding name='y'> 1.130 - <uri>http://example.org#E</uri> 1.131 + <uri>http://example.org#G</uri> 1.132 </binding> 1.133 <binding name='x'> 1.134 - <uri>http://example.org#A</uri> 1.135 - </binding> 1.136 - </result> 1.137 - <result> 1.138 - <binding name='y'> 1.139 - <uri>http://example.org#E</uri> 1.140 - </binding> 1.141 - <binding name='x'> 1.142 - <uri>http://example.org#B</uri> 1.143 - </binding> 1.144 - </result> 1.145 - <result> 1.146 - <binding name='y'> 1.147 - <uri>http://example.org#E</uri> 1.148 - </binding> 1.149 - <binding name='x'> 1.150 - <uri>http://example.org#C</uri> 1.151 - </binding> 1.152 - </result> 1.153 - <result> 1.154 - <binding name='y'> 1.155 - <uri>http://example.org#E</uri> 1.156 - </binding> 1.157 - <binding name='x'> 1.158 - <uri>http://example.org#D</uri> 1.159 + <uri>http://example.org#F</uri> 1.160 </binding> 1.161 </result> 1.162 </results> 1.163 -</sparql> 1.164 \ No newline at end of file 1.165 +</sparql>
2.1 --- a/testsuite/src/test/resources/geoSPARQL/SfSpatialRelationsTest/SfEqualsTest.srx Fri Apr 26 13:00:01 2013 +0300 2.2 +++ b/testsuite/src/test/resources/geoSPARQL/SfSpatialRelationsTest/SfEqualsTest.srx Fri Apr 26 15:00:44 2013 +0300 2.3 @@ -7,19 +7,19 @@ 2.4 <results> 2.5 <result> 2.6 <binding name='y'> 2.7 - <uri>http://example.org#F</uri> 2.8 + <uri>http://example.org#E</uri> 2.9 + </binding> 2.10 + <binding name='x'> 2.11 + <uri>http://example.org#D</uri> 2.12 + </binding> 2.13 + </result> 2.14 + <result> 2.15 + <binding name='y'> 2.16 + <uri>http://example.org#D</uri> 2.17 </binding> 2.18 <binding name='x'> 2.19 <uri>http://example.org#E</uri> 2.20 </binding> 2.21 </result> 2.22 - <result> 2.23 - <binding name='y'> 2.24 - <uri>http://example.org#E</uri> 2.25 - </binding> 2.26 - <binding name='x'> 2.27 - <uri>http://example.org#F</uri> 2.28 - </binding> 2.29 - </result> 2.30 </results> 2.31 </sparql> 2.32 \ No newline at end of file
3.1 --- a/testsuite/src/test/resources/geoSPARQL/SfSpatialRelationsTest/SfSpatialRelationsTest.nt Fri Apr 26 13:00:01 2013 +0300 3.2 +++ b/testsuite/src/test/resources/geoSPARQL/SfSpatialRelationsTest/SfSpatialRelationsTest.nt Fri Apr 26 15:00:44 2013 +0300 3.3 @@ -4,9 +4,11 @@ 3.4 <http://example.org#D> <http://www.opengis.net/ont/geosparql#hasGeometry> <http://example.org#geomD>. 3.5 <http://example.org#E> <http://www.opengis.net/ont/geosparql#hasGeometry> <http://example.org#geomE>. 3.6 <http://example.org#F> <http://www.opengis.net/ont/geosparql#hasGeometry> <http://example.org#geomF>. 3.7 +<http://example.org#G> <http://www.opengis.net/ont/geosparql#hasGeometry> <http://example.org#geomG>. 3.8 <http://example.org#geomA> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((0 0, 1 0, 1 1, 0 1, 0 0)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 3.9 -<http://example.org#geomB> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((1 0, 2 0, 2 1, 1 1 , 1 0)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 3.10 -<http://example.org#geomC> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((1 1, 2 1, 2 2, 1 2, 1 1)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 3.11 -<http://example.org#geomD> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((0 0, 2 0, 2 2, 0 2, 0 0)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 3.12 -<http://example.org#geomE> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((3 2, 4 2, 4 3, 3 3, 3 2)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 3.13 -<http://example.org#geomF> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((3 2, 4 2, 4 3, 3 3, 3 2)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 3.14 \ No newline at end of file 3.15 +<http://example.org#geomB> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((0 0, 2 0, 2 2, 0 2 , 0 0)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 3.16 +<http://example.org#geomC> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((1 1, 3 1, 3 2, 1 2, 1 1)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 3.17 +<http://example.org#geomD> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((3 1, 4 1, 4 2, 3 2, 3 1)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 3.18 +<http://example.org#geomE> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Polygon((3 1, 4 1, 4 2, 3 2, 3 1)) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 3.19 +<http://example.org#geomF> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Linestring(3 2, 4 0) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>. 3.20 +<http://example.org#geomG> <http://www.opengis.net/ont/geosparql#asWKT> " <http://www.opengis.net/def/crs/OGC/1.3/CRS84> Point(1 1) "^^<http://www.opengis.net/ont/geosparql#wktLiteral>.