Menu
▾
▴
[Rdfapi-php-svn] SF.net SVN: rdfapi-php: [503] trunk/rdfapi-php/test/unit/Sparql
|
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.
|
