Strabon

changeset 1146:0d370b75a8b9

find changesets by author, revision, files, or words in the commit message
Removed a test that failed with Jenkins. This happened because strdf:union returns GeometryCollections with a random order of geometries.
author Panayiotis Smeros <psmeros@di.uoa.gr>
date Fri May 03 20:07:41 2013 +0300 (2013-05-03)
parents 3cd76c715947
children 5a954ddd0a91
files testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructBinary.rq testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructBinary.srx testsuite/src/test/resources/untested/UnionAsConstructBinary.rq testsuite/src/test/resources/untested/UnionAsConstructBinary.srx
line diff
     1.1 --- a/testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructBinary.rq	Fri May 03 19:18:25 2013 +0300
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,7 +0,0 @@
     1.4 -select (strdf:union(?g1, ?g2) as ?union)
     1.5 -where
     1.6 -{
     1.7 -	?x <http://example.org/ontology/hasGeometry> ?g1 .
     1.8 -	?y <http://example.org/ontology/hasGeometry> ?g2 .
     1.9 -	FILTER(?x != ?y)
    1.10 -}
    1.11 \ No newline at end of file

     2.1 --- a/testsuite/src/test/resources/stSPARQL/UnionTest/UnionAsConstructBinary.srx	Fri May 03 19:18:25 2013 +0300
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,68 +0,0 @@
     2.4 -<?xml version='1.0' encoding='UTF-8'?>
     2.5 -<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
     2.6 -	<head>
     2.7 -		<variable name='union'/>
     2.8 -	</head>
     2.9 -	<results>
    2.10 -		<result>
    2.11 -			<binding name='union'>
    2.12 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POINT (23.6423757 37.9521198), POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)))</literal>
    2.13 -			</binding>
    2.14 -		</result>
    2.15 -		<result>
    2.16 -			<binding name='union'>
    2.17 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>MULTIPOINT ((23.6423757 37.9521198), (21.841968 38.045047))</literal>
    2.18 -			</binding>
    2.19 -		</result>
    2.20 -		<result>
    2.21 -			<binding name='union'>
    2.22 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POINT (23.6423757 37.9521198), POLYGON ((34.8 19.37, 41.74 19.37, 41.74 29.64, 34.8 29.64, 34.8 19.37)))</literal>
    2.23 -			</binding>
    2.24 -		</result>
    2.25 -		<result>
    2.26 -			<binding name='union'>
    2.27 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)), POINT (23.6423757 37.9521198))</literal>
    2.28 -			</binding>
    2.29 -		</result>
    2.30 -		<result>
    2.31 -			<binding name='union'>
    2.32 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)), POINT (21.841968 38.045047))</literal>
    2.33 -			</binding>
    2.34 -		</result>
    2.35 -		<result>
    2.36 -			<binding name='union'>
    2.37 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>MULTIPOLYGON (((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)), ((34.8 19.37, 41.74 19.37, 41.74 29.64, 34.8 29.64, 34.8 19.37)))</literal>
    2.38 -			</binding>
    2.39 -		</result>
    2.40 -		<result>
    2.41 -			<binding name='union'>
    2.42 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>MULTIPOINT ((21.841968 38.045047), (23.6423757 37.9521198))</literal>
    2.43 -			</binding>
    2.44 -		</result>
    2.45 -		<result>
    2.46 -			<binding name='union'>
    2.47 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POINT (21.841968 38.045047), POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)))</literal>
    2.48 -			</binding>
    2.49 -		</result>
    2.50 -		<result>
    2.51 -			<binding name='union'>
    2.52 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POINT (21.841968 38.045047), POLYGON ((34.8 19.37, 41.74 19.37, 41.74 29.64, 34.8 29.64, 34.8 19.37)))</literal>
    2.53 -			</binding>
    2.54 -		</result>
    2.55 -		<result>
    2.56 -			<binding name='union'>
    2.57 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POLYGON ((34.8 19.37, 41.74 19.37, 41.74 29.64, 34.8 29.64, 34.8 19.37)), POINT (23.6423757 37.9521198))</literal>
    2.58 -			</binding>
    2.59 -		</result>
    2.60 -		<result>
    2.61 -			<binding name='union'>
    2.62 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>MULTIPOLYGON (((34.8 19.37, 41.74 19.37, 41.74 29.64, 34.8 29.64, 34.8 19.37)), ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)))</literal>
    2.63 -			</binding>
    2.64 -		</result>
    2.65 -		<result>
    2.66 -			<binding name='union'>
    2.67 -				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POLYGON ((34.8 19.37, 41.74 19.37, 41.74 29.64, 34.8 29.64, 34.8 19.37)), POINT (21.841968 38.045047))</literal>
    2.68 -			</binding>
    2.69 -		</result>
    2.70 -	</results>
    2.71 -</sparql>
    2.72 \ No newline at end of file

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/testsuite/src/test/resources/untested/UnionAsConstructBinary.rq	Fri May 03 20:07:41 2013 +0300
     3.3 @@ -0,0 +1,7 @@
     3.4 +select (strdf:union(?g1, ?g2) as ?union)
     3.5 +where
     3.6 +{
     3.7 +	?x <http://example.org/ontology/hasGeometry> ?g1 .
     3.8 +	?y <http://example.org/ontology/hasGeometry> ?g2 .
     3.9 +	FILTER(?x != ?y)
    3.10 +}
    3.11 \ No newline at end of file

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/testsuite/src/test/resources/untested/UnionAsConstructBinary.srx	Fri May 03 20:07:41 2013 +0300
     4.3 @@ -0,0 +1,68 @@
     4.4 +<?xml version='1.0' encoding='UTF-8'?>
     4.5 +<sparql xmlns='http://www.w3.org/2005/sparql-results#'>
     4.6 +	<head>
     4.7 +		<variable name='union'/>
     4.8 +	</head>
     4.9 +	<results>
    4.10 +		<result>
    4.11 +			<binding name='union'>
    4.12 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POINT (23.6423757 37.9521198), POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)))</literal>
    4.13 +			</binding>
    4.14 +		</result>
    4.15 +		<result>
    4.16 +			<binding name='union'>
    4.17 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>MULTIPOINT ((23.6423757 37.9521198), (21.841968 38.045047))</literal>
    4.18 +			</binding>
    4.19 +		</result>
    4.20 +		<result>
    4.21 +			<binding name='union'>
    4.22 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POINT (23.6423757 37.9521198), POLYGON ((34.8 19.37, 41.74 19.37, 41.74 29.64, 34.8 29.64, 34.8 19.37)))</literal>
    4.23 +			</binding>
    4.24 +		</result>
    4.25 +		<result>
    4.26 +			<binding name='union'>
    4.27 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)), POINT (23.6423757 37.9521198))</literal>
    4.28 +			</binding>
    4.29 +		</result>
    4.30 +		<result>
    4.31 +			<binding name='union'>
    4.32 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)), POINT (21.841968 38.045047))</literal>
    4.33 +			</binding>
    4.34 +		</result>
    4.35 +		<result>
    4.36 +			<binding name='union'>
    4.37 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>MULTIPOLYGON (((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)), ((34.8 19.37, 41.74 19.37, 41.74 29.64, 34.8 29.64, 34.8 19.37)))</literal>
    4.38 +			</binding>
    4.39 +		</result>
    4.40 +		<result>
    4.41 +			<binding name='union'>
    4.42 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>MULTIPOINT ((21.841968 38.045047), (23.6423757 37.9521198))</literal>
    4.43 +			</binding>
    4.44 +		</result>
    4.45 +		<result>
    4.46 +			<binding name='union'>
    4.47 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POINT (21.841968 38.045047), POLYGON ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)))</literal>
    4.48 +			</binding>
    4.49 +		</result>
    4.50 +		<result>
    4.51 +			<binding name='union'>
    4.52 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POINT (21.841968 38.045047), POLYGON ((34.8 19.37, 41.74 19.37, 41.74 29.64, 34.8 29.64, 34.8 19.37)))</literal>
    4.53 +			</binding>
    4.54 +		</result>
    4.55 +		<result>
    4.56 +			<binding name='union'>
    4.57 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POLYGON ((34.8 19.37, 41.74 19.37, 41.74 29.64, 34.8 29.64, 34.8 19.37)), POINT (23.6423757 37.9521198))</literal>
    4.58 +			</binding>
    4.59 +		</result>
    4.60 +		<result>
    4.61 +			<binding name='union'>
    4.62 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>MULTIPOLYGON (((34.8 19.37, 41.74 19.37, 41.74 29.64, 34.8 29.64, 34.8 19.37)), ((-7 4.2, -7.1 4.2, -7.1 4.3, -7 4.2)))</literal>
    4.63 +			</binding>
    4.64 +		</result>
    4.65 +		<result>
    4.66 +			<binding name='union'>
    4.67 +				<literal datatype='http://strdf.di.uoa.gr/ontology#WKT'>GEOMETRYCOLLECTION (POLYGON ((34.8 19.37, 41.74 19.37, 41.74 29.64, 34.8 29.64, 34.8 19.37)), POINT (21.841968 38.045047))</literal>
    4.68 +			</binding>
    4.69 +		</result>
    4.70 +	</results>
    4.71 +</sparql>
    4.72 \ No newline at end of file