You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/05/24 19:45:30 UTC
svn commit: r1342355 - in /jena/trunk/jena-arq:
Vocabularies/test-manifest-1_1.ttl
src/main/java/com/hp/hpl/jena/sparql/vocabulary/TestManifest_11.java
src/test/java/com/hp/hpl/jena/sparql/junit/ScriptTestSuiteFactory.java
Author: andy
Date: Thu May 24 17:45:29 2012
New Revision: 1342355
URL: http://svn.apache.org/viewvc?rev=1342355&view=rev
Log:
Add handling of CSV test type (SPARQL 1.1)
Modified:
jena/trunk/jena-arq/Vocabularies/test-manifest-1_1.ttl
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/vocabulary/TestManifest_11.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/ScriptTestSuiteFactory.java
Modified: jena/trunk/jena-arq/Vocabularies/test-manifest-1_1.ttl
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/Vocabularies/test-manifest-1_1.ttl?rev=1342355&r1=1342354&r2=1342355&view=diff
==============================================================================
--- jena/trunk/jena-arq/Vocabularies/test-manifest-1_1.ttl (original)
+++ jena/trunk/jena-arq/Vocabularies/test-manifest-1_1.ttl Thu May 24 17:45:29 2012
@@ -50,3 +50,9 @@
rdfs:comment """A type of test specifically for query evaluation
testing. Query evaluation tests are required to have an associated
input dataset, a query, and an expected output dataset.""" .
+
+
+:CSVResultFormatTest rdf:type rdfs:Class ;
+ rdfs:label "CSV Test" ;
+ rdfs:comment "CSV Test"
+ .
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/vocabulary/TestManifest_11.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/vocabulary/TestManifest_11.java?rev=1342355&r1=1342354&r2=1342355&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/vocabulary/TestManifest_11.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/vocabulary/TestManifest_11.java Thu May 24 17:45:29 2012
@@ -18,15 +18,14 @@
package com.hp.hpl.jena.sparql.vocabulary ;
-/* CVS $Id: $ */
-
import com.hp.hpl.jena.rdf.model.*;
-
+
/**
* Vocabulary definitions from test-manifest-1_1.ttl
- * @author Auto-generated by schemagen on 20 Apr 2011 11:38
+ * @author Auto-generated by schemagen on 24 May 2012 18:37
*/
public class TestManifest_11 {
+
/** <p>The RDF model that holds the vocabulary terms</p> */
private static Model m_model = ModelFactory.createDefaultModel();
@@ -40,6 +39,9 @@ public class TestManifest_11 {
/** <p>The namespace of the vocabulary as a resource</p> */
public static final Resource NAMESPACE = m_model.createResource( NS );
+ /** <p>CSV Test</p> */
+ public static final Resource CSVResultFormatTest = m_model.createResource( "http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#CSVResultFormatTest" );
+
/** <p>A type of test specifically for syntax testing for SPARQL 1.1.</p> */
public static final Resource NegativeSyntaxTest11 = m_model.createResource( "http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#NegativeSyntaxTest11" );
@@ -62,5 +64,5 @@ public class TestManifest_11 {
* output dataset.</p>
*/
public static final Resource UpdateEvaluationTest = m_model.createResource( "http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#UpdateEvaluationTest" );
-
-}
+ }
+
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/ScriptTestSuiteFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/ScriptTestSuiteFactory.java?rev=1342355&r1=1342354&r2=1342355&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/ScriptTestSuiteFactory.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/ScriptTestSuiteFactory.java Thu May 24 17:45:29 2012
@@ -21,6 +21,7 @@ package com.hp.hpl.jena.sparql.junit;
import junit.framework.Test ;
import junit.framework.TestCase ;
import junit.framework.TestSuite ;
+import org.openjena.atlas.logging.Log ;
import com.hp.hpl.jena.query.Syntax ;
import com.hp.hpl.jena.rdf.model.Resource ;
@@ -159,6 +160,12 @@ public class ScriptTestSuiteFactory exte
if ( testType.equals(TestManifestX.TestSurpressed) )
return new SurpressedTest(testName, results, item) ;
+ if ( testType.equals(TestManifest_11.CSVResultFormatTest) )
+ {
+ Log.warn("Tests", "Skip CSV test: "+testName) ;
+ return null ;
+ }
+
System.err.println("Test type '"+testType+"' not recognized") ;
}
// Default