Menu
▾
▴
rdfapi-php-svn
|
From: <cw...@us...> - 2007-08-08 13:47:54
|
Revision: 475
http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=475&view=rev
Author: cweiske
Date: 2007-08-08 06:47:51 -0700 (Wed, 08 Aug 2007)
Log Message:
-----------
- Enable all tests
- Fix result array of test-B-18
- Modify debug message to tell which array was expected and which the calculated result
Modified Paths:
--------------
trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php
trunk/rdfapi-php/test/unit/Sparql/cases.php
trunk/rdfapi-php/test/unit/Sparql/result/test-B-18.res
Modified: trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php 2007-08-08 12:56:38 UTC (rev 474)
+++ trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php 2007-08-08 13:47:51 UTC (rev 475)
@@ -94,9 +94,11 @@
echo get_class($e) . ': ' . $e->getMessage() . "\n";
}
echo 'Query string: ' . $qs . "\n";
+ echo "Expected:\n";
echo Console_Color::convert('%p');
var_dump($result);
echo Console_Color::convert('%n');
+ echo "Result:\n";
echo Console_Color::convert('%r');
var_dump($t);
echo Console_Color::convert('%n');
Modified: trunk/rdfapi-php/test/unit/Sparql/cases.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/cases.php 2007-08-08 12:56:38 UTC (rev 474)
+++ trunk/rdfapi-php/test/unit/Sparql/cases.php 2007-08-08 13:47:51 UTC (rev 475)
@@ -51,6 +51,8 @@
'ex11.2.3.1_1',
//bound() across union patterns is not possible
'ex11.2.3.2_0',
+ 'query-survey-1',
+ 'query-eq2-1',
);
@@ -73,7 +75,7 @@
15 => "q-select-1" ,
16 => "q-select-2" ,
17 => "q-select-3" ,
-// 18 => "query-survey-1"
+ 18 => "query-survey-1"
);
@@ -110,11 +112,11 @@
6 => array('data' => "data-sort-6.n3",
'query' => "query-sort-6",
'result' => "sort6") ,
-/*
- 7 => array('data' => "data-sort-7.n3",
- 'query' => "query-sort-7",
- 'result' => "sort7") ,
-*/
+//file is missing
+// 7 => array('data' => "data-sort-7.n3",
+// 'query' => "query-sort-7",
+// 'result' => "sort7") ,
+
8 => array('data' => "data-sort-8.n3",
'query' => "query-sort-4",
'result' => "sort8") ,
@@ -321,13 +323,13 @@
'query' => "query-eq-5",
'result' => "query-eq-5") ,
- //(43) => array('data' => "data-eq.n3",
- // 'query' => "query-eq2-1",
- // 'result' => "query-eq2-1") ,
+ 43 => array('data' => "data-eq.n3",
+ 'query' => "query-eq2-1",
+ 'result' => "query-eq2-1") ,
- //(44) => array('data' => "data-eq.n3",
- // 'query' => "query-eq2-1",
- // 'result' => "query-eq2-1") ,
+ 44 => array('data' => "data-eq.n3",
+ 'query' => "query-eq2-1",
+ 'result' => "query-eq2-1") ,
/**/
@@ -537,9 +539,9 @@
'result' => "test-4-05") ,
//ARQ fails
- //(47) => array('data' => "model3.nt",
- // 'query' => "test-4-06",
- // 'result' => "test-4-06") ,
+ (47) => array('data' => "model3.nt",
+ 'query' => "test-4-06",
+ 'result' => "test-4-06") ,
(48) => array('data' => "model3.nt",
'query' => "test-4-07",
@@ -643,28 +645,28 @@
'result' => "test-B-13") ,
// FAILS because 5==true
- //(73) => array('data' => "model9.n3",
- // 'query' => "test-B-15",
- // 'result' => "test-B-15") ,
+ (73) => array('data' => "model9.n3",
+ 'query' => "test-B-15",
+ 'result' => "test-B-15") ,
// FAILS because of type error
- //(74) => array('data' => "model9.n3",
- // 'query' => "test-B-17",
- // 'result' => "test-B-17") ,
+ (74) => array('data' => "model9.n3",
+ 'query' => "test-B-17",
+ 'result' => "test-B-17") ,
// FAILS because of type error
- //(75) => array('data' => "model9.n3",
- // 'query' => "test-B-18",
- // 'result' => "test-B-18") ,
+ (75) => array('data' => "model9.n3",
+ 'query' => "test-B-18",
+ 'result' => "test-B-18") ,
(76) => array('data' => "model9.n3",
'query' => "test-B-19",
'result' => "test-B-19") ,
// FAILS because of type error
- //(77) => array('data' => "model9.n3",
- // 'query' => "test-B-20",
- // 'result' => "test-B-20") ,
+ (77) => array('data' => "model9.n3",
+ 'query' => "test-B-20",
+ 'result' => "test-B-20") ,
);
Modified: trunk/rdfapi-php/test/unit/Sparql/result/test-B-18.res
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/result/test-B-18.res 2007-08-08 12:56:38 UTC (rev 474)
+++ trunk/rdfapi-php/test/unit/Sparql/result/test-B-18.res 2007-08-08 13:47:51 UTC (rev 475)
@@ -24,9 +24,10 @@
$res10 = new Resource("http://rdf.hp.com/p1");
-$arr["?v"] =$res1;
-$arr["?y"] =$res3;
-$arr["?x"] =$res2;
+$arr = array();
+$arr["?v"] = $res1;
+$arr["?y"] = $res3;
+$arr["?x"] = $res2;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cw...@us...> - 2007-08-08 16:31:43
|
Revision: 478
http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=478&view=rev
Author: cweiske
Date: 2007-08-08 09:21:15 -0700 (Wed, 08 Aug 2007)
Log Message:
-----------
This test seems really broken to me - SpEDb does return the correct result set IMO
Modified Paths:
--------------
trunk/rdfapi-php/test/unit/Sparql/cases.php
trunk/rdfapi-php/test/unit/Sparql/result/query-survey-1.res
Modified: trunk/rdfapi-php/test/unit/Sparql/cases.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/cases.php 2007-08-08 13:52:35 UTC (rev 477)
+++ trunk/rdfapi-php/test/unit/Sparql/cases.php 2007-08-08 16:21:15 UTC (rev 478)
@@ -51,6 +51,7 @@
'ex11.2.3.1_1',
//bound() across union patterns is not possible
'ex11.2.3.2_0',
+ //test is broken IMO (cweiske)
'query-survey-1',
);
Modified: trunk/rdfapi-php/test/unit/Sparql/result/query-survey-1.res
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/result/query-survey-1.res 2007-08-08 13:52:35 UTC (rev 477)
+++ trunk/rdfapi-php/test/unit/Sparql/result/query-survey-1.res 2007-08-08 16:21:15 UTC (rev 478)
@@ -4,6 +4,7 @@
$res5 = new Literal("Bob");
$res5 = new Literal("John");
+$arr =array();
$arr["?n"]=$res5;
$arr["?n"]=$res5;
$arr["?n"]=$res5;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cw...@us...> - 2007-08-12 14:38:55
|
Revision: 488
http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=488&view=rev
Author: cweiske
Date: 2007-08-12 07:38:53 -0700 (Sun, 12 Aug 2007)
Log Message:
-----------
Dawg2 helper class and script
Added Paths:
-----------
trunk/rdfapi-php/test/unit/Sparql/Dawg2Helper.php
trunk/rdfapi-php/test/unit/Sparql/create-dawg2.php
Added: trunk/rdfapi-php/test/unit/Sparql/Dawg2Helper.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/Dawg2Helper.php (rev 0)
+++ trunk/rdfapi-php/test/unit/Sparql/Dawg2Helper.php 2007-08-12 14:38:53 UTC (rev 488)
@@ -0,0 +1,215 @@
+<?php
+
+require_once RDFAPI_INCLUDE_DIR . 'model/ModelFactory.php';
+require_once RDFAPI_INCLUDE_DIR . 'sparql/SparqlParser.php';
+require_once RDFAPI_INCLUDE_DIR . 'sparql/SparqlEngine.php';
+
+class Dawg2Helper
+{
+
+
+
+ /**
+ * Loads DAWG2 tests and adds them to the cases session array
+ * so that they can be executed with the normal tests
+ */
+ public static function loadDawg2Tests()
+ {
+ $suiteDir = dirname(__FILE__) . '/w3c-dawg2/data-r2/';
+ $suites = array(
+// 'manifest-evaluation.ttl',
+// 'extended-manifest-evaluation.ttl',
+ 'manifest-syntax.ttl'
+ );
+
+ $arTests = array();
+ foreach ($suites as $suite) {
+ $arTests = array_merge(
+ $arTests,
+ self::loadSuiteFromManifest($suiteDir . $suite)
+ );
+ }
+
+ //make relative paths
+ $strip = dirname(__FILE__) . '/';
+ foreach ($arTests as &$test) {
+ foreach ($test as $id => $value) {
+ if (substr($value, 0, strlen($strip)) == $strip) {
+ $test[$id] = substr($value, strlen($strip));
+ }
+ }
+ }
+
+ //activate it in cases.php
+ $_SESSION['sparql_dawg2_tests'] = $arTests;
+ $_SESSION['sparqlTestGroups'] = array();//remove other cases
+ $_SESSION['sparqlTestGroups']['dawg2'] = array(//'deact'=>1,
+ 'title' => 'DAWG2 tests',
+ 'tests' => 'sparql_dawg2_tests',
+ 'checkfunc' => 'resultCheck'
+ );
+
+ }//public static function loadDawg2Tests()
+
+
+
+ /**
+ * Loads all test collections from a test suite manifest file.
+ * A test suite file is an N3 rdf data file linking to other
+ * collection manifest files.
+ *
+ * @param string $strSuiteFile Test suite file
+ *
+ */
+ public static function loadSuiteFromManifest($strSuiteFile)
+ {
+ //if someone knows a proper way to select all rdf collection
+ //items with a single query, tell me
+ $res = self::queryN3($strSuiteFile,
+ 'PREFIX mf: <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#>
+ SELECT ?title, ?file WHERE {
+ ?x rdfs:label ?title.
+ ?y rdf:first ?file.
+ }'
+ );
+
+ $arTests = array();
+ $dirname = dirname($strSuiteFile);
+ foreach ($res as $data) {
+ $file = $dirname . '/' . $data['?file']->uri;
+ $arTests = array_merge(
+ $arTests,
+ self::loadCollectionFromManifest($file)
+ );
+ }
+ return $arTests;
+ }//public static function loadSuiteFromManifest($strSuiteFile)
+
+
+
+ /**
+ * Loads tests from a test collection manifest file.
+ * A collection manifest contains only tests, no links to other
+ * manifest files.
+ *
+ * @param string $strCollectionFile Path of the collection file
+ *
+ * @return array Array of test definitions compatible to those in
+ * cases.php
+ */
+ public static function loadCollectionFromManifest($strCollectionFile)
+ {
+ if (!file_exists($strCollectionFile)) {
+ throw new Exception('Collection file does not exist: ' . $strCollectionFile);
+ }
+
+ //$arTests = self::loadEvaluationTests($strCollectionFile);
+ $arTests = array();
+ $arTests = array_merge($arTests, self::loadSyntaxTests($strCollectionFile));
+ return $arTests;
+ }//public static function loadCollectionFromManifest($strCollectionFile)
+
+
+
+ public static function loadEvaluationTests($strCollectionFile)
+ {
+ $res = self::queryN3($strCollectionFile,
+ '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#>
+ SELECT ?name ?queryFile ?dataFile ?resultFile WHERE {
+ ?test rdf:type mf:QueryEvaluationTest.
+ ?test mf:name ?name.
+ ?test dawgt:approval dawgt:Approved.
+ ?test mf:action _:action.
+ _:action qt:query ?queryFile.
+ _:action qt:data ?dataFile.
+ ?test mf:result ?resultFile.
+ }'
+ );
+
+ $dirname = dirname($strCollectionFile) . '/';
+ $arTests = array();
+
+ //this is a bug in SparqlEngine and should be fixed
+ if ($res === false) {
+ return array();
+ }
+
+ foreach ($res as $test) {
+ $arTests[] = array(
+ 'title' => $test['?name']->label,
+ 'data' => $dirname . $test['?dataFile']->uri,
+ 'query' => $dirname . $test['?queryFile']->uri,
+ 'result' => $dirname . $test['?resultFile']->uri,
+ );
+ }
+
+ return $arTests;
+ }//public static function loadEvaluationTests($strCollectionFile)
+
+
+
+ public static function loadSyntaxTests($strCollectionFile)
+ {
+ $res = self::queryN3($strCollectionFile,
+ '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#>
+ SELECT ?name ?queryFile ?type WHERE {
+ ?test rdf:type ?type.
+ ?test mf:name ?name.
+ ?test dawgt:approval dawgt:Approved.
+ ?test mf:action ?queryFile.
+ FILTER(?type = mf:NegativeSyntaxTest || ?type = mf:PositiveSyntaxTest)
+ }'
+ );
+
+ $dirname = dirname($strCollectionFile) . '/';
+ $arTests = array();
+
+ //this is a bug in SparqlEngine and should be fixed
+ if ($res === false) {
+ return array();
+ }
+ foreach ($res as $test) {
+ if ($test['?type']->uri == 'http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#PositiveSyntaxTest') {
+ $type = 'syntax-positive';
+ } else {
+ $type = 'syntax-negative';
+ }
+ $arTests[] = array(
+ 'title' => $test['?name']->label,
+ 'query' => $dirname . $test['?queryFile']->uri,
+ 'type' => $type
+ );
+ }
+
+ return $arTests;
+ }//public static function loadEvaluationTests($strCollectionFile)
+
+
+
+ /**
+ * Executes a SPARQL query on the data written in an
+ * file containing N3-formatted RDF data
+ *
+ * @param string $strN3File Path to file
+ * @param string $strSparqlQuery SPARQL query to execute
+ *
+ * @return mixed SPARQL engine query results
+ */
+ public static function queryN3($strN3File, $strSparqlQuery)
+ {
+ $graphset = ModelFactory::getDatasetMem('Dataset1');
+ $graph1 = $graphset->getDefaultGraph();
+ $graph1 ->load($strN3File, 'n3');
+
+ $parser = new SparqlParser();
+ $q = $parser->parse($strSparqlQuery);
+ $engine = SparqlEngine::factory();
+ return $engine->queryModel($graphset, $q, false);
+ }//public static function queryN3($strN3File, $strSparqlQuery)
+}
+
+?>
\ No newline at end of file
Added: trunk/rdfapi-php/test/unit/Sparql/create-dawg2.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/create-dawg2.php (rev 0)
+++ trunk/rdfapi-php/test/unit/Sparql/create-dawg2.php 2007-08-12 14:38:53 UTC (rev 488)
@@ -0,0 +1,24 @@
+<?php
+/**
+* Utility script to generate an array of dawg2 tests similar to
+* cases.php from the n3 tests notation.
+* We could read the n3 test definition files everytime we run the tests,
+* but this takes too long - so we cache it.
+*
+* Usage:
+* php create-dawg2.php > cases_dawg2.php
+*/
+require_once dirname(__FILE__) . '/../../config.php';
+require_once 'Dawg2Helper.php';
+
+Dawg2Helper::loadDawg2Tests();
+
+echo "<?php
+/**
+* automatically created by create-dawg2.php
+*/
+\$_SESSION['sparql_dawg2_tests'] = ";
+var_export($_SESSION['sparql_dawg2_tests']);
+echo ";
+?>";
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cw...@us...> - 2007-08-12 14:57:59
|
Revision: 489
http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=489&view=rev
Author: cweiske
Date: 2007-08-12 07:57:56 -0700 (Sun, 12 Aug 2007)
Log Message:
-----------
Adding w3c dawg test data and case listing
Added Paths:
-----------
trunk/rdfapi-php/test/unit/Sparql/cases_dawg2.php
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/data-1.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/data-2.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-nested-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-nested-1.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-nested-2.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-nested-2.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-placement-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-placement-1.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-placement-2.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-placement-2.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-placement-3.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-placement-3.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-scope-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/filter-scope-1.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/manifest.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/opt-filter-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/opt-filter-1.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/opt-filter-1.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/opt-filter-2.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/opt-filter-2.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/opt-filter-2.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/opt-filter-3.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/opt-filter-3.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/opt-filter-3.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/two-nested-opt-alt.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/two-nested-opt-alt.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/two-nested-opt.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/two-nested-opt.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/two-nested-opt.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/var-scope-join-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/var-scope-join-1.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra/var-scope-join-1.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/algebra-expressions.txt
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/ask-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/ask-1.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/ask-4.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/ask-4.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/ask-7.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/ask-7.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/ask-8.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/ask-8.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/data.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/ask/manifest.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/base-prefix-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/base-prefix-1.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/base-prefix-2.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/base-prefix-2.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/base-prefix-3.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/base-prefix-3.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/base-prefix-4.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/base-prefix-4.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/base-prefix-5.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/base-prefix-5.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/bgp-no-match.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/bgp-no-match.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/data-1.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/data-2.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/data-3.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/data-4.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/data-5.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/data-6.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/data-7.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/list-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/list-1.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/list-2.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/list-2.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/list-3.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/list-3.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/list-4.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/list-4.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/manifest.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/prefix-name-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/prefix-name-1.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/quotes-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/quotes-1.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/quotes-2.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/quotes-2.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/quotes-3.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/quotes-3.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/quotes-4.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/quotes-4.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/spoo-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/spoo-1.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-1.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-2.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-2.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-3.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-3.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-4.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-4.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-5.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-5.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-6.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-6.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-7.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-7.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-8.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-8.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-9.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/term-9.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/var-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/var-1.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/var-2.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/basic/var-2.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/bnode-coreference/
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/bnode-coreference/data.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/bnode-coreference/manifest.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/bnode-coreference/query.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/bnode-coreference/result.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/data-1.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/data-2.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/manifest.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/query-bev-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/query-bev-2.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/query-bev-3.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/query-bev-4.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/query-bev-5.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/query-bev-6.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/result-bev-1.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/result-bev-2.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/result-bev-3.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/result-bev-4.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/result-bev-5.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/boolean-effective-value/result-bev-6.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/bound/
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/bound/bound1-result.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/bound/bound1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/bound/data.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/bound/manifest.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/data-ident.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/data-opt.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/data-reif.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/manifest.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/query-construct-optional.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/query-ident.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/query-reif-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/query-reif-2.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/query-subgraph.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/result-construct-optional.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/result-ident.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/result-reif.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/construct/result-subgraph.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/data-g1.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/data-g2.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/data-g3.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/data-g4.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-01.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-01.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-02.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-02.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-03.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-03.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-04.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-04.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-05.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-05.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-06.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-06.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-07.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-07.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-08.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-08.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-09.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-09.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-10.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-10.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-11.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-11.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-12.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/dataset-12.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/dataset/manifest.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/data-all.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/data-node.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/data-num.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/data-opt.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/data-star.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/data-str.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/distinct-1-results.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/distinct-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/distinct-2.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/distinct-all.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/distinct-node.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/distinct-num.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/distinct-opt.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/distinct-star-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/distinct-star-1.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/distinct-str.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/manifest.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/no-distinct-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/no-distinct-2.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/no-distinct-all.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/no-distinct-node.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/no-distinct-num.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/no-distinct-opt.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/distinct/no-distinct-str.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/data-builtin-1.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/data-builtin-2.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/data-langMatches-de.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/data-langMatches.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/lang-case-insensitive-eq.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/lang-case-insensitive-ne.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/lang-case-sensitivity-eq.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/lang-case-sensitivity-ne.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/lang-case-sensitivity.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/manifest.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-blank-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-datatype-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-datatype-2.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-datatype-3.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-iri-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-isliteral-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-lang-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-lang-2.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-lang-3.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-langMatches-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-langMatches-2.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-langMatches-3.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-langMatches-4.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-langMatches-de-DE.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-langMatches-de-de.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-str-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-str-2.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-str-3.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-str-4.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/q-uri-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-blank-1.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-datatype-1.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-datatype-2.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-datatype-3.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-iri-1.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-isliteral-1.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-lang-1.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-lang-2.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-lang-3.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-langMatches-1.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-langMatches-2.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-langMatches-3.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-langMatches-4.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-langMatches-de.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-str-1.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-str-2.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-str-3.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-str-4.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-builtin/result-uri-1.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/data-eq.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/manifest.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq-2.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq-3.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq-4.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq-5.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq-graph-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq-graph-2.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq-graph-3.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq-graph-4.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq-graph-5.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq2-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq2-2.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/query-eq2-graph-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq-1.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq-2.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq-3.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq-4.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq-5.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq-graph-1.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq-graph-2.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq-graph-3.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq-graph-4.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq-graph-5.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq2-1.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq2-2.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-equals/result-eq2-graph-1.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/data.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/manifest.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/query-ge-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/query-le-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/query-minus-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/query-mul-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/query-plus-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/query-unminus-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/query-unplus-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/result-ge-1.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/result-le-1.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/result-minus-1.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/result-mul-1.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/result-plus-1.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/result-unminus-1.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/expr-ops/result-unplus-1.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/extended-manifest-evaluation.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/data-g1.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/data-g2.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/data-g3.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/data-g4.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-01.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-01.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-02.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-02.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-03.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-03.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-04.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-04.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-05.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-05.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-06.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-06.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-07.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-07.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-08.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-08.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-09.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-09.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-10.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-10.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-11.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/graph-11.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/graph/manifest.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/kanji-01-results.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/kanji-01.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/kanji-02-results.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/kanji-02.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/kanji.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/manifest.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/normalization-01-results.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/normalization-01.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/normalization-01.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/normalization-02-results.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/normalization-02.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/normalization-02.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/normalization-03-results.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/normalization-03.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/i18n/normalization-03.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/manifest-evaluation.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/manifest-syntax.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/data-1.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/data-2.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/data-3.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/data-4.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/date-1-result.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/date-1.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/date-2-result.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/date-2.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/date-3-result.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/date-3.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/date-4-result.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/date-4.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/manifest.ttl
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-cmp-01-result.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-cmp-01.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-cmp-02-result.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-cmp-02.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-01-result.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-01.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-02-result.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-02.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-03-result.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-03.rq
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-world/open-eq-04-result.srx
trunk/rdfapi-php/test/unit/Sparql/w3c-dawg2/data-r2/open-wo...
[truncated message content] |
|
From: <cw...@us...> - 2007-08-12 15:26:50
|
Revision: 490
http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=490&view=rev
Author: cweiske
Date: 2007-08-12 08:26:47 -0700 (Sun, 12 Aug 2007)
Log Message:
-----------
Unit test support for DAWG syntax tests
Modified Paths:
--------------
trunk/rdfapi-php/test/unit/Sparql/Dawg2Helper.php
trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php
trunk/rdfapi-php/test/unit/Sparql/SparqlTestHelper.php
trunk/rdfapi-php/test/unit/Sparql/cases.php
trunk/rdfapi-php/test/unit/Sparql/create-dawg2.php
Modified: trunk/rdfapi-php/test/unit/Sparql/Dawg2Helper.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/Dawg2Helper.php 2007-08-12 14:57:56 UTC (rev 489)
+++ trunk/rdfapi-php/test/unit/Sparql/Dawg2Helper.php 2007-08-12 15:26:47 UTC (rev 490)
@@ -17,8 +17,8 @@
{
$suiteDir = dirname(__FILE__) . '/w3c-dawg2/data-r2/';
$suites = array(
-// 'manifest-evaluation.ttl',
-// 'extended-manifest-evaluation.ttl',
+ 'manifest-evaluation.ttl',
+ 'extended-manifest-evaluation.ttl',
'manifest-syntax.ttl'
);
@@ -42,7 +42,6 @@
//activate it in cases.php
$_SESSION['sparql_dawg2_tests'] = $arTests;
- $_SESSION['sparqlTestGroups'] = array();//remove other cases
$_SESSION['sparqlTestGroups']['dawg2'] = array(//'deact'=>1,
'title' => 'DAWG2 tests',
'tests' => 'sparql_dawg2_tests',
@@ -103,8 +102,7 @@
throw new Exception('Collection file does not exist: ' . $strCollectionFile);
}
- //$arTests = self::loadEvaluationTests($strCollectionFile);
- $arTests = array();
+ $arTests = self::loadEvaluationTests($strCollectionFile);
$arTests = array_merge($arTests, self::loadSyntaxTests($strCollectionFile));
return $arTests;
}//public static function loadCollectionFromManifest($strCollectionFile)
Modified: trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php 2007-08-12 14:57:56 UTC (rev 489)
+++ trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php 2007-08-12 15:26:47 UTC (rev 490)
@@ -13,6 +13,9 @@
require_once 'Console/Color.php';
}
+//SparqlTestHelper::loadDawg2Tests();
+
+
class testSparqlDbTests extends UnitTestCase
{
protected static $strModelUri = 'unittest-model';
@@ -30,44 +33,84 @@
if (isset($arGroup['deact'])) continue;
$checkfunc = $arGroup['checkfunc'];
//echo count($_SESSION[$arGroup['tests']]) . " tests\n";
+
foreach ($_SESSION[$arGroup['tests']] as $name) {
+ $fileData = null;
+ $fileResult = null;
+ $fileQuery = null;
+
if (is_array($name)) {
- $fileData = $name['data'];
- $fileQuery = $name['query'] . '.rq';
- $fileResult = $name['result'] . '.res';
- $title = $name['query'];
+ if (isset($name['data'])) {
+ if (!file_exists(SPARQL_TESTFILES . $name['data'])) {
+ $fileData = 'data/' . $name['data'];
+ } else {
+ $fileData = $name['data'];
+ }
+ }
+
+ if (!file_exists(SPARQL_TESTFILES . $name['query'])) {
+ $fileQuery = 'query/' . $name['query'] . '.rq';
+ } else {
+ $fileQuery = $name['query'];
+ }
+
+ if (isset($name['result'])) {
+ if (!file_exists(SPARQL_TESTFILES . $name['result'])) {
+ $fileResult = 'result/' . $name['result'] . '.res';
+ } else {
+ $fileResult = $name['result'];
+ }
+ }
+
+ if (isset($name['title'])) {
+ $title = $name['title'];
+ } else {
+ $title = $name['query'];
+ }
} else {
- $fileData = $name . '.n3';
- $fileQuery = $name . '.rq';
- $fileResult = $name . '.res';
+ $fileData = 'data/' . $name . '.n3';
+ $fileQuery = 'query/' . $name . '.rq';
+ $fileResult = 'result/' . $name . '.res';
$title = $name;
}
if (in_array($title, $_SESSION['testSparqlDbTestsIgnores'])) {
-// echo Console_Color::convert('%y');
-// echo ' ignoring ' . $title . "\n";
-// echo Console_Color::convert('%n');
+ if (isset($GLOBALS['debugTests'])) {
+ echo Console_Color::convert('%y');
+ echo ' ignoring ' . $title . "\n";
+ echo Console_Color::convert('%n');
+ }
continue;
}
//echo ' ' . $title . "\n";
$_SESSION['test'] = $title . ' test';
$e = null;
- if ($fileData != $strLastDataFile) {
+ if ($fileData != null && $fileData != $strLastDataFile) {
//re-use database if not changed
list($database, $dbModel) = $this->prepareDatabase();
//import statements into database
- $dbModel ->load(SPARQL_TESTFILES . 'data/' . $fileData);
+ $dbModel ->load(SPARQL_TESTFILES . $fileData);
$strLastDataFile = $fileData;
}
- $qs = file_get_contents(SPARQL_TESTFILES . 'query/' . $fileQuery, 'r');
- $res = file_get_contents(SPARQL_TESTFILES . 'result/' . $fileResult, 'r');
- unset($result);
- eval($res);
- $q = $parser->parse($qs);
+ $qs = file_get_contents(SPARQL_TESTFILES . $fileQuery);
+ if ($fileResult !== null) {
+ $res = file_get_contents(SPARQL_TESTFILES . $fileResult);
+ unset($result);
+ eval($res);
+ }
+
+ if (isset($name['type']) &&
+ ($name['type'] == 'syntax-negative' || $name['type'] == 'syntax-positive')
+ ) {
+ $this->testQueryParse($qs, $parser, $name['type'], $title);
+ continue;
+ }
+
+ $q = $parser->parse($qs);
try {
- $t = $dbModel->sparqlQuery($qs);
+ $t = $dbModel->sparqlQuery($qs);
if ($t instanceof MemModel) {
$bOk = $t->equals($result);
@@ -110,11 +153,48 @@
}
// echo $arGroup['title'] . " done\n";
}
- }
+ }//public function testAllTestgroupsNoReload()
/**
+ * Runs a parser test
+ */
+ protected function testQueryParse($strQuery, $parser, $strType, $title)
+ {
+//echo $title . "\n";
+ $bException = false;
+ try {
+ $parser->parse($strQuery);
+ } catch (Exception $e) {
+ $bException = true;
+ }
+
+ if ($strType == 'syntax-negative') {
+ $this->assertTrue($bException, 'Query should fail to be parsed.');
+ $bOk = $bException == true;
+ } else if ($strType == 'syntax-positive') {
+ $this->assertFalse($bException, 'Query should get parsed.');
+ $bOk = $bException == false;
+ }
+
+ if (!$bOk) {
+ if (!isset($GLOBALS['debugTests'])) {
+ echo ' ' . $title . "\n";
+ } else {
+ echo Console_Color::convert('%RTest failed: ' . $title . "%n\n");
+ if (isset($e)) {
+ echo $e->getMessage() . "\n";
+ //var_dump($e);
+ }
+ echo $strQuery . "\n";
+ }
+ }
+ }//protected function testQueryParse($strQuery, $parser, $strType)
+
+
+
+ /**
* Instantiates the database object and clears
* any existing statements to have a fresh place
* for a unit test.
Modified: trunk/rdfapi-php/test/unit/Sparql/SparqlTestHelper.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/SparqlTestHelper.php 2007-08-12 14:57:56 UTC (rev 489)
+++ trunk/rdfapi-php/test/unit/Sparql/SparqlTestHelper.php 2007-08-12 15:26:47 UTC (rev 490)
@@ -1,4 +1,5 @@
<?php
+
/**
* Class with Sparql-Unittest helper methods
*/
Modified: trunk/rdfapi-php/test/unit/Sparql/cases.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/cases.php 2007-08-12 14:57:56 UTC (rev 489)
+++ trunk/rdfapi-php/test/unit/Sparql/cases.php 2007-08-12 15:26:47 UTC (rev 490)
@@ -42,6 +42,11 @@
'tests' => 'sparql_ask_tests',
'checkfunc' => 'resultCheck'
),
+ 'dawg2' => array(//'deact'=>1,
+ 'title' => 'DAWG2 tests',
+ 'tests' => 'sparql_dawg2_tests',
+ 'checkfunc' => 'resultCheck'
+ ),
);
$_SESSION['testSparqlDbTestsIgnores'] = array(
@@ -53,6 +58,10 @@
'ex11.2.3.2_0',
//test is broken IMO (cweiske)
'query-survey-1',
+
+ //fatal error
+ 'syntax-form-describe01.rq',
+ 'syntax-form-describe02.rq',
);
@@ -677,5 +686,5 @@
);
-
+require_once dirname(__FILE__) . '/cases_dawg2.php';
?>
\ No newline at end of file
Modified: trunk/rdfapi-php/test/unit/Sparql/create-dawg2.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/create-dawg2.php 2007-08-12 14:57:56 UTC (rev 489)
+++ trunk/rdfapi-php/test/unit/Sparql/create-dawg2.php 2007-08-12 15:26:47 UTC (rev 490)
@@ -15,7 +15,7 @@
echo "<?php
/**
-* automatically created by create-dawg2.php
+* automatically created by create-dawg2.php on " . date('Y-m-d H:i') . "
*/
\$_SESSION['sparql_dawg2_tests'] = ";
var_export($_SESSION['sparql_dawg2_tests']);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cw...@us...> - 2007-08-13 06:52:51
|
Revision: 502
http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=502&view=rev
Author: cweiske
Date: 2007-08-12 23:52:50 -0700 (Sun, 12 Aug 2007)
Log Message:
-----------
Add full support for the new DAWG tests.
All test result formats should be supported by now
(rdf xml, n3 [ttl,srx]).
Current test status:
Test cases run: 1/1, Passes: 345, Failures: 143, Exceptions: 5
Modified Paths:
--------------
trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php
trunk/rdfapi-php/test/unit/Sparql/SparqlTestHelper.php
trunk/rdfapi-php/test/unit/Sparql/cases.php
trunk/rdfapi-php/test/unit/Sparql/cases_dawg2.php
Modified: trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php 2007-08-13 06:44:36 UTC (rev 501)
+++ trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php 2007-08-13 06:52:50 UTC (rev 502)
@@ -9,6 +9,9 @@
require_once RDFAPI_INCLUDE_DIR . 'sparql/SparqlParser.php';
require_once RDFAPI_INCLUDE_DIR . 'sparql/SparqlEngine.php';
require_once RDFAPI_INCLUDE_DIR . 'dataset/NamedGraphMem.php';
+require_once RDFAPI_INCLUDE_DIR . 'syntax/SparqlResultParser.php';
+require_once RDFAPI_INCLUDE_DIR . 'syntax/N3Parser.php';
+
if (isset($GLOBALS['debugTests'])) {
require_once 'Console/Color.php';
}
@@ -31,10 +34,10 @@
foreach ($_SESSION['sparqlTestGroups'] as $arGroup) {
if (isset($arGroup['deact'])) continue;
- $checkfunc = $arGroup['checkfunc'];
//echo count($_SESSION[$arGroup['tests']]) . " tests\n";
foreach ($_SESSION[$arGroup['tests']] as $name) {
+ $checkfunc = $arGroup['checkfunc'];
$fileData = null;
$fileResult = null;
$fileQuery = null;
@@ -90,15 +93,40 @@
//re-use database if not changed
list($database, $dbModel) = $this->prepareDatabase();
//import statements into database
- $dbModel ->load(SPARQL_TESTFILES . $fileData);
+ $dbModel ->load(SPARQL_TESTFILES . $fileData, 'n3');
$strLastDataFile = $fileData;
}
$qs = file_get_contents(SPARQL_TESTFILES . $fileQuery);
+
if ($fileResult !== null) {
$res = file_get_contents(SPARQL_TESTFILES . $fileResult);
- unset($result);
- eval($res);
+
+ if (substr($fileResult, -4) == '.srx') {
+ //Sparql XML result
+ $resParser = new SparqlResultParser();
+ $result = $resParser->parse($res);
+ } else if (substr($fileResult, -4) == '.rdf') {
+ //same format as .ttl, but serialized as xml
+ //rdf xml sorted
+ $resModel = new MemModel();
+ $resModel->load(SPARQL_TESTFILES . $fileResult, 'rdf');
+ $result = SparqlTestHelper::convertModelToResultArray($resModel);
+ unset($resModel);
+ $checkfunc = 'resultCheckSort';
+ } else if (substr($fileResult, -4) == '.res') {
+ //our own php code
+ unset($result);
+ eval($res);
+ } else if (substr($fileResult, -4) == '.ttl') {
+ //N3
+ $resModel = new MemModel();
+ $resModel->load(SPARQL_TESTFILES . $fileResult, 'n3');
+ $result = SparqlTestHelper::convertModelToResultArray($resModel);
+ unset($resModel);
+ } else {
+ throw new Exception('Unknown result format in ' . $fileResult);
+ }
}
if (isset($name['type']) &&
@@ -108,8 +136,25 @@
continue;
}
- $q = $parser->parse($qs);
try {
+ $q = $parser->parse($qs);
+ } catch (Exception $e) {
+ //normal query failed to be parsed
+ $this->assertTrue(false, 'Query failed to be parsed');
+ if (!isset($GLOBALS['debugTests'])) {
+ echo ' ' . $title . "\n";
+ } else {
+ echo Console_Color::convert('%RTest failed: ' . $title . "%n\n");
+ if (isset($e)) {
+ echo $e->getMessage() . "\n";
+ //var_dump($e);
+ }
+ echo $strQuery . "\n";
+ die();
+ }
+ }
+
+ try {
$t = $dbModel->sparqlQuery($qs);
if ($t instanceof MemModel) {
@@ -136,6 +181,7 @@
if ($e != null) {
echo get_class($e) . ': ' . $e->getMessage() . "\n";
}
+ echo ' Data: ' . $fileData . "\n";
echo 'Query string: ' . $qs . "\n";
echo "Expected:\n";
echo Console_Color::convert('%p');
@@ -188,6 +234,7 @@
//var_dump($e);
}
echo $strQuery . "\n";
+ die();
}
}
}//protected function testQueryParse($strQuery, $parser, $strType)
Modified: trunk/rdfapi-php/test/unit/Sparql/SparqlTestHelper.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/SparqlTestHelper.php 2007-08-13 06:44:36 UTC (rev 501)
+++ trunk/rdfapi-php/test/unit/Sparql/SparqlTestHelper.php 2007-08-13 06:52:50 UTC (rev 502)
@@ -5,13 +5,28 @@
*/
class SparqlTestHelper
{
+ /**
+ * Compares calculated with expected result.
+ * Values can be at any position and do not need to be ordered.
+ *
+ * @param array $table Result calculated by the engine
+ * @param array $result Expected result
+ *
+ * @return boolean True if both arrays contain the same values
+ */
public static function resultCheck($table, $result)
{
$match = 0;
$rows = 0;
- $rowcount = $result['rowcount'];
- $hits = $result['hits'];
- $result = $result['part'];
+ if (isset($result['rowcount'])) {
+ $rowcount = $result['rowcount'];
+ $hits = $result['hits'];
+ $result = $result['part'];
+ } else {
+ //e.g. dawg2 tests pass a "table" as $result
+ $rowcount = count($result);
+ $hits = count($result);
+ }
if ($rowcount == 0 && ($table == 'false' || $table == array())) {
return true;
@@ -56,8 +71,21 @@
+ /**
+ * Compares calculated with expected result.
+ * Values need to be in the exact same order.
+ *
+ * @param array $table Result calculated by the engine
+ * @param array $result Expected result
+ *
+ * @return boolean True if both arrays contain the same values
+ */
public static function resultCheckSort($table, $result)
{
+ if (count($result) != count($table)) {
+ return false;
+ }
+
foreach ($result as $key => $value) {
foreach ($value as $varname => $varvalue) {
if ($varvalue != $table[$key][$varname]) {
@@ -129,5 +157,62 @@
return $s;
}//static function renderResult($query)
+
+
+ /**
+ * Converts a MemModel into a query result array.
+ * Required for the DAWG test cases.
+ *
+ * @param Model $model Model object to extract data from
+ * @return array Result array
+ *
+ * @see http://www.w3.org/2001/sw/DataAccess/tests/README
+ * @see http://www.w3.org/2001/sw/DataAccess/tests/result-set.n3
+ */
+ static function convertModelToResultArray($model)
+ {
+ $graphset = ModelFactory::getDatasetMem('Dataset1');
+ $graphset->setDefaultGraph($model);
+ $parser = new SparqlParser();
+ $engine = SparqlEngine::factory($model);
+
+ $strSparqlQuery = '
+ PREFIX rs: <http://www.w3.org/2001/sw/DataAccess/tests/result-set#>
+ SELECT ?varname WHERE { ?x rs:resultVariable ?varname }
+ ';
+ $q = $parser->parse($strSparqlQuery);
+ $variables = $engine->queryModel($graphset, $q, false);
+
+ $arVars = array();
+ $strSparqlQueryPart = '';
+ $nCount = 0;
+ foreach ($variables as $var) {
+ $varname = '?' . $var['?varname']->label;
+ $name = substr($varname, 1);
+ $arVars[] = $varname;
+ $strSparqlQueryPart .=
+ ' ?thing rs:binding ?binding' . $nCount . '.
+ ?binding' . $nCount . ' rs:value ' . $varname . '.
+ ?binding' . $nCount . ' rs:variable "' . $name . '".';
+ ++$nCount;
+ }
+
+ $strSparqlQuery = '
+ PREFIX rs: <http://www.w3.org/2001/sw/DataAccess/tests/result-set#>
+ SELECT ' . implode($arVars, ' ') . '
+ WHERE {
+ ?some rs:solution ?thing.
+ ' . $strSparqlQueryPart . '
+ }
+ ';
+//echo $strSparqlQuery;
+ $q = $parser->parse($strSparqlQuery);
+ $arResult = $engine->queryModel($graphset, $q, false);
+//var_dump($arResult);
+//die();
+
+ return $arResult;
+ }//static function convertModelToResultArray($model)
+
}//class SparqlTestHelper
?>
\ No newline at end of file
Modified: trunk/rdfapi-php/test/unit/Sparql/cases.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/cases.php 2007-08-13 06:44:36 UTC (rev 501)
+++ trunk/rdfapi-php/test/unit/Sparql/cases.php 2007-08-13 06:52:50 UTC (rev 502)
@@ -62,6 +62,8 @@
//fatal error
'syntax-form-describe01.rq',
'syntax-form-describe02.rq',
+ //parse error
+ 'dawg-construct-identity'
);
Modified: trunk/rdfapi-php/test/unit/Sparql/cases_dawg2.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/cases_dawg2.php 2007-08-13 06:44:36 UTC (rev 501)
+++ trunk/rdfapi-php/test/unit/Sparql/cases_dawg2.php 2007-08-13 06:52:50 UTC (rev 502)
@@ -3,2174 +3,2174 @@
* automatically created by create-dawg2.php on 2007-08-12 16:52
*/
$_SESSION['sparql_dawg2_tests'] = array (
- 0 =>
+ 0 =>
array (
'title' => 'Basic graph pattern - spoo',
'data' => 'w3c-dawg2/data-r2/basic/data-6.ttl',
'query' => 'w3c-dawg2/data-r2/basic/spoo-1.rq',
'result' => 'w3c-dawg2/data-r2/basic/spoo-1.srx',
),
- 1 =>
+ 1 =>
array (
'title' => 'Basic - Prefix/Base 1',
'data' => 'w3c-dawg2/data-r2/basic/data-1.ttl',
'query' => 'w3c-dawg2/data-r2/basic/base-prefix-1.rq',
'result' => 'w3c-dawg2/data-r2/basic/base-prefix-1.srx',
),
- 2 =>
+ 2 =>
array (
'title' => 'Basic - Prefix/Base 2',
'data' => 'w3c-dawg2/data-r2/basic/data-1.ttl',
'query' => 'w3c-dawg2/data-r2/basic/base-prefix-2.rq',
'result' => 'w3c-dawg2/data-r2/basic/base-prefix-2.srx',
),
- 3 =>
+ 3 =>
array (
'title' => 'Basic - Prefix/Base 3',
'data' => 'w3c-dawg2/data-r2/basic/data-1.ttl',
'query' => 'w3c-dawg2/data-r2/basic/base-prefix-3.rq',
'result' => 'w3c-dawg2/data-r2/basic/base-prefix-3.srx',
),
- 4 =>
+ 4 =>
array (
'title' => 'Basic - Prefix/Base 4',
'data' => 'w3c-dawg2/data-r2/basic/data-1.ttl',
'query' => 'w3c-dawg2/data-r2/basic/base-prefix-4.rq',
'result' => 'w3c-dawg2/data-r2/basic/base-prefix-4.srx',
),
- 5 =>
+ 5 =>
array (
'title' => 'Basic - Prefix/Base 5',
'data' => 'w3c-dawg2/data-r2/basic/data-1.ttl',
'query' => 'w3c-dawg2/data-r2/basic/base-prefix-5.rq',
'result' => 'w3c-dawg2/data-r2/basic/base-prefix-5.srx',
),
- 6 =>
+ 6 =>
array (
'title' => 'Basic - List 1',
'data' => 'w3c-dawg2/data-r2/basic/data-2.ttl',
'query' => 'w3c-dawg2/data-r2/basic/list-1.rq',
'result' => 'w3c-dawg2/data-r2/basic/list-1.srx',
),
- 7 =>
+ 7 =>
array (
'title' => 'Basic - List 2',
'data' => 'w3c-dawg2/data-r2/basic/data-2.ttl',
'query' => 'w3c-dawg2/data-r2/basic/list-2.rq',
'result' => 'w3c-dawg2/data-r2/basic/list-2.srx',
),
- 8 =>
+ 8 =>
array (
'title' => 'Basic - List 3',
'data' => 'w3c-dawg2/data-r2/basic/data-2.ttl',
'query' => 'w3c-dawg2/data-r2/basic/list-3.rq',
'result' => 'w3c-dawg2/data-r2/basic/list-3.srx',
),
- 9 =>
+ 9 =>
array (
'title' => 'Basic - List 4',
'data' => 'w3c-dawg2/data-r2/basic/data-2.ttl',
'query' => 'w3c-dawg2/data-r2/basic/list-4.rq',
'result' => 'w3c-dawg2/data-r2/basic/list-4.srx',
),
- 10 =>
+ 10 =>
array (
'title' => 'Basic - Quotes 1',
'data' => 'w3c-dawg2/data-r2/basic/data-3.ttl',
'query' => 'w3c-dawg2/data-r2/basic/quotes-1.rq',
'result' => 'w3c-dawg2/data-r2/basic/quotes-1.srx',
),
- 11 =>
+ 11 =>
array (
'title' => 'Basic - Quotes 2',
'data' => 'w3c-dawg2/data-r2/basic/data-3.ttl',
'query' => 'w3c-dawg2/data-r2/basic/quotes-2.rq',
'result' => 'w3c-dawg2/data-r2/basic/quotes-2.srx',
),
- 12 =>
+ 12 =>
array (
'title' => 'Basic - Quotes 3',
'data' => 'w3c-dawg2/data-r2/basic/data-3.ttl',
'query' => 'w3c-dawg2/data-r2/basic/quotes-3.rq',
'result' => 'w3c-dawg2/data-r2/basic/quotes-3.srx',
),
- 13 =>
+ 13 =>
array (
'title' => 'Basic - Quotes 4',
'data' => 'w3c-dawg2/data-r2/basic/data-3.ttl',
'query' => 'w3c-dawg2/data-r2/basic/quotes-4.rq',
'result' => 'w3c-dawg2/data-r2/basic/quotes-4.srx',
),
- 14 =>
+ 14 =>
array (
'title' => 'Basic - Term 1',
'data' => 'w3c-dawg2/data-r2/basic/data-4.ttl',
'query' => 'w3c-dawg2/data-r2/basic/term-1.rq',
'result' => 'w3c-dawg2/data-r2/basic/term-1.srx',
),
- 15 =>
+ 15 =>
array (
'title' => 'Basic - Term 2',
'data' => 'w3c-dawg2/data-r2/basic/data-4.ttl',
'query' => 'w3c-dawg2/data-r2/basic/term-2.rq',
'result' => 'w3c-dawg2/data-r2/basic/term-2.srx',
),
- 16 =>
+ 16 =>
array (
'title' => 'Basic - Term 3',
'data' => 'w3c-dawg2/data-r2/basic/data-4.ttl',
'query' => 'w3c-dawg2/data-r2/basic/term-3.rq',
'result' => 'w3c-dawg2/data-r2/basic/term-3.srx',
),
- 17 =>
+ 17 =>
array (
'title' => 'Basic - Term 4',
'data' => 'w3c-dawg2/data-r2/basic/data-4.ttl',
'query' => 'w3c-dawg2/data-r2/basic/term-4.rq',
'result' => 'w3c-dawg2/data-r2/basic/term-4.srx',
),
- 18 =>
+ 18 =>
array (
'title' => 'Basic - Term 5',
'data' => 'w3c-dawg2/data-r2/basic/data-4.ttl',
'query' => 'w3c-dawg2/data-r2/basic/term-5.rq',
'result' => 'w3c-dawg2/data-r2/basic/term-5.srx',
),
- 19 =>
+ 19 =>
array (
'title' => 'Basic - Term 6',
'data' => 'w3c-dawg2/data-r2/basic/data-4.ttl',
'query' => 'w3c-dawg2/data-r2/basic/term-6.rq',
'result' => 'w3c-dawg2/data-r2/basic/term-6.srx',
),
- 20 =>
+ 20 =>
array (
'title' => 'Basic - Term 7',
'data' => 'w3c-dawg2/data-r2/basic/data-4.ttl',
'query' => 'w3c-dawg2/data-r2/basic/term-7.rq',
'result' => 'w3c-dawg2/data-r2/basic/term-7.srx',
),
- 21 =>
+ 21 =>
array (
'title' => 'Basic - Term 8',
'data' => 'w3c-dawg2/data-r2/basic/data-4.ttl',
'query' => 'w3c-dawg2/data-r2/basic/term-8.rq',
'result' => 'w3c-dawg2/data-r2/basic/term-8.srx',
),
- 22 =>
+ 22 =>
array (
'title' => 'Basic - Term 9',
'data' => 'w3c-dawg2/data-r2/basic/data-4.ttl',
'query' => 'w3c-dawg2/data-r2/basic/term-9.rq',
'result' => 'w3c-dawg2/data-r2/basic/term-9.srx',
),
- 23 =>
+ 23 =>
array (
'title' => 'Basic - Var 1',
'data' => 'w3c-dawg2/data-r2/basic/data-5.ttl',
'query' => 'w3c-dawg2/data-r2/basic/var-1.rq',
'result' => 'w3c-dawg2/data-r2/basic/var-1.srx',
),
- 24 =>
+ 24 =>
array (
'title' => 'Basic - Var 2',
'data' => 'w3c-dawg2/data-r2/basic/data-5.ttl',
'query' => 'w3c-dawg2/data-r2/basic/var-2.rq',
'result' => 'w3c-dawg2/data-r2/basic/var-2.srx',
),
- 25 =>
+ 25 =>
array (
'title' => 'dawg-triple-pattern-001',
'data' => 'w3c-dawg2/data-r2/triple-match/data-01.ttl',
'query' => 'w3c-dawg2/data-r2/triple-match/dawg-tp-01.rq',
'result' => 'w3c-dawg2/data-r2/triple-match/result-tp-01.ttl',
),
- 26 =>
+ 26 =>
array (
'title' => 'dawg-triple-pattern-002',
'data' => 'w3c-dawg2/data-r2/triple-match/data-01.ttl',
'query' => 'w3c-dawg2/data-r2/triple-match/dawg-tp-02.rq',
'result' => 'w3c-dawg2/data-r2/triple-match/result-tp-02.ttl',
),
- 27 =>
+ 27 =>
array (
'title' => 'dawg-triple-pattern-003',
'data' => 'w3c-dawg2/data-r2/triple-match/data-02.ttl',
'query' => 'w3c-dawg2/data-r2/triple-match/dawg-tp-03.rq',
'result' => 'w3c-dawg2/data-r2/triple-match/result-tp-03.ttl',
),
- 28 =>
+ 28 =>
array (
'title' => 'dawg-triple-pattern-004',
'data' => 'w3c-dawg2/data-r2/triple-match/dawg-data-01.ttl',
'query' => 'w3c-dawg2/data-r2/triple-match/dawg-tp-04.rq',
'result' => 'w3c-dawg2/data-r2/triple-match/result-tp-04.ttl',
),
- 29 =>
+ 29 =>
array (
'title' => 'open-eq-01',
'data' => 'w3c-dawg2/data-r2/open-world/data-1.ttl',
'query' => 'w3c-dawg2/data-r2/open-world/open-eq-01.rq',
'result' => 'w3c-dawg2/data-r2/open-world/open-eq-01-result.srx',
),
- 30 =>
+ 30 =>
array (
'title' => 'open-eq-02',
'data' => 'w3c-dawg2/data-r2/open-world/data-1.ttl',
'query' => 'w3c-dawg2/data-r2/open-world/open-eq-02.rq',
'result' => 'w3c-dawg2/data-r2/open-world/open-eq-02-result.srx',
),
- 31 =>
+ 31 =>
array (
'title' => 'open-eq-03',
'data' => 'w3c-dawg2/data-r2/open-world/data-1.ttl',
'query' => 'w3c-dawg2/data-r2/open-world/open-eq-03.rq',
'result' => 'w3c-dawg2/data-r2/open-world/open-eq-03-result.srx',
),
- 32 =>
+ 32 =>
array (
'title' => 'open-eq-04',
'data' => 'w3c-dawg2/data-r2/open-world/data-1.ttl',
'query' => 'w3c-dawg2/data-r2/open-world/open-eq-04.rq',
'result' => 'w3c-dawg2/data-r2/open-world/open-eq-04-result.srx',
),
- 33 =>
+ 33 =>
array (
'title' => 'open-eq-05',
'data' => 'w3c-dawg2/data-r2/open-world/data-1.ttl',
'query' => 'w3c-dawg2/data-r2/open-world/open-eq-05.rq',
'result' => 'w3c-dawg2/data-r2/open-world/open-eq-05-result.srx',
),
- 34 =>
+ 34 =>
array (
'title' => 'open-eq-06',
'data' => 'w3c-dawg2/data-r2/open-world/data-1.ttl',
'query' => 'w3c-dawg2/data-r2/open-world/open-eq-06.rq',
'result' => 'w3c-dawg2/data-r2/open-world/open-eq-06-result.srx',
),
- 35 =>
+ 35 =>
array (
'title' => 'open-eq-07',
'data' => 'w3c-dawg2/data-r2/open-world/data-2.ttl',
'query' => 'w3c-dawg2/data-r2/open-world/open-eq-07.rq',
'result' => 'w3c-dawg2/data-r2/open-world/open-eq-07-result.srx',
),
- 36 =>
+ 36 =>
array (
'title' => 'open-eq-08',
'data' => 'w3c-dawg2/data-r2/open-world/data-2.ttl',
'query' => 'w3c-dawg2/data-r2/open-world/open-eq-08.rq',
'result' => 'w3c-dawg2/data-r2/open-world/open-eq-08-result.srx',
),
- 37 =>
+ 37 =>
array (
'title' => 'open-eq-09',
'data' => 'w3c-dawg2/data-r2/open-world/data-2.ttl',
'query' => 'w3c-dawg2/data-r2/open-world/open-eq-09.rq',
'result' => 'w3c-dawg2/data-r2/open-world/open-eq-09-result.srx',
),
- 38 =>
+ 38 =>
array (
'title' => 'open-eq-10',
'data' => 'w3c-dawg2/data-r2/open-world/data-2.ttl',
'query' => 'w3c-dawg2/data-r2/open-world/open-eq-10.rq',
'result' => 'w3c-dawg2/data-r2/open-world/open-eq-10-result.srx',
),
- 39 =>
+ 39 =>
array (
'title' => 'open-eq-11',
'data' => 'w3c-dawg2/data-r2/open-world/data-2.ttl',
'query' => 'w3c-dawg2/data-r2/open-world/open-eq-11.rq',
'result' => 'w3c-dawg2/data-r2/open-world/open-eq-11-result.srx',
),
- 40 =>
+ 40 =>
array (
'title' => 'open-eq-12',
'data' => 'w3c-dawg2/data-r2/open-world/data-2.ttl',
'query' => 'w3c-dawg2/data-r2/open-world/open-eq-12.rq',
'result' => 'w3c-dawg2/data-r2/open-world/open-eq-12-result.srx',
),
- 41 =>
+ 41 =>
array (
'title' => 'date-1',
'data' => 'w3c-dawg2/data-r2/open-world/data-3.ttl',
'query' => 'w3c-dawg2/data-r2/open-world/date-1.rq',
'result' => 'w3c-dawg2/data-r2/open-world/date-1-result.srx',
),
- 42 =>
+ 42 =>
array (
'title' => 'date-2',
'data' => 'w3c-dawg2/data-r2/open-world/data-3.ttl',
'query' => 'w3c-dawg2/data-r2/open-world/date-2.rq',
'result' => 'w3c-dawg2/data-r2/open-world/date-2-result.srx',
),
- 43 =>
+ 43 =>
array (
'title' => 'date-3',
'data' => 'w3c-dawg2/data-r2/open-world/data-3.ttl',
'query' => 'w3c-dawg2/data-r2/open-world/date-3.rq',
'result' => 'w3c-dawg2/data-r2/open-world/date-3-result.srx',
),
- 44 =>
+ 44 =>
array (
'title' => 'date-4',
'data' => 'w3c-dawg2/data-r2/open-world/data-3.ttl',
'query' => 'w3c-dawg2/data-r2/open-world/date-4.rq',
'result' => 'w3c-dawg2/data-r2/open-world/date-4-result.srx',
),
- 45 =>
+ 45 =>
array (
'title' => 'open-cmp-01',
'data' => 'w3c-dawg2/data-r2/open-world/data-4.ttl',
'query' => 'w3c-dawg2/data-r2/open-world/open-cmp-01.rq',
'result' => 'w3c-dawg2/data-r2/open-world/open-cmp-01-result.srx',
),
- 46 =>
+ 46 =>
array (
'title' => 'open-cmp-02',
'data' => 'w3c-dawg2/data-r2/open-world/data-4.ttl',
'query' => 'w3c-dawg2/data-r2/open-world/open-cmp-02.rq',
'result' => 'w3c-dawg2/data-r2/open-world/open-cmp-02-result.srx',
),
- 47 =>
+ 47 =>
array (
'title' => 'Nested Optionals - 1',
'data' => 'w3c-dawg2/data-r2/algebra/two-nested-opt.ttl',
'query' => 'w3c-dawg2/data-r2/algebra/two-nested-opt.rq',
'result' => 'w3c-dawg2/data-r2/algebra/two-nested-opt.srx',
),
- 48 =>
+ 48 =>
array (
'title' => 'Nested Optionals - 2',
'data' => 'w3c-dawg2/data-r2/algebra/two-nested-opt.ttl',
'query' => 'w3c-dawg2/data-r2/algebra/two-nested-opt-alt.rq',
'result' => 'w3c-dawg2/data-r2/algebra/two-nested-opt-alt.srx',
),
- 49 =>
+ 49 =>
array (
'title' => 'Optional-filter - 1',
'data' => 'w3c-dawg2/data-r2/algebra/opt-filter-1.ttl',
'query' => 'w3c-dawg2/data-r2/algebra/opt-filter-1.rq',
'result' => 'w3c-dawg2/data-r2/algebra/opt-filter-1.srx',
),
- 50 =>
+ 50 =>
array (
'title' => 'Optional-filter - 2 filters',
'data' => 'w3c-dawg2/data-r2/algebra/opt-filter-2.ttl',
'query' => 'w3c-dawg2/data-r2/algebra/opt-filter-2.rq',
'result' => 'w3c-dawg2/data-r2/algebra/opt-filter-2.srx',
),
- 51 =>
+ 51 =>
array (
'title' => 'Optional-filter - scope of variable',
'data' => 'w3c-dawg2/data-r2/algebra/opt-filter-3.ttl',
'query' => 'w3c-dawg2/data-r2/algebra/opt-filter-3.rq',
'result' => 'w3c-dawg2/data-r2/algebra/opt-filter-3.srx',
),
- 52 =>
+ 52 =>
array (
'title' => 'Filter-placement - 1',
'data' => 'w3c-dawg2/data-r2/algebra/data-2.ttl',
'query' => 'w3c-dawg2/data-r2/algebra/filter-placement-1.rq',
'result' => 'w3c-dawg2/data-r2/algebra/filter-placement-1.srx',
),
- 53 =>
+ 53 =>
array (
'title' => 'Filter-placement - 2',
'data' => 'w3c-dawg2/data-r2/algebra/data-2.ttl',
'query' => 'w3c-dawg2/data-r2/algebra/filter-placement-2.rq',
'result' => 'w3c-dawg2/data-r2/algebra/filter-placement-2.srx',
),
- 54 =>
+ 54 =>
array (
'title' => 'Filter-placement - 3',
'data' => 'w3c-dawg2/data-r2/algebra/data-2.ttl',
'query' => 'w3c-dawg2/data-r2/algebra/filter-placement-3.rq',
'result' => 'w3c-dawg2/data-r2/algebra/filter-placement-3.srx',
),
- 55 =>
+ 55 =>
array (
'title' => 'Filter-nested - 1',
'data' => 'w3c-dawg2/data-r2/algebra/data-1.ttl',
'query' => 'w3c-dawg2/data-r2/algebra/filter-nested-1.rq',
'result' => 'w3c-dawg2/data-r2/algebra/filter-nested-1.srx',
),
- 56 =>
+ 56 =>
array (
'title' => 'Filter-nested - 2',
'data' => 'w3c-dawg2/data-r2/algebra/data-1.ttl',
'query' => 'w3c-dawg2/data-r2/algebra/filter-nested-2.rq',
'result' => 'w3c-dawg2/data-r2/algebra/filter-nested-2.srx',
),
- 57 =>
+ 57 =>
array (
'title' => 'Filter-scope - 1',
'data' => 'w3c-dawg2/data-r2/algebra/data-2.ttl',
'query' => 'w3c-dawg2/data-r2/algebra/filter-scope-1.rq',
'result' => 'w3c-dawg2/data-r2/algebra/filter-scope-1.srx',
),
- 58 =>
+ 58 =>
array (
'title' => 'Join scope - 1',
'data' => 'w3c-dawg2/data-r2/algebra/var-scope-join-1.ttl',
'query' => 'w3c-dawg2/data-r2/algebra/var-scope-join-1.rq',
'result' => 'w3c-dawg2/data-r2/algebra/var-scope-join-1.srx',
),
- 59 =>
+ 59 =>
array (
'title' => 'dawg-bnode-coreference',
'data' => 'w3c-dawg2/data-r2/bnode-coreference/data.ttl',
'query' => 'w3c-dawg2/data-r2/bnode-coreference/query.rq',
'result' => 'w3c-dawg2/data-r2/bnode-coreference/result.ttl',
),
- 60 =>
+ 60 =>
array (
'title' => 'One optional clause',
'data' => 'w3c-dawg2/data-r2/optional/data.ttl',
'query' => 'w3c-dawg2/data-r2/optional/q-opt-1.rq',
'result' => 'w3c-dawg2/data-r2/optional/result-opt-1.ttl',
),
- 61 =>
+ 61 =>
array (
'title' => 'Two optional clauses',
'data' => 'w3c-dawg2/data-r2/optional/data.ttl',
'query' => 'w3c-dawg2/data-r2/optional/q-opt-2.rq',
'result' => 'w3c-dawg2/data-r2/optional/result-opt-2.ttl',
),
- 62 =>
+ 62 =>
array (
'title' => 'Union is not optional',
'data' => 'w3c-dawg2/data-r2/optional/data.ttl',
'query' => 'w3c-dawg2/data-r2/optional/q-opt-3.rq',
'result' => 'w3c-dawg2/data-r2/optional/result-opt-3.ttl',
),
- 63 =>
+ 63 =>
array (
'title' => 'OPTIONAL-FILTER',
'data' => 'w3c-dawg2/data-r2/optional-filter/data-1.ttl',
'query' => 'w3c-dawg2/data-r2/optional-filter/expr-1.rq',
'result' => 'w3c-dawg2/data-r2/optional-filter/expr-1-result.ttl',
),
- 64 =>
+ 64 =>
array (
'title' => 'OPTIONAL - Outer FILTER',
'data' => 'w3c-dawg2/data-r2/optional-filter/data-1.ttl',
'query' => 'w3c-dawg2/data-r2/optional-filter/expr-2.rq',
'result' => 'w3c-dawg2/data-r2/optional-filter/expr-2-result.ttl',
),
- 65 =>
+ 65 =>
array (
'title' => 'OPTIONAL - Outer FILTER with BOUND',
'data' => 'w3c-dawg2/data-r2/optional-filter/data-1.ttl',
'query' => 'w3c-dawg2/data-r2/optional-filter/expr-3.rq',
'result' => 'w3c-dawg2/data-r2/optional-filter/expr-3-result.ttl',
),
- 66 =>
+ 66 =>
array (
'title' => 'graph-01',
'data' => 'w3c-dawg2/data-r2/graph/data-g1.ttl',
'query' => 'w3c-dawg2/data-r2/graph/graph-01.rq',
'result' => 'w3c-dawg2/data-r2/graph/graph-01.ttl',
),
- 67 =>
+ 67 =>
array (
'title' => 'graph-04',
'data' => 'w3c-dawg2/data-r2/graph/data-g1.ttl',
'query' => 'w3c-dawg2/data-r2/graph/graph-04.rq',
'result' => 'w3c-dawg2/data-r2/graph/graph-04.ttl',
),
- 68 =>
+ 68 =>
array (
'title' => 'graph-05',
'data' => 'w3c-dawg2/data-r2/graph/data-g1.ttl',
'query' => 'w3c-dawg2/data-r2/graph/graph-05.rq',
'result' => 'w3c-dawg2/data-r2/graph/graph-05.ttl',
),
- 69 =>
+ 69 =>
array (
'title' => 'graph-06',
'data' => 'w3c-dawg2/data-r2/graph/data-g1.ttl',
'query' => 'w3c-dawg2/data-r2/graph/graph-06.rq',
'result' => 'w3c-dawg2/data-r2/graph/graph-06.ttl',
),
- 70 =>
+ 70 =>
array (
'title' => 'graph-07',
'data' => 'w3c-dawg2/data-r2/graph/data-g1.ttl',
'query' => 'w3c-dawg2/data-r2/graph/graph-07.rq',
'result' => 'w3c-dawg2/data-r2/graph/graph-07.ttl',
),
- 71 =>
+ 71 =>
array (
'title' => 'graph-08',
'data' => 'w3c-dawg2/data-r2/graph/data-g1.ttl',
'query' => 'w3c-dawg2/data-r2/graph/graph-08.rq',
'result' => 'w3c-dawg2/data-r2/graph/graph-08.ttl',
),
- 72 =>
+ 72 =>
array (
'title' => 'graph-09',
'data' => 'w3c-dawg2/data-r2/graph/data-g3.ttl',
'query' => 'w3c-dawg2/data-r2/graph/graph-09.rq',
'result' => 'w3c-dawg2/data-r2/graph/graph-09.ttl',
),
- 73 =>
+ 73 =>
array (
'title' => 'graph-10',
'data' => 'w3c-dawg2/data-r2/graph/data-g3.ttl',
'query' => 'w3c-dawg2/data-r2/graph/graph-10.rq',
'result' => 'w3c-dawg2/data-r2/graph/graph-10.ttl',
),
- 74 =>
+ 74 =>
array (
'title' => 'graph-11',
'data' => 'w3c-dawg2/data-r2/graph/data-g1.ttl',
'query' => 'w3c-dawg2/data-r2/graph/graph-11.rq',
'result' => 'w3c-dawg2/data-r2/graph/graph-11.ttl',
),
- 75 =>
+ 75 =>
array (
'title' => 'Test \'boolean effective value\' - true',
'data' => 'w3c-dawg2/data-r2/boolean-effective-value/data-1.ttl',
'query' => 'w3c-dawg2/data-r2/boolean-effective-value/query-bev-1.rq',
'result' => 'w3c-dawg2/data-r2/boolean-effective-value/result-bev-1.ttl',
),
- 76 =>
+ 76 =>
array (
'title' => 'Test \'boolean effective value\' - false',
'data' => 'w3c-dawg2/data-r2/boolean-effective-value/data-1.ttl',
'query' => 'w3c-dawg2/data-r2/boolean-effective-value/query-bev-2.rq',
'result' => 'w3c-dawg2/data-r2/boolean-effective-value/result-bev-2.ttl',
),
- 77 =>
+ 77 =>
array (
'title' => 'Test \'boolean effective value\' - &&',
'data' => 'w3c-dawg2/data-r2/boolean-effective-value/data-1.ttl',
'query' => 'w3c-dawg2/dat...
[truncated message content] |
|
From: <cw...@us...> - 2007-08-13 07:35:43
|
Revision: 503
http://rdfapi-php.svn.sourceforge.net/rdfapi-php/?rev=503&view=rev
Author: cweiske
Date: 2007-08-13 00:35:42 -0700 (Mon, 13 Aug 2007)
Log Message:
-----------
Move dawg syntax tests to SparqlParserTests
Syntax test results:
Test cases run: 1/1, Passes: 174, Failures: 52, Exceptions: 2
Query test results:
Test cases run: 1/1, Passes: 202, Failures: 91, Exceptions: 3
Modified Paths:
--------------
trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php
trunk/rdfapi-php/test/unit/Sparql/SparqlParserTests_test.php
Modified: trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php 2007-08-13 06:52:50 UTC (rev 502)
+++ trunk/rdfapi-php/test/unit/Sparql/SparqlDbTests_test.php 2007-08-13 07:35:42 UTC (rev 503)
@@ -37,6 +37,14 @@
//echo count($_SESSION[$arGroup['tests']]) . " tests\n";
foreach ($_SESSION[$arGroup['tests']] as $name) {
+
+ if (isset($name['type']) &&
+ ($name['type'] == 'syntax-negative' || $name['type'] == 'syntax-positive')
+ ) {
+ //skip syntax tests; they are run in SparqlParserTests
+ continue;
+ }
+
$checkfunc = $arGroup['checkfunc'];
$fileData = null;
$fileResult = null;
@@ -129,13 +137,6 @@
}
}
- if (isset($name['type']) &&
- ($name['type'] == 'syntax-negative' || $name['type'] == 'syntax-positive')
- ) {
- $this->testQueryParse($qs, $parser, $name['type'], $title);
- continue;
- }
-
try {
$q = $parser->parse($qs);
} catch (Exception $e) {
@@ -204,44 +205,6 @@
/**
- * Runs a parser test
- */
- protected function testQueryParse($strQuery, $parser, $strType, $title)
- {
-//echo $title . "\n";
- $bException = false;
- try {
- $parser->parse($strQuery);
- } catch (Exception $e) {
- $bException = true;
- }
-
- if ($strType == 'syntax-negative') {
- $this->assertTrue($bException, 'Query should fail to be parsed.');
- $bOk = $bException == true;
- } else if ($strType == 'syntax-positive') {
- $this->assertFalse($bException, 'Query should get parsed.');
- $bOk = $bException == false;
- }
-
- if (!$bOk) {
- if (!isset($GLOBALS['debugTests'])) {
- echo ' ' . $title . "\n";
- } else {
- echo Console_Color::convert('%RTest failed: ' . $title . "%n\n");
- if (isset($e)) {
- echo $e->getMessage() . "\n";
- //var_dump($e);
- }
- echo $strQuery . "\n";
- die();
- }
- }
- }//protected function testQueryParse($strQuery, $parser, $strType)
-
-
-
- /**
* Instantiates the database object and clears
* any existing statements to have a fresh place
* for a unit test.
Modified: trunk/rdfapi-php/test/unit/Sparql/SparqlParserTests_test.php
===================================================================
--- trunk/rdfapi-php/test/unit/Sparql/SparqlParserTests_test.php 2007-08-13 06:52:50 UTC (rev 502)
+++ trunk/rdfapi-php/test/unit/Sparql/SparqlParserTests_test.php 2007-08-13 07:35:42 UTC (rev 503)
@@ -2,10 +2,14 @@
require_once dirname(__FILE__) . '/../../config.php';
require_once dirname(__FILE__) . '/casesParserFilter.php';
require_once dirname(__FILE__) . '/casesParserNested.php';
+require_once dirname(__FILE__) . '/cases.php';
require_once dirname(__FILE__) . '/SparqlTestHelper.php';
require_once RDFAPI_INCLUDE_DIR . 'sparql/SparqlParser.php';
require_once RDFAPI_INCLUDE_DIR . 'sparql/SparqlEngineDb/QuerySimplifier.php';
+if (isset($GLOBALS['debugTests'])) {
+ require_once 'Console/Color.php';
+}
/**
* Test Sparql parser
@@ -136,6 +140,76 @@
/**
+ * Runs the DAWG syntax tests
+ */
+ function testDawg2SyntaxTests()
+ {
+ $parser = new SparqlParser();
+
+ foreach ($_SESSION['sparql_dawg2_tests'] as $test) {
+ //use syntax tests only
+ if (!isset($test['type']) ||
+ ($test['type'] != 'syntax-positive' &&
+ $test['type'] != 'syntax-negative')
+ ) {
+ continue;
+ }
+ if (in_array($test['title'], $_SESSION['testSparqlDbTestsIgnores'])) {
+ if (isset($GLOBALS['debugTests'])) {
+ echo Console_Color::convert('%y');
+ echo ' ignoring ' . $test['title'] . "\n";
+ echo Console_Color::convert('%n');
+ }
+ continue;
+ }
+
+ $qs = file_get_contents(SPARQL_TESTFILES . $test['query']);
+
+ $this->runQueryParseTest($qs, $parser, $test['type'], $test['title']);
+ }
+ }//function testDawg2SyntaxTests()
+
+
+
+ /**
+ * Runs a parser test
+ */
+ protected function runQueryParseTest($strQuery, $parser, $strType, $title)
+ {
+//echo $title . "\n";
+ $bException = false;
+ try {
+ $parser->parse($strQuery);
+ } catch (Exception $e) {
+ $bException = true;
+ }
+
+ if ($strType == 'syntax-negative') {
+ $this->assertTrue($bException, 'Query should fail to be parsed.');
+ $bOk = $bException == true;
+ } else if ($strType == 'syntax-positive') {
+ $this->assertFalse($bException, 'Query should get parsed.');
+ $bOk = $bException == false;
+ }
+
+ if (!$bOk) {
+ if (!isset($GLOBALS['debugTests'])) {
+ echo ' ' . $title . "\n";
+ } else {
+ echo Console_Color::convert('%RTest failed: ' . $title . "%n\n");
+ if (isset($e)) {
+ echo $e->getMessage() . "\n";
+ //var_dump($e);
+ }
+ echo $strQuery . "\n";
+ die();
+ }
+ }
+ }//protected function runQueryParseTest($strQuery, $parser, $strType)
+
+
+
+ /**
* Removes "level" keys from the tree array.
* It is an implementation detail and should not taken into account
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X