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/11/11 23:02:31 UTC
svn commit: r1408128 - in /jena/Experimental/riot-reader/src/test/java:
org/apache/jena/riot/langsuite/ riotcmd/
Author: andy
Date: Sun Nov 11 22:02:29 2012
New Revision: 1408128
URL: http://svn.apache.org/viewvc?rev=1408128&view=rev
Log:
Language neutral eval/bad eval test classes
Added:
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java
- copied, changed from r1405538, jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEvalTurtle.java
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java
- copied, changed from r1405538, jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestEvalTurtle.java
Removed:
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEvalTurtle.java
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestEvalTurtle.java
Modified:
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/VocabLangRDF.java
jena/Experimental/riot-reader/src/test/java/riotcmd/MainLangTest.java
Modified: jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java?rev=1408128&r1=1408127&r2=1408128&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java (original)
+++ jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java Sun Nov 11 22:02:29 2012
@@ -65,32 +65,28 @@ public class FactoryTestRiot extends Tes
// In Turtle tests, the action directly names the file to process.
Resource input = action ;
Resource output = result ;
-// // Convert baseIRI.
-// Resource inputIRIr = TestUtils.getResource(action, TestVocabRIOT.inputIRI) ;
-// String baseIRI = (inputIRIr == null) ? null : inputIRIr.getURI() ;
- // !!
String baseIRI = TestVocabRIOT.assumedBaseURI ;
String x = input.getLocalName() ;
// Yuk, yuk, yuk.
baseIRI = baseIRI+x ;
- if (r.equals(VocabLangRDF.TestPositiveSyntaxTTL) )
+ if ( r.equals(VocabLangRDF.TestPositiveSyntaxTTL) )
return new UnitTestSyntax(testName, input.getURI(), Lang2.TURTLE) ;
- if (r.equals(VocabLangRDF.TestNegativeSyntaxTTL) )
+ if ( r.equals(VocabLangRDF.TestNegativeSyntaxTTL) )
return new UnitTestBadSyntax(testName, input.getURI(), Lang2.TURTLE) ;
- if (r.equals(VocabLangRDF.TestPositiveSyntaxNT) )
+ if ( r.equals(VocabLangRDF.TestPositiveSyntaxNT) )
return new UnitTestSyntax(testName, input.getURI(), Lang2.NTRIPLES) ;
- if (r.equals(VocabLangRDF.TestNegativeSyntaxNT) )
+ if ( r.equals(VocabLangRDF.TestNegativeSyntaxNT) )
return new UnitTestBadSyntax(testName, input.getURI(), Lang2.NTRIPLES) ;
- if (r.equals(VocabLangRDF.TestPositiveSyntaxRJ) )
+ if ( r.equals(VocabLangRDF.TestPositiveSyntaxRJ) )
return new UnitTestSyntax(testName, input.getURI(), Lang2.RDFJSON) ;
- if (r.equals(VocabLangRDF.TestNegativeSyntaxRJ) )
+ if ( r.equals(VocabLangRDF.TestNegativeSyntaxRJ) )
return new UnitTestBadSyntax(testName, input.getURI(), Lang2.RDFJSON) ;
if ( r.equals(VocabLangRDF.TestSurpressed ))
@@ -98,19 +94,23 @@ public class FactoryTestRiot extends Tes
// Eval.
- if (r.equals(VocabLangRDF.TestEvalTTL) )
- return new UnitTestEvalTurtle(testName, input.getURI(), result.getURI(), baseIRI) ;
+ if ( r.equals(VocabLangRDF.TestEvalTTL) )
+ return new UnitTestEval(testName, input.getURI(), result.getURI(), baseIRI, Lang2.TURTLE) ;
+ if ( r.equals(VocabLangRDF.TestNegativeEvalTTL) )
+ return new UnitTestBadEval(testName, input.getURI(), Lang2.TURTLE) ;
-// // Old vocab
-// if (r.equals(TestVocabRIOT.TestInOut))
-// return new UnitTestTurtle(testName, input.getURI(), output.getURI(), baseIRI) ;
-//
-// if (r.equals(TestVocabRIOT.TestSyntax))
-// return new UnitTestTurtleSyntax(testName, input.getURI()) ;
-//
-// if (r.equals(TestVocabRIOT.TestBadSyntax))
-// return new UnitTestTurtleBadSyntax(testName, input.getURI()) ;
+ if ( r.equals(VocabLangRDF.TestEvalNT) )
+ return new UnitTestEval(testName, input.getURI(), result.getURI(), baseIRI, Lang2.NTRIPLES) ;
+
+ if ( r.equals(VocabLangRDF.TestNegativeEvalNT) )
+ return new UnitTestBadEval(testName, input.getURI(), Lang2.NTRIPLES) ;
+
+ if ( r.equals(VocabLangRDF.TestEvalRJ) )
+ return new UnitTestEval(testName, input.getURI(), result.getURI(), baseIRI, Lang2.RDFJSON) ;
+
+ if ( r.equals(VocabLangRDF.TestNegativeEvalRJ) )
+ return new UnitTestBadEval(testName, input.getURI(), Lang2.RDFJSON) ;
System.err.println("Unrecognized turtle test : " + testName) ;
return null ;
Copied: jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java (from r1405538, jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEvalTurtle.java)
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java?p2=jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java&p1=jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEvalTurtle.java&r1=1405538&r2=1408128&rev=1408128&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEvalTurtle.java (original)
+++ jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java Sun Nov 11 22:02:29 2012
@@ -19,71 +19,65 @@
package org.apache.jena.riot.langsuite;
-import java.io.InputStream ;
-import java.io.Reader ;
-
import junit.framework.TestCase ;
-import org.openjena.atlas.io.PeekReader ;
-import org.openjena.riot.RiotParseException ;
-import org.openjena.riot.system.JenaReaderNTriples2 ;
+import org.apache.jena.riot.Lang2 ;
+import org.junit.After ;
+import org.junit.Before ;
+import org.openjena.riot.ErrorHandler ;
+import org.openjena.riot.ErrorHandlerFactory ;
+import org.openjena.riot.RiotException ;
import org.openjena.riot.system.JenaReaderTurtle2 ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
import com.hp.hpl.jena.rdf.model.RDFReader ;
-import com.hp.hpl.jena.util.FileManager ;
-import com.hp.hpl.jena.util.FileUtils ;
+import com.hp.hpl.jena.shared.JenaException ;
-public class UnitTestBadEvalTurtle extends TestCase
+public class UnitTestBadEval extends TestCase
{
- String input ;
- String output ;
- String baseIRI ;
-
- public UnitTestBadEvalTurtle(String name, String input, String output, String baseIRI)
+ private final String input ;
+ private final Lang2 lang ;
+
+ protected UnitTestBadEval(String name, String uri, Lang2 lang)
{
super(name) ;
- this.input = input ;
- this.output = output ;
- this.baseIRI = baseIRI ;
+ this.input = uri ;
+ this.lang = lang ;
}
+ ErrorHandler installed ;
+
+ @Override
+ @Before
+ public void setUp()
+ {
+ installed = ErrorHandlerFactory.getDefaultErrorHandler() ;
+ ErrorHandlerFactory.setDefaultErrorHandler(ErrorHandlerFactory.errorHandlerStrictSilent()) ;
+ }
+
+ @Override
+ @After
+ public void tearDown()
+ {
+ ErrorHandlerFactory.setDefaultErrorHandler(installed) ;
+ }
+
+
@Override
public void runTest()
{
+ // Install picky error handler.
+
+
+
Model model = ModelFactory.createDefaultModel() ;
- RDFReader t = new JenaReaderTurtle2() ;
+ RDFReader rdfreader = new JenaReaderTurtle2() ;
try {
- if ( baseIRI != null )
- {
- InputStream in = FileManager.get().open(input) ;
- Reader r = PeekReader.makeUTF8(in) ;
- t.read(model, r, baseIRI) ;
- }
- else
- t.read(model, input) ;
-
- String syntax = FileUtils.guessLang(output, FileUtils.langNTriple) ;
- Model results = ModelFactory.createDefaultModel() ;
- new JenaReaderNTriples2().read(results, output) ;
-
- boolean b = model.isIsomorphicWith(results) ;
- assertFalse("Expected non-isomorphics models", b) ;
-
-// if ( b )
-// {
-// //model.isIsomorphicWith(results) ;
-// System.out.println("---- Parsed");
-// model.write(System.out, "TTL") ;
-// System.out.println("---- Expected");
-// results.write(System.out, "TTL") ;
-// System.out.println("--------");
-// }
- } catch (RiotParseException ex)
- {
- // Catch and retrhow - debugging.
- throw ex ;
- }
+ rdfreader.read(model, input) ;
+ fail("Managed to read a bad evaluation test without error") ;
+ }
+ catch (RiotException ex) {}
+ catch (JenaException ex) {}
catch (RuntimeException ex)
{
ex.printStackTrace(System.err) ;
Modified: jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java?rev=1408128&r1=1408127&r2=1408128&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java (original)
+++ jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java Sun Nov 11 22:02:29 2012
@@ -35,7 +35,13 @@ public class UnitTestBadSyntax extends T
{
private final String uri ;
private final Lang2 lang ;
- protected UnitTestBadSyntax(String name, String uri, Lang2 lang) { super(name) ; this.uri = uri ; this.lang = lang ; }
+
+ protected UnitTestBadSyntax(String name, String uri, Lang2 lang)
+ {
+ super(name) ;
+ this.uri = uri ;
+ this.lang = lang ;
+ }
/** An error handler that throw exceptions on warnings and errors */
private static ErrorHandler errorHandlerTestStrict = new ErrorHandler()
Copied: jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java (from r1405538, jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestEvalTurtle.java)
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java?p2=jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java&p1=jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestEvalTurtle.java&r1=1405538&r2=1408128&rev=1408128&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestEvalTurtle.java (original)
+++ jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java Sun Nov 11 22:02:29 2012
@@ -18,52 +18,48 @@
package org.apache.jena.riot.langsuite;
-
-import java.io.InputStream ;
-import java.io.Reader ;
-
import junit.framework.TestCase ;
-import org.openjena.atlas.io.PeekReader ;
-import org.openjena.riot.RiotParseException ;
+import org.apache.jena.riot.Lang2 ;
+import org.apache.jena.riot.RDFReaderRIOT ;
+import org.apache.jena.riot.WebReader2 ;
+import org.openjena.riot.RiotException ;
import org.openjena.riot.system.JenaReaderNTriples2 ;
-import org.openjena.riot.system.JenaReaderTurtle2 ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
import com.hp.hpl.jena.rdf.model.RDFReader ;
-import com.hp.hpl.jena.util.FileManager ;
import com.hp.hpl.jena.util.FileUtils ;
-public class UnitTestEvalTurtle extends TestCase
+public class UnitTestEval extends TestCase
{
String input ;
String output ;
String baseIRI ;
+ Lang2 lang ;
- public UnitTestEvalTurtle(String name, String input, String output, String baseIRI)
+ public UnitTestEval(String name, String input, String output, String baseIRI, Lang2 lang)
{
super(name) ;
this.input = input ;
this.output = output ;
this.baseIRI = baseIRI ;
+ this.lang = lang ;
}
@Override
public void runTest()
{
Model model = ModelFactory.createDefaultModel() ;
- RDFReader t = new JenaReaderTurtle2() ;
+ RDFReader rdfreader = new RDFReaderRIOT() ;
try {
if ( baseIRI != null )
- {
- InputStream in = FileManager.get().open(input) ;
- Reader r = PeekReader.makeUTF8(in) ;
- t.read(model, r, baseIRI) ;
- }
+ WebReader2.read(model, input, baseIRI, lang) ;
else
- t.read(model, input) ;
+ WebReader2.read(model, input, lang) ;
+
String syntax = FileUtils.guessLang(output, FileUtils.langNTriple) ;
Model results = ModelFactory.createDefaultModel() ;
+ // Directly get an N-triples reader
new JenaReaderNTriples2().read(results, output) ;
boolean b = model.isIsomorphicWith(results) ;
@@ -78,9 +74,9 @@ public class UnitTestEvalTurtle extends
}
assertTrue("Models not isomorphic", b) ;
- } catch (RiotParseException ex)
+ } catch (RiotException ex)
{
- // Catch and retrhow - debugging.
+ // Catch and rethrow - debugging.
throw ex ;
}
catch (RuntimeException ex)
Modified: jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/VocabLangRDF.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/VocabLangRDF.java?rev=1408128&r1=1408127&r2=1408128&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/VocabLangRDF.java (original)
+++ jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/VocabLangRDF.java Sun Nov 11 22:02:29 2012
@@ -39,46 +39,46 @@ public class VocabLangRDF
/** <p>The namespace of the vocabulary as a resource</p> */
public static final Resource NAMESPACE = m_model.createResource( NS );
- public static final Resource TestPositiveSyntaxTTL = m_model.createResource( NS+"TestTurtlePositiveSyntax" );
+ public static final Resource TestPositiveSyntaxTTL = m_model.createResource( NS+"TestTurtlePositiveSyntax" );
- public static final Resource TestNegativeSyntaxTTL = m_model.createResource( NS+"TestTurtleNegativeSyntax" );
+ public static final Resource TestNegativeSyntaxTTL = m_model.createResource( NS+"TestTurtleNegativeSyntax" );
- public static final Resource TestEvalTTL = m_model.createResource( NS+"TestTurtleEval" );
+ public static final Resource TestEvalTTL = m_model.createResource( NS+"TestTurtleEval" );
- //public static final Resource TestNegativeEvalTTL = m_model.createResource( NS+"TestTurtleNegativeEval" );
+ public static final Resource TestNegativeEvalTTL = m_model.createResource( NS+"TestTurtleNegativeEval" );
- public static final Resource TestPositiveSyntaxNT = m_model.createResource( NS+"TestNTriplesPositiveSyntax" );
+ public static final Resource TestPositiveSyntaxNT = m_model.createResource( NS+"TestNTriplesPositiveSyntax" );
- public static final Resource TestNegativeSyntaxNT = m_model.createResource( NS+"TestNTriplesNegativeSyntax" );
+ public static final Resource TestNegativeSyntaxNT = m_model.createResource( NS+"TestNTriplesNegativeSyntax" );
- public static final Resource TestEvalNT = m_model.createResource( NS+"TestNTriplesEval" );
+ public static final Resource TestEvalNT = m_model.createResource( NS+"TestNTriplesEval" );
- //public static final Resource TestNegativeEvalNT = m_model.createResource( NS+"TestNTriplesNegativeEval" );
+ public static final Resource TestNegativeEvalNT = m_model.createResource( NS+"TestNTriplesNegativeEval" );
- public static final Resource TestPositiveSyntaxRJ = m_model.createResource( NS+"TestRDFJSONPositiveSyntax" );
+ public static final Resource TestPositiveSyntaxRJ = m_model.createResource( NS+"TestRDFJSONPositiveSyntax" );
- public static final Resource TestNegativeSyntaxRJ = m_model.createResource( NS+"TestRDFJSONNegativeSyntax" );
+ public static final Resource TestNegativeSyntaxRJ = m_model.createResource( NS+"TestRDFJSONNegativeSyntax" );
- public static final Resource TestEvalRJ = m_model.createResource( NS+"TestRDFJSONEval" );
+ public static final Resource TestEvalRJ = m_model.createResource( NS+"TestRDFJSONEval" );
- //public static final Resource TestNegativeEvalRJ = m_model.createResource( NS+"TestRDFJSONNegativeEval" );
+ public static final Resource TestNegativeEvalRJ = m_model.createResource( NS+"TestRDFJSONNegativeEval" );
- public static final Resource TestPositiveSyntaxNQ = m_model.createResource( NS+"TestNQuadsPositiveSyntax" );
+ public static final Resource TestPositiveSyntaxNQ = m_model.createResource( NS+"TestNQuadsPositiveSyntax" );
- public static final Resource TestNegativeSyntaxNQ = m_model.createResource( NS+"TestNQuadsNegativeSyntax" );
+ public static final Resource TestNegativeSyntaxNQ = m_model.createResource( NS+"TestNQuadsNegativeSyntax" );
- public static final Resource TestEvalNQ = m_model.createResource( NS+"TestNQuadsPositiveEval" );
+ public static final Resource TestEvalNQ = m_model.createResource( NS+"TestNQuadsEval" );
- //public static final Resource TestNegativeEvalNQ = m_model.createResource( NS+"TestNQuadsNegativeEval" );
+ public static final Resource TestNegativeEvalNQ = m_model.createResource( NS+"TestNQuadsNegativeEval" );
public static final Resource TestPositiveSyntaxTriG = m_model.createResource( NS+"TestTrigPositiveSyntax" );
public static final Resource TestNegativeSyntaxTriG = m_model.createResource( NS+"TestTrigNegativeSyntax" );
- public static final Resource TestEvalTriG = m_model.createResource( NS+"TestTrigEval" );
+ public static final Resource TestEvalTriG = m_model.createResource( NS+"TestTrigEval" );
- //public static final Resource TestNegativeEvalTriG = m_model.createResource( NS+"TestTrigNegativeEval" );
+ public static final Resource TestNegativeEvalTriG = m_model.createResource( NS+"TestTrigNegativeEval" );
- public static final Resource TestSurpressed = m_model.createResource( NS+"Test" );
+ public static final Resource TestSurpressed = m_model.createResource( NS+"Test" );
}
Modified: jena/Experimental/riot-reader/src/test/java/riotcmd/MainLangTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/test/java/riotcmd/MainLangTest.java?rev=1408128&r1=1408127&r2=1408128&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/test/java/riotcmd/MainLangTest.java (original)
+++ jena/Experimental/riot-reader/src/test/java/riotcmd/MainLangTest.java Sun Nov 11 22:02:29 2012
@@ -22,9 +22,9 @@ public class MainLangTest
{
public static void main(String ... argv)
{
- //riotcmd.rdflangtest.main("--strict", "testing/RIOT/Lang/manifest-all.ttl") ;
+ riotcmd.rdflangtest.main("--strict", "testing/RIOT/Lang/manifest-all.ttl") ;
//riotcmd.rdflangtest.main("--strict", "testing/RIOT/Lang/Turtle/manifest.ttl") ;
- riotcmd.rdflangtest.main("--strict", "testing/RIOT/Lang/N-Triples/manifest.ttl") ;
+ //riotcmd.rdflangtest.main("--strict", "testing/RIOT/Lang/N-Triples/manifest.ttl") ;
}
}