marmotta-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sschaff...@apache.org
Subject [14/22] fixed the remaining license headers (RAT works now)
Date Fri, 15 Mar 2013 14:18:59 GMT
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/manifest.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/manifest.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/manifest.ttl
deleted file mode 100644
index 1bd646d..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/manifest.ttl
+++ /dev/null
@@ -1,273 +0,0 @@
-# $Id: manifest.ttl,v 1.13 2007/09/05 17:32:28 lfeigenb Exp $
-
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix : <http://www.w3.org/2001/sw/DataAccess/tests/data-r2/expr-builtin/manifest#> .
-@prefix rdfs:	<http://www.w3.org/2000/01/rdf-schema#> .
-@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
-@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
-@prefix dawgt:   <http://www.w3.org/2001/sw/DataAccess/tests/test-dawg#> .
-
-<>  rdf:type mf:Manifest ;
-    rdfs:comment  "DAWG Expression tests: Built-ins" ;
-    mf:entries
-    ( :dawg-str-1 :dawg-str-2 :dawg-str-3 :dawg-str-4
-      :dawg-isBlank-1 :dawg-isLiteral-1 :dawg-datatype-1 :dawg-datatype-2 :dawg-datatype-3
-      :dawg-lang-1 :dawg-lang-2 :dawg-lang-3 :dawg-isURI-1
-      :dawg-isIRI-1 :dawg-langMatches-1 :dawg-langMatches-2 
-      :dawg-langMatches-3 :dawg-langMatches-4 :dawg-langMatches-basic
-      :lang-case-insensitive-eq
-      :lang-case-insensitive-ne
-      :sameTerm-simple :sameTerm-eq :sameTerm-not-eq
-    ).
-
-:dawg-isLiteral-1 a mf:QueryEvaluationTest ;
-     mf:name    "isLiteral" ;
-     mf:action
-	[ qt:query  <q-isliteral-1.rq> ;
-	  qt:data   <data-builtin-2.ttl> ] ;
-     mf:result  <result-isliteral-1.ttl> ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0087/14-dawg-minutes.html> .
-
-:dawg-str-1 a mf:QueryEvaluationTest ;
-     mf:name    "str-1" ;
-     mf:action
-	[ qt:query  <q-str-1.rq> ;
-	  qt:data   <data-builtin-1.ttl> ] ;
-     mf:result  <result-str-1.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-:dawg-str-2 a mf:QueryEvaluationTest ;
-     mf:name    "str-2" ;
-     mf:action
-	[ qt:query  <q-str-2.rq> ;
-	  qt:data   <data-builtin-1.ttl> ] ;
-     mf:result  <result-str-2.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-:dawg-str-3 a mf:QueryEvaluationTest ;
-     mf:name    "str-3" ;
-     mf:action
-	[ qt:query  <q-str-3.rq> ;
-	  qt:data   <data-builtin-1.ttl> ] ;
-     mf:result  <result-str-3.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-:dawg-str-4 a mf:QueryEvaluationTest ;
-     mf:name    "str-4" ;
-     mf:action
-	[ qt:query  <q-str-4.rq> ;
-	  qt:data   <data-builtin-1.ttl> ] ;
-     mf:result  <result-str-4.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-:dawg-isBlank-1 a mf:QueryEvaluationTest ;
-     mf:name    "isBlank-1" ;
-     mf:action
-	[ qt:query  <q-blank-1.rq> ;
-	  qt:data   <data-builtin-1.ttl> ] ;
-     mf:result  <result-blank-1.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-:dawg-datatype-1 a mf:QueryEvaluationTest ;
-     mf:name    "datatype-1" ;
-     mf:action
-	[ qt:query  <q-datatype-1.rq> ;
-	  qt:data   <data-builtin-1.ttl> ] ;
-     mf:result  <result-datatype-1.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-:dawg-datatype-2 a mf:QueryEvaluationTest ;
-    mf:name "datatype-2 : Literals with a datatype" ;
-    rdfs:comment "updated from original test case: eliminated ordering from test" ;
-    mf:action
-        [ qt:query  <q-datatype-2.rq> ;
-	  qt:data   <data-builtin-2.ttl> ] ;
-    mf:result  <result-datatype-2.srx> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-:dawg-datatype-3 a mf:QueryEvaluationTest ;
-    mf:name "datatype-3 : Literals with a datatype of xsd:string" ;
-    rdfs:comment "updated from original test case: eliminated ordering from test" ;
-    mf:action
-	[ qt:query  <q-datatype-3.rq> ;
-          qt:data   <data-builtin-2.ttl> ] ;
-    mf:result  <result-datatype-3.srx> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-:dawg-lang-1 a mf:QueryEvaluationTest ;
-    mf:name "lang-1 : Literals with a lang tag of some kind" ;
-    rdfs:comment "updated from original test case: eliminated ordering from test" ;
-    mf:action
-	[ qt:query  <q-lang-1.rq> ;
-	  qt:data   <data-builtin-2.ttl> ] ;
-    mf:result  <result-lang-1.srx> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-:dawg-lang-2 a mf:QueryEvaluationTest ;
-    mf:name "lang-2 : Literals with a lang tag of ''" ;
-    rdfs:comment "updated from original test case: eliminated ordering from test" ;
-    mf:action
-	[ qt:query  <q-lang-2.rq> ;
-          qt:data   <data-builtin-2.ttl> ] ;
-    mf:result  <result-lang-2.srx> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-:dawg-lang-3 a mf:QueryEvaluationTest ;
-    mf:name "lang-3 : Graph matching with lang tag being a different case" ;
-    rdfs:comment "updated from original test case: eliminated ordering from test" ;
-    mf:action
-	[ qt:query  <q-lang-3.rq> ;
-          qt:data   <data-builtin-2.ttl> ] ;
-    mf:result  <result-lang-3.srx> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-:dawg-isURI-1 a mf:QueryEvaluationTest ;
-    mf:name    "isURI-1" ;
-    mf:action
-	[ qt:query  <q-uri-1.rq> ;
-          qt:data   <data-builtin-1.ttl> ] ;
-    mf:result  <result-uri-1.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-:dawg-isIRI-1 a mf:QueryEvaluationTest ;
-    mf:name    "isIRI-1" ;
-    mf:action
-       [ qt:query  <q-iri-1.rq> ;
-	 qt:data   <data-builtin-1.ttl> ] ;
-    # NB same result as before.
-    mf:result  <result-iri-1.ttl> ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0087/14-dawg-minutes.html> .
-
-
-:dawg-langMatches-1 a mf:QueryEvaluationTest ;
-    mf:name    "LangMatches-1" ;
-    rdfs:comment "langMatches(lang(?v), 'en-GB') matches 'abc'@en-gb" ;
-    mf:action
-	[ qt:query  <q-langMatches-1.rq> ;
-          qt:data   <data-langMatches.ttl> ] ;
-    mf:result  <result-langMatches-1.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-:dawg-langMatches-2 a mf:QueryEvaluationTest ;
-    mf:name    "LangMatches-2" ;
-    rdfs:comment "langMatches(lang(?v), 'en') matches 'abc'@en, 'abc'@en-gb" ;
-    mf:action
-	[ qt:query  <q-langMatches-2.rq> ;
-          qt:data   <data-langMatches.ttl> ] ;
-    mf:result  <result-langMatches-2.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-:dawg-langMatches-3 a mf:QueryEvaluationTest ;
-    mf:name    "LangMatches-3" ;
-    rdfs:comment "langMatches(lang(?v), '*') matches 'abc'@en, 'abc'@en-gb, 'abc'@fr" ;
-    mf:action
-	[ qt:query  <q-langMatches-3.rq> ;
-          qt:data   <data-langMatches.ttl> ] ;
-    mf:result  <result-langMatches-3.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-:dawg-langMatches-4 a mf:QueryEvaluationTest ;
-    mf:name    "LangMatches-4" ;
-    rdfs:comment "! langMatches(lang(?v), '*') matches 'abc'" ;
-    mf:action
-	[ qt:query  <q-langMatches-4.rq> ;
-          qt:data   <data-langMatches.ttl> ] ;
-    mf:result  <result-langMatches-4.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-:dawg-langMatches-basic a mf:QueryEvaluationTest ;
-    mf:name    "LangMatches-basic" ;
-    rdfs:comment "the basic range 'de-de' does not match 'de-Latn-de'" ;
-    mf:action
-	[ qt:query  <q-langMatches-de-de.rq> ;
-          qt:data   <data-langMatches-de.ttl> ] ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0087/14-dawg-minutes.html> ;
-    mf:result  <result-langMatches-de.ttl> .
-
-:lang-case-insensitive-eq a mf:QueryEvaluationTest ;
-    mf:name    "lang-case-insensitive-eq" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-	rdfs:comment "'xyz'@en = 'xyz'@EN" ;
-        mf:action
-           [ qt:query  <lang-case-sensitivity-eq.rq> ;
-             qt:data   <lang-case-sensitivity.ttl> ] ;
-        mf:result  <lang-case-insensitive-eq.srx> .
-
-:lang-case-insensitive-ne a mf:QueryEvaluationTest ;
-    mf:name    "lang-case-insensitive-ne" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-	rdfs:comment	"'xyz'@en != 'xyz'@EN" ;
-    mf:action
-       [ qt:query  <lang-case-sensitivity-ne.rq> ;
-         qt:data   <lang-case-sensitivity.ttl> ] ;
-    mf:result  <lang-case-insensitive-ne.srx> .
-
-
-:sameTerm-simple a mf:QueryEvaluationTest ;
-    mf:name    "sameTerm-simple" ;
-    rdfs:comment	"sameTerm(?v1, ?v2)" ;
-    mf:action
-       [ qt:query  <sameTerm.rq> ;
-	 qt:data   <data-builtin-1.ttl> ] ;
-     dawgt:approval dawgt:Approved ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0118/04-dawg-minutes.html> ;
-    mf:result  <result-sameTerm.ttl> .
-
-
-:sameTerm-eq a mf:QueryEvaluationTest ;
-    mf:name    "sameTerm-eq" ;
-    rdfs:comment	"sameTerm(?v1, ?v2) && ?v1 = ?v2" ;
-    mf:action
-       [ qt:query  <sameTerm-eq.rq> ;
-	 qt:data   <data-builtin-1.ttl> ] ;
-     dawgt:approval dawgt:Approved ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0118/04-dawg-minutes.html> ;
-    mf:result  <result-sameTerm-eq.ttl> .
-
-
-:sameTerm-not-eq a mf:QueryEvaluationTest ;
-    mf:name    "sameTerm-not-eq" ;
-    rdfs:comment	"!sameTerm(?v1, ?v2) && ?v1 = ?v2" ;
-    mf:action
-       [ qt:query  <sameTerm-not-eq.rq> ;
-	 qt:data   <data-builtin-1.ttl> ] ;
-     dawgt:approval dawgt:Approved ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007JulSep/att-0118/04-dawg-minutes.html> ;
-    mf:result  <result-sameTerm-not-eq.ttl> .
-
-

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/manifest.ttl.bak
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/manifest.ttl.bak b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/manifest.ttl.bak
deleted file mode 100644
index a73fd5a..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/manifest.ttl.bak
+++ /dev/null
@@ -1,234 +0,0 @@
-# $Id: manifest.ttl,v 1.9 2007/08/11 18:32:41 eric Exp $
-
-@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs:	<http://www.w3.org/2000/01/rdf-schema#> .
-@prefix mf:     <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> .
-@prefix qt:     <http://www.w3.org/2001/sw/DataAccess/tests/test-query#> .
-@prefix dawgt:   <http://www.w3.org/2001/sw/DataAccess/tests/test-dawg#> .
-
-<>  rdf:type mf:Manifest ;
-    rdfs:comment  "DAWG Expression tests: Built-ins" ;
-    mf:entries
-    ( <#dawg-str-1> <#dawg-str-2> <#dawg-str-3> <#dawg-str-4>
-      <#dawg-isBlank-1> <#dawg-isLiteral-1> <#dawg-datatype-1> <#dawg-datatype-2> <#dawg-datatype-3>
-      <#dawg-lang-1> <#dawg-lang-2> <#dawg-lang-3> <#dawg-isURI-1>
-      <#dawg-isIRI-1> <#dawg-langMatches-1> <#dawg-langMatches-2> 
-      <#dawg-langMatches-3> <#dawg-langMatches-4> <#dawg-langMatches-basic>
-      <#lang-case-insensitive-eq>
-      <#lang-case-insensitive-ne>
-    ).
-
-<#dawg-isLiteral-1> a mf:QueryEvaluationTest ;
-     mf:name    "isLiteral" ;
-     mf:action
-	[ qt:query  <q-isliteral-1.rq> ;
-	  qt:data   <data-builtin-2.ttl> ] ;
-     mf:result  <result-isliteral-1.ttl> ;
-     dawgt:approval dawgt:NotApproved .
-
-<#dawg-str-1> a mf:QueryEvaluationTest ;
-     mf:name    "str-1" ;
-     mf:action
-	[ qt:query  <q-str-1.rq> ;
-	  qt:data   <data-builtin-1.ttl> ] ;
-     mf:result  <result-str-1.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-<#dawg-str-2> a mf:QueryEvaluationTest ;
-     mf:name    "str-2" ;
-     mf:action
-	[ qt:query  <q-str-2.rq> ;
-	  qt:data   <data-builtin-1.ttl> ] ;
-     mf:result  <result-str-2.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-<#dawg-str-3> a mf:QueryEvaluationTest ;
-     mf:name    "str-3" ;
-     mf:action
-	[ qt:query  <q-str-3.rq> ;
-	  qt:data   <data-builtin-1.ttl> ] ;
-     mf:result  <result-str-3.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-<#dawg-str-4> a mf:QueryEvaluationTest ;
-     mf:name    "str-4" ;
-     mf:action
-	[ qt:query  <q-str-4.rq> ;
-	  qt:data   <data-builtin-1.ttl> ] ;
-     mf:result  <result-str-4.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-<#dawg-isBlank-1> a mf:QueryEvaluationTest ;
-     mf:name    "isBlank-1" ;
-     mf:action
-	[ qt:query  <q-blank-1.rq> ;
-	  qt:data   <data-builtin-1.ttl> ] ;
-     mf:result  <result-blank-1.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-<#dawg-datatype-1> a mf:QueryEvaluationTest ;
-     mf:name    "datatype-1" ;
-     mf:action
-	[ qt:query  <q-datatype-1.rq> ;
-	  qt:data   <data-builtin-1.ttl> ] ;
-     mf:result  <result-datatype-1.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-<#dawg-datatype-2> a mf:QueryEvaluationTest ;
-    mf:name "datatype-2 : Literals with a datatype" ;
-    rdfs:comment "updated from original test case: eliminated ordering from test" ;
-    mf:action
-        [ qt:query  <q-datatype-2.rq> ;
-	  qt:data   <data-builtin-2.ttl> ] ;
-    mf:result  <result-datatype-2.srx> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-<#dawg-datatype-3> a mf:QueryEvaluationTest ;
-    mf:name "datatype-3 : Literals with a datatype of xsd:string" ;
-    rdfs:comment "updated from original test case: eliminated ordering from test" ;
-    mf:action
-	[ qt:query  <q-datatype-3.rq> ;
-          qt:data   <data-builtin-2.ttl> ] ;
-    mf:result  <result-datatype-3.srx> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-<#dawg-lang-1> a mf:QueryEvaluationTest ;
-    mf:name "lang-1 : Literals with a lang tag of some kind" ;
-    rdfs:comment "updated from original test case: eliminated ordering from test" ;
-    mf:action
-	[ qt:query  <q-lang-1.rq> ;
-	  qt:data   <data-builtin-2.ttl> ] ;
-    mf:result  <result-lang-1.srx> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-<#dawg-lang-2> a mf:QueryEvaluationTest ;
-    mf:name "lang-2 : Literals with a lang tag of ''" ;
-    rdfs:comment "updated from original test case: eliminated ordering from test" ;
-    mf:action
-	[ qt:query  <q-lang-2.rq> ;
-          qt:data   <data-builtin-2.ttl> ] ;
-    mf:result  <result-lang-2.srx> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-<#dawg-lang-3> a mf:QueryEvaluationTest ;
-    mf:name "lang-3 : Graph matching with lang tag being a different case" ;
-    rdfs:comment "updated from original test case: eliminated ordering from test" ;
-    mf:action
-	[ qt:query  <q-lang-3.rq> ;
-          qt:data   <data-builtin-2.ttl> ] ;
-    mf:result  <result-lang-3.srx> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-<#dawg-isURI-1> a mf:QueryEvaluationTest ;
-    mf:name    "isURI-1" ;
-    mf:action
-	[ qt:query  <q-uri-1.rq> ;
-          qt:data   <data-builtin-1.ttl> ] ;
-    mf:result  <result-uri-1.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-<#dawg-isIRI-1> a mf:QueryEvaluationTest ;
-    mf:name    "isIRI-1" ;
-    mf:action
-       [ qt:query  <q-iri-1.rq> ;
-	 qt:data   <data-builtin-1.ttl> ] ;
-    # NB same result as before.
-    mf:result  <result-iri-1.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:NotApproved .
-
-
-<#dawg-langMatches-1> a mf:QueryEvaluationTest ;
-    mf:name    "LangMatches-1" ;
-    rdfs:comment "langMatches(lang(?v), 'en-GB') matches 'abc'@en-gb" ;
-    mf:action
-	[ qt:query  <q-langMatches-1.rq> ;
-          qt:data   <data-langMatches.ttl> ] ;
-    mf:result  <result-langMatches-1.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-<#dawg-langMatches-2> a mf:QueryEvaluationTest ;
-    mf:name    "LangMatches-2" ;
-    rdfs:comment "langMatches(lang(?v), 'en') matches 'abc'@en, 'abc'@en-gb" ;
-    mf:action
-	[ qt:query  <q-langMatches-2.rq> ;
-          qt:data   <data-langMatches.ttl> ] ;
-    mf:result  <result-langMatches-2.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-<#dawg-langMatches-3> a mf:QueryEvaluationTest ;
-    mf:name    "LangMatches-3" ;
-    rdfs:comment "langMatches(lang(?v), '*') matches 'abc'@en, 'abc'@en-gb, 'abc'@fr" ;
-    mf:action
-	[ qt:query  <q-langMatches-3.rq> ;
-          qt:data   <data-langMatches.ttl> ] ;
-    mf:result  <result-langMatches-3.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-
-<#dawg-langMatches-4> a mf:QueryEvaluationTest ;
-    mf:name    "LangMatches-4" ;
-    rdfs:comment "! langMatches(lang(?v), '*') matches 'abc'" ;
-    mf:action
-	[ qt:query  <q-langMatches-4.rq> ;
-          qt:data   <data-langMatches.ttl> ] ;
-    mf:result  <result-langMatches-4.ttl> ;
-     dawgt:approvedBy <http://lists.w3.org/Archives/Public/public-rdf-dawg/2007AprJun/0006> ;
-     dawgt:approval dawgt:Approved .
-
-<#dawg-langMatches-basic> a mf:QueryEvaluationTest ;
-    mf:name    "LangMatches-basic" ;
-    rdfs:comment "the basic range 'de-de' does not match 'de-Latn-de'" ;
-    mf:action
-	[ qt:query  <q-langMatches-de-de.rq> ;
-          qt:data   <data-langMatches-de.ttl> ] ;
-    mf:result  <result-langMatches-de.ttl> .
-
-<#lang-case-insensitive-eq> a mf:QueryEvaluationTest ;
-    mf:name    "lang-case-insensitive-eq" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-	rdfs:comment "'xyz'@en = 'xyz'@EN" ;
-        mf:action
-           [ qt:query  <lang-case-sensitivity-eq.rq> ;
-             qt:data   <lang-case-sensitivity.ttl> ] ;
-        mf:result  <lang-case-insensitive-eq.srx> .
-
-<#lang-case-insensitive-ne> a mf:QueryEvaluationTest ;
-    mf:name    "lang-case-insensitive-ne" ;
-    dawgt:approval dawgt:Approved ;
-    dawgt:approvedBy <http://www.w3.org/2007/06/19-dawg-minutes.html> ;
-	rdfs:comment	"'xyz'@en != 'xyz'@EN" ;
-    mf:action
-       [ qt:query  <lang-case-sensitivity-ne.rq> ;
-         qt:data   <lang-case-sensitivity.ttl> ] ;
-    mf:result  <lang-case-insensitive-ne.srx> .
-

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-blank-1.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-blank-1.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-blank-1.rq
deleted file mode 100755
index 49f1556..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-blank-1.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX  xsd: <http://www.w3.org/2001/XMLSchema#>
-PREFIX  : <http://example.org/things#>
-SELECT  ?x ?v
-WHERE
-    { ?x :p ?v . 
-      FILTER isBlank(?v) .
-    }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-datatype-1.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-datatype-1.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-datatype-1.rq
deleted file mode 100755
index 13a59e3..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-datatype-1.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX  xsd: <http://www.w3.org/2001/XMLSchema#>
-PREFIX  : <http://example.org/things#>
-SELECT  ?x ?v
-WHERE
-    { ?x :p ?v . 
-      FILTER ( datatype(?v) = xsd:double ) .
-    }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-datatype-2.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-datatype-2.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-datatype-2.rq
deleted file mode 100755
index a6d9bab..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-datatype-2.rq
+++ /dev/null
@@ -1,9 +0,0 @@
-# Which literals have a datatype and which are errors.
-
-PREFIX : <http://example/> 
-PREFIX  xsd:    <http://www.w3.org/2001/XMLSchema#>
-
-SELECT ?x
-{ ?x :p ?v . 
-  FILTER(  datatype(?v) != <http://example/NotADataTypeIRI> ) 
-}

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-datatype-3.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-datatype-3.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-datatype-3.rq
deleted file mode 100755
index 308f7c5..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-datatype-3.rq
+++ /dev/null
@@ -1,9 +0,0 @@
-# Whichliterals have xsd:string as a datatype
-
-PREFIX : <http://example/> 
-PREFIX  xsd:    <http://www.w3.org/2001/XMLSchema#>
-
-SELECT ?x
-{ ?x :p ?v . 
-  FILTER( datatype(?v) = xsd:string ) 
-}

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-iri-1.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-iri-1.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-iri-1.rq
deleted file mode 100755
index dd33f02..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-iri-1.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX  xsd: <http://www.w3.org/2001/XMLSchema#>
-PREFIX  : <http://example.org/things#>
-SELECT  ?x ?v
-WHERE
-    { ?x :p ?v . 
-      FILTER isIRI(?v) .
-    }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-isliteral-1.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-isliteral-1.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-isliteral-1.rq
deleted file mode 100755
index 5299734..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-isliteral-1.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX  xsd: <http://www.w3.org/2001/XMLSchema#>
-PREFIX  : <http://example/>
-SELECT  ?x 
-WHERE
-    { ?x :p ?v . 
-      FILTER isLiteral(?v) .
-    }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-lang-1.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-lang-1.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-lang-1.rq
deleted file mode 100755
index a7ee383..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-lang-1.rq
+++ /dev/null
@@ -1,9 +0,0 @@
-# Test which things have a lang tag of some form.
-
-PREFIX : <http://example/> 
-PREFIX  xsd:    <http://www.w3.org/2001/XMLSchema#>
-
-SELECT ?x
-{ ?x :p ?v . 
-  FILTER ( lang(?v) != '@NotALangTag@' )
-}

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-lang-2.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-lang-2.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-lang-2.rq
deleted file mode 100755
index ce97064..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-lang-2.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX : <http://example/> 
-PREFIX  xsd:    <http://www.w3.org/2001/XMLSchema#>
-
-SELECT ?x
-{ ?x :p ?v . 
-  FILTER ( lang(?v) = '' )
-}

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-lang-3.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-lang-3.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-lang-3.rq
deleted file mode 100755
index ecb703d..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-lang-3.rq
+++ /dev/null
@@ -1,6 +0,0 @@
-PREFIX : <http://example/> 
-PREFIX  xsd:    <http://www.w3.org/2001/XMLSchema#>
-
-SELECT ?x
-{ ?x :p "string"@EN
-}

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-langMatches-1.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-langMatches-1.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-langMatches-1.rq
deleted file mode 100755
index 04e9c98..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-langMatches-1.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example.org/#>
-
-SELECT *
-{ :x ?p ?v . FILTER langMatches(lang(?v), "en-GB") . }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-langMatches-2.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-langMatches-2.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-langMatches-2.rq
deleted file mode 100755
index 8c98dd3..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-langMatches-2.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example.org/#>
-
-SELECT *
-{ :x ?p ?v . FILTER langMatches(lang(?v), "en") . }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-langMatches-3.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-langMatches-3.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-langMatches-3.rq
deleted file mode 100755
index 5aa6903..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-langMatches-3.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example.org/#>
-
-SELECT *
-{ :x ?p ?v . FILTER langMatches(lang(?v), "*") . }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-langMatches-4.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-langMatches-4.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-langMatches-4.rq
deleted file mode 100755
index e62eae4..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-langMatches-4.rq
+++ /dev/null
@@ -1,4 +0,0 @@
-PREFIX : <http://example.org/#>
-
-SELECT *
-{ :x ?p ?v . FILTER (! langMatches(lang(?v), "*")) . }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-langMatches-de-de.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-langMatches-de-de.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-langMatches-de-de.rq
deleted file mode 100644
index 0815bee..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-langMatches-de-de.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-# q-langMatches-de-de.rq
-# $Id: q-langMatches-de-de.rq,v 1.1 2007/08/11 18:32:04 eric Exp $
-
-PREFIX : <http://example.org/#>
-
-SELECT *
-{ :x ?p ?v . FILTER langMatches(lang(?v), "de-de") . }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-str-1.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-str-1.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-str-1.rq
deleted file mode 100755
index a00b57d..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-str-1.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX  xsd: <http://www.w3.org/2001/XMLSchema#>
-PREFIX  : <http://example.org/things#>
-SELECT  ?x ?v
-WHERE
-    { ?x :p ?v . 
-      FILTER ( str(?v) = "1" ) .
-    }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-str-2.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-str-2.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-str-2.rq
deleted file mode 100755
index e66ae02..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-str-2.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX  xsd: <http://www.w3.org/2001/XMLSchema#>
-PREFIX  : <http://example.org/things#>
-SELECT  ?x ?v
-WHERE
-    { ?x :p ?v . 
-      FILTER ( str(?v) = "01" ) .
-    }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-str-3.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-str-3.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-str-3.rq
deleted file mode 100755
index 8f9a290..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-str-3.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX  xsd: <http://www.w3.org/2001/XMLSchema#>
-PREFIX  : <http://example.org/things#>
-SELECT  ?x ?v
-WHERE
-    { ?x :p ?v . 
-      FILTER ( str(?v) = "zzz" ) .
-    }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-str-4.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-str-4.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-str-4.rq
deleted file mode 100755
index bdb2ff3..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-str-4.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX  xsd: <http://www.w3.org/2001/XMLSchema#>
-PREFIX  : <http://example.org/things#>
-SELECT  ?x ?v
-WHERE
-    { ?x :p ?v . 
-      FILTER ( str(?v) = ""  ) .
-    }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-uri-1.rq
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-uri-1.rq b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-uri-1.rq
deleted file mode 100755
index d8de720..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/q-uri-1.rq
+++ /dev/null
@@ -1,7 +0,0 @@
-PREFIX  xsd: <http://www.w3.org/2001/XMLSchema#>
-PREFIX  : <http://example.org/things#>
-SELECT  ?x ?v
-WHERE
-    { ?x :p ?v . 
-      FILTER isURI(?v) .
-    }

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-blank-1.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-blank-1.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-blank-1.ttl
deleted file mode 100755
index b6f8142..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-blank-1.ttl
+++ /dev/null
@@ -1,16 +0,0 @@
-@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix :        <http://example.org/things#> .
-
-[]    rdf:type    rs:ResultSet ;
-      rs:resultVariable  "x" ;
-      rs:resultVariable  "v" ;
-      rs:solution
-                  [ rs:binding  [ rs:value    :xb ;
-                                  rs:variable  "x"
-                                ] ;
-                    rs:binding  [ rs:value    [] ;
-                                  rs:variable  "v"
-                                ]
-                  ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-datatype-1.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-datatype-1.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-datatype-1.ttl
deleted file mode 100755
index 48bb340..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-datatype-1.ttl
+++ /dev/null
@@ -1,32 +0,0 @@
-@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix :        <http://example.org/things#> .
-
-[]    rdf:type    rs:ResultSet ;
-      rs:resultVariable  "x" ;
-      rs:resultVariable  "v" ;
-      rs:solution
-                  [ rs:binding  [ rs:value    "1.0e0"^^xsd:double ;
-                                  rs:variable  "v"
-                                ] ;
-                    rs:binding  [ rs:value    :xd1 ;
-                                  rs:variable  "x"
-                                ]
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    :xd3 ;
-                                  rs:variable  "x"
-                                ] ;
-                    rs:binding  [ rs:value    "1"^^xsd:double ;
-                                  rs:variable  "v"
-                                ]
-                  ] ;
-      rs:solution
-                  [ rs:binding  [ rs:value    :xd2 ;
-                                  rs:variable  "x"
-                                ] ;
-                    rs:binding  [ rs:value    "1.0"^^xsd:double ;
-                                  rs:variable  "v"
-                                ]
-                  ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-datatype-2.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-datatype-2.srx b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-datatype-2.srx
deleted file mode 100755
index 33ffbe8..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-datatype-2.srx
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="x"/>
-  </head>
-  <results>
-    <result>
-      <binding name="x">
-        <uri>http://example/x1</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x2</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x4</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x5</uri>
-      </binding>
-    </result>
-  </results>
-</sparql>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-datatype-3.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-datatype-3.srx b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-datatype-3.srx
deleted file mode 100755
index e0b1d3c..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-datatype-3.srx
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="x"/>
-  </head>
-  <results>
-    <result>
-      <binding name="x">
-        <uri>http://example/x1</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x2</uri>
-      </binding>
-    </result>
-  </results>
-</sparql>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-iri-1.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-iri-1.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-iri-1.ttl
deleted file mode 100755
index 1a224e1..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-iri-1.ttl
+++ /dev/null
@@ -1,16 +0,0 @@
-@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix :        <http://example.org/things#> .
-
-[]    rdf:type    rs:ResultSet ;
-      rs:resultVariable  "x" ;
-      rs:resultVariable  "v" ;
-      rs:solution
-                  [ rs:binding  [ rs:value    :z ;
-                                  rs:variable  "v"
-                                ] ;
-                    rs:binding  [ rs:value    :xu ;
-                                  rs:variable  "x"
-                                ]
-                  ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-isliteral-1.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-isliteral-1.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-isliteral-1.ttl
deleted file mode 100755
index 27ebb99..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-isliteral-1.ttl
+++ /dev/null
@@ -1,28 +0,0 @@
-@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix :        <http://example/> .
-
-[]    rdf:type    rs:ResultSet ;
-      rs:resultVariable  "x" ;
-      rs:solution
-                  [ rs:binding  [ rs:value    :x1 ;
-                                  rs:variable  "x"
-                                ] ;
-                  ], 
-                  [ rs:binding  [ rs:value    :x2 ;
-                                  rs:variable  "x"
-                                ] ;
-                  ], 
-                  [ rs:binding  [ rs:value    :x3 ;
-                                  rs:variable  "x"
-                                ] ;
-                  ], 
-                  [ rs:binding  [ rs:value    :x4 ;
-                                  rs:variable  "x"
-                                ] ;
-                  ], 
-                  [ rs:binding  [ rs:value    :x5 ;
-                                  rs:variable  "x"
-                                ] ;
-                  ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-lang-1.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-lang-1.srx b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-lang-1.srx
deleted file mode 100755
index 2155be0..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-lang-1.srx
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="x"/>
-  </head>
-  <results>
-    <result>
-      <binding name="x">
-        <uri>http://example/x1</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x2</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x3</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x4</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x5</uri>
-      </binding>
-    </result>
-  </results>
-</sparql>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-lang-2.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-lang-2.srx b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-lang-2.srx
deleted file mode 100755
index 33ffbe8..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-lang-2.srx
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="x"/>
-  </head>
-  <results>
-    <result>
-      <binding name="x">
-        <uri>http://example/x1</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x2</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x4</uri>
-      </binding>
-    </result>
-    <result>
-      <binding name="x">
-        <uri>http://example/x5</uri>
-      </binding>
-    </result>
-  </results>
-</sparql>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-lang-3.srx
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-lang-3.srx b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-lang-3.srx
deleted file mode 100755
index 7267c63..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-lang-3.srx
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<sparql
-    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema#"
-    xmlns="http://www.w3.org/2005/sparql-results#" >
-  <head>
-    <variable name="x"/>
-  </head>
-  <results>
-    <result>
-      <binding name="x">
-        <uri>http://example/x3</uri>
-      </binding>
-    </result>
-  </results>
-</sparql>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-langMatches-1.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-langMatches-1.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-langMatches-1.ttl
deleted file mode 100755
index e05e658..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-langMatches-1.ttl
+++ /dev/null
@@ -1,14 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix :        <http://example.org/#> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:resultVariable  "p" ;
-      rs:resultVariable  "v" ;
-      rs:solution   [ rs:binding    [ rs:value      "abc"@en-gb ;
-                                      rs:variable   "v"
-                                    ] ;
-                      rs:binding    [ rs:value      :p4 ;
-                                      rs:variable   "p"
-                                    ]
-                    ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-langMatches-2.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-langMatches-2.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-langMatches-2.ttl
deleted file mode 100755
index 29adb9a..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-langMatches-2.ttl
+++ /dev/null
@@ -1,21 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix :        <http://example.org/#> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:resultVariable  "p" ;
-      rs:resultVariable  "v" ;
-      rs:solution   [ rs:binding    [ rs:value      :p3 ;
-                                      rs:variable   "p"
-                                    ] ;
-                      rs:binding    [ rs:value      "abc"@en ;
-                                      rs:variable   "v"
-                                    ]
-                    ] ;
-      rs:solution   [ rs:binding    [ rs:value      "abc"@en-gb ;
-                                      rs:variable   "v"
-                                    ] ;
-                      rs:binding    [ rs:value      :p4 ;
-                                      rs:variable   "p"
-                                    ]
-                    ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-langMatches-3.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-langMatches-3.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-langMatches-3.ttl
deleted file mode 100755
index 5c7db0a..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-langMatches-3.ttl
+++ /dev/null
@@ -1,28 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix :        <http://example.org/#> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:resultVariable  "v" ;
-      rs:resultVariable  "p" ;
-      rs:solution   [ rs:binding    [ rs:value      "abc"@en ;
-                                      rs:variable   "v"
-                                    ] ;
-                      rs:binding    [ rs:value      :p3 ;
-                                      rs:variable   "p"
-                                    ]
-                    ] ;
-      rs:solution   [ rs:binding    [ rs:value      :p4 ;
-                                      rs:variable   "p"
-                                    ] ;
-                      rs:binding    [ rs:value      "abc"@en-gb ;
-                                      rs:variable   "v"
-                                    ]
-                    ] ;
-      rs:solution   [ rs:binding    [ rs:value      :p5 ;
-                                      rs:variable   "p"
-                                    ] ;
-                      rs:binding    [ rs:value      "abc"@fr ;
-                                      rs:variable   "v"
-                                    ]
-                    ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-langMatches-4.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-langMatches-4.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-langMatches-4.ttl
deleted file mode 100755
index 5931a31..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-langMatches-4.ttl
+++ /dev/null
@@ -1,14 +0,0 @@
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix :        <http://example.org/#> .
-
-[]    rdf:type      rs:ResultSet ;
-      rs:resultVariable  "v" ;
-      rs:resultVariable  "p" ;
-      rs:solution   [ rs:binding    [ rs:value      "abc" ;
-                                      rs:variable   "v"
-                                    ] ;
-                      rs:binding    [ rs:value      :p1 ;
-                                      rs:variable   "p"
-                                    ]
-                    ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-langMatches-de.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-langMatches-de.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-langMatches-de.ttl
deleted file mode 100644
index 59087ec..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-langMatches-de.ttl
+++ /dev/null
@@ -1,16 +0,0 @@
-# result-langMatches-de.ttl
-# $Id: result-langMatches-de.ttl,v 1.2 2007/08/11 18:29:27 eric Exp $
-
-@prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]  rdf:type    rs:ResultSet ;
-    rs:resultVariable
-                "p", "v" ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/#p4> ;
-                                rs:variable "p"
-                              ] ,
-                              [ rs:value    "abc"@de-de ;
-                                rs:variable "v"
-                              ]
-                ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-sameTerm-eq.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-sameTerm-eq.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-sameTerm-eq.ttl
deleted file mode 100644
index 0a0d9a3..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-sameTerm-eq.ttl
+++ /dev/null
@@ -1,188 +0,0 @@
-@prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]  rdf:type    rs:ResultSet ;
-    rs:resultVariable
-                "x1", "v1", "x2", "v2" ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xu> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#z> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xu> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    <http://example.org/things#z> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xd2> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1.0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xd2> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1.0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xp1> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "zzz" ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xp1> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "zzz" ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xp2> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1" ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xp2> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1" ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xi2> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xi2> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xi2> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xi1> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xp2> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "" ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xp2> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "" ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xd1> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1.0e0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xd1> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1.0e0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xb> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    _:b ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xb> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    _:b ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xi3> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "01"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xi3> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "01"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xt1> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "zzz"^^<http://example.org/things#myType> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xt1> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "zzz"^^<http://example.org/things#myType> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xd3> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xd3> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xi1> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xi2> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xi1> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xi1> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v2"
-                              ]
-                ] .

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/69202230/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-sameTerm-not-eq.ttl
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-sameTerm-not-eq.ttl b/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-sameTerm-not-eq.ttl
deleted file mode 100644
index ff54525..0000000
--- a/platform/marmotta-sparql/src/test/resources/test-suite-archive/data-r2/expr-builtin/result-sameTerm-not-eq.ttl
+++ /dev/null
@@ -1,370 +0,0 @@
-@prefix rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rs:      <http://www.w3.org/2001/sw/DataAccess/tests/result-set#> .
-
-[]  rdf:type    rs:ResultSet ;
-    rs:resultVariable
-                "x1", "v1", "x2", "v2" ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xd2> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1.0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xi2> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xd2> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1.0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xd1> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1.0e0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xd2> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1.0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xi3> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "01"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xd2> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1.0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xd3> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xd2> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1.0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xi1> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xi2> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xd2> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1.0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xi2> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xd1> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1.0e0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xi2> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xi3> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "01"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xi2> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xd3> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xd1> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1.0e0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xd2> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1.0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xd1> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1.0e0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xi2> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xd1> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1.0e0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xi3> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "01"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xd1> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1.0e0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xd3> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xd1> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1.0e0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xi1> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xi3> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "01"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xd2> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1.0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xi3> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "01"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xi2> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xi3> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "01"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xd1> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1.0e0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xi3> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "01"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xd3> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xi3> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "01"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xi1> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xd3> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xd2> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1.0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xd3> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xi2> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xd3> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xd1> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1.0e0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xd3> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xi3> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "01"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xd3> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xi1> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xi1> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xd2> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1.0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xi1> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xd1> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1.0e0"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xi1> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xi3> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "01"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v2"
-                              ]
-                ] ;
-    rs:solution [ rs:binding  [ rs:value    <http://example.org/things#xi1> ;
-                                rs:variable "x1"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#integer> ;
-                                rs:variable "v1"
-                              ] ,
-                              [ rs:value    <http://example.org/things#xd3> ;
-                                rs:variable "x2"
-                              ] ,
-                              [ rs:value    "1"^^<http://www.w3.org/2001/XMLSchema#double> ;
-                                rs:variable "v2"
-                              ]
-                ] .


Mime
View raw message