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/18 18:14:26 UTC
svn commit: r1410933 - in /jena/trunk/jena-arq/src/test/java:
org/apache/jena/riot/langsuite/ riotcmd/
Author: andy
Date: Sun Nov 18 17:14:25 2012
New Revision: 1410933
URL: http://svn.apache.org/viewvc?rev=1410933&view=rev
Log:
EARL generation for Turtle test cases.
Modified:
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSurpressed.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java
jena/trunk/jena-arq/src/test/java/riotcmd/rdflangtest.java
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java?rev=1410933&r1=1410932&r2=1410933&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java Sun Nov 18 17:14:25 2012
@@ -25,13 +25,15 @@ import org.openjena.riot.RiotException ;
import org.openjena.riot.TestVocabRIOT ;
import com.hp.hpl.jena.rdf.model.Resource ;
+import com.hp.hpl.jena.sparql.junit.EarlReport ;
import com.hp.hpl.jena.util.junit.TestFactoryManifest ;
import com.hp.hpl.jena.util.junit.TestUtils ;
import com.hp.hpl.jena.vocabulary.RDF ;
public class FactoryTestRiot extends TestFactoryManifest
{
-
+ public static EarlReport report = null ;
+
public static TestSuite make(String manifest, Resource dftTestType, String labelPrefix)
{
return new FactoryTestRiot(dftTestType, labelPrefix).process(manifest) ;
@@ -72,45 +74,45 @@ public class FactoryTestRiot extends Tes
baseIRI = baseIRI+x ;
if ( r.equals(VocabLangRDF.TestPositiveSyntaxTTL) )
- return new UnitTestSyntax(testName, input.getURI(), Lang2.TURTLE) ;
+ return new UnitTestSyntax(testName, item.getURI(), input.getURI(), Lang2.TURTLE, report) ;
if ( r.equals(VocabLangRDF.TestNegativeSyntaxTTL) )
- return new UnitTestBadSyntax(testName, input.getURI(), Lang2.TURTLE) ;
+ return new UnitTestBadSyntax(testName, item.getURI(), input.getURI(), Lang2.TURTLE, report) ;
if ( r.equals(VocabLangRDF.TestPositiveSyntaxNT) )
- return new UnitTestSyntax(testName, input.getURI(), Lang2.NTRIPLES) ;
+ return new UnitTestSyntax(testName, item.getURI(), input.getURI(), Lang2.NTRIPLES, report) ;
if ( r.equals(VocabLangRDF.TestNegativeSyntaxNT) )
- return new UnitTestBadSyntax(testName, input.getURI(), Lang2.NTRIPLES) ;
+ return new UnitTestBadSyntax(testName, item.getURI(), input.getURI(), Lang2.NTRIPLES, report) ;
if ( r.equals(VocabLangRDF.TestPositiveSyntaxRJ) )
- return new UnitTestSyntax(testName, input.getURI(), Lang2.RDFJSON) ;
+ return new UnitTestSyntax(testName, item.getURI(), input.getURI(), Lang2.RDFJSON, report) ;
if ( r.equals(VocabLangRDF.TestNegativeSyntaxRJ) )
- return new UnitTestBadSyntax(testName, input.getURI(), Lang2.RDFJSON) ;
+ return new UnitTestBadSyntax(testName, item.getURI(), input.getURI(), Lang2.RDFJSON, report) ;
if ( r.equals(VocabLangRDF.TestSurpressed ))
- return new UnitTestSurpressed(testName) ;
+ return new UnitTestSurpressed(testName, item.getURI(), report) ;
// Eval.
if ( r.equals(VocabLangRDF.TestEvalTTL) )
- return new UnitTestEval(testName, input.getURI(), result.getURI(), baseIRI, Lang2.TURTLE) ;
+ return new UnitTestEval(testName, item.getURI(), input.getURI(), result.getURI(), baseIRI, Lang2.TURTLE, report) ;
if ( r.equals(VocabLangRDF.TestNegativeEvalTTL) )
- return new UnitTestBadEval(testName, input.getURI(), Lang2.TURTLE) ;
+ return new UnitTestBadEval(testName, item.getURI(), input.getURI(), Lang2.TURTLE, report) ;
if ( r.equals(VocabLangRDF.TestEvalNT) )
- return new UnitTestEval(testName, input.getURI(), result.getURI(), baseIRI, Lang2.NTRIPLES) ;
+ return new UnitTestEval(testName, item.getURI(), input.getURI(), result.getURI(), baseIRI, Lang2.NTRIPLES, report) ;
if ( r.equals(VocabLangRDF.TestNegativeEvalNT) )
- return new UnitTestBadEval(testName, input.getURI(), Lang2.NTRIPLES) ;
+ return new UnitTestBadEval(testName, item.getURI(), input.getURI(), Lang2.NTRIPLES, report) ;
if ( r.equals(VocabLangRDF.TestEvalRJ) )
- return new UnitTestEval(testName, input.getURI(), result.getURI(), baseIRI, Lang2.RDFJSON) ;
+ return new UnitTestEval(testName, item.getURI(), input.getURI(), result.getURI(), baseIRI, Lang2.RDFJSON, report) ;
if ( r.equals(VocabLangRDF.TestNegativeEvalRJ) )
- return new UnitTestBadEval(testName, input.getURI(), Lang2.RDFJSON) ;
+ return new UnitTestBadEval(testName, item.getURI(), input.getURI(), Lang2.RDFJSON, report) ;
System.err.println("Unrecognized turtle test : " + testName) ;
return null ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java?rev=1410933&r1=1410932&r2=1410933&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java Sun Nov 18 17:14:25 2012
@@ -18,14 +18,17 @@
package org.apache.jena.riot.langsuite;
-import junit.framework.TestCase ;
import org.openjena.atlas.junit.BaseTest ;
import org.openjena.riot.ErrorHandlerFactory ;
import org.openjena.riot.SysRIOT ;
-public abstract class LangTestCase extends TestCase
+import com.hp.hpl.jena.sparql.junit.EarlReport ;
+import com.hp.hpl.jena.sparql.junit.EarlTestCase ;
+
+public abstract class LangTestCase extends EarlTestCase
{
- protected LangTestCase(String name) { super(name) ; }
+ protected LangTestCase(String name, String testURI, EarlReport earl)
+ { super(name, testURI, earl) ; }
protected abstract void _setUp() ;
protected abstract void _tearDown() ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java?rev=1410933&r1=1410932&r2=1410933&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java Sun Nov 18 17:14:25 2012
@@ -19,35 +19,37 @@
package org.apache.jena.riot.langsuite;
-import junit.framework.TestCase ;
import org.apache.jena.riot.Lang2 ;
import org.junit.After ;
import org.junit.Before ;
-import org.openjena.riot.* ;
+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.shared.JenaException ;
+import com.hp.hpl.jena.sparql.junit.EarlReport ;
-public class UnitTestBadEval extends TestCase
+public class UnitTestBadEval extends LangTestCase
{
private final String input ;
private final Lang2 lang ;
- protected UnitTestBadEval(String name, String uri, Lang2 lang)
+ protected UnitTestBadEval(String name, String testURI, String uri, Lang2 lang, EarlReport earl)
{
- super(name) ;
+ super(name, testURI, earl) ;
this.input = uri ;
this.lang = lang ;
}
- ErrorHandler installed ;
+ protected ErrorHandler installed ;
@Override
@Before
- public void setUp()
+ public void _setUp()
{
installed = ErrorHandlerFactory.getDefaultErrorHandler() ;
ErrorHandlerFactory.setDefaultErrorHandler(ErrorHandlerFactory.errorHandlerStrictSilent()) ;
@@ -55,19 +57,15 @@ public class UnitTestBadEval extends Tes
@Override
@After
- public void tearDown()
+ public void _tearDown()
{
ErrorHandlerFactory.setDefaultErrorHandler(installed) ;
}
@Override
- public void runTest()
+ public void runTestForReal()
{
- // Install picky error handler.
-
-
-
Model model = ModelFactory.createDefaultModel() ;
RDFReader rdfreader = new JenaReaderTurtle2() ;
try {
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java?rev=1410933&r1=1410932&r2=1410933&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java Sun Nov 18 17:14:25 2012
@@ -28,15 +28,16 @@ import org.openjena.riot.RiotException ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
+import com.hp.hpl.jena.sparql.junit.EarlReport ;
public class UnitTestBadSyntax extends LangTestCase
{
private final String uri ;
private final Lang2 lang ;
- protected UnitTestBadSyntax(String name, String uri, Lang2 lang)
+ protected UnitTestBadSyntax(String name, String testURI, String uri, Lang2 lang, EarlReport earl)
{
- super(name) ;
+ super(name, testURI, earl) ;
this.uri = uri ;
this.lang = lang ;
}
@@ -72,7 +73,7 @@ public class UnitTestBadSyntax extends L
protected void _tearDown() { BaseTest.unsetTestLogging() ; }
@Override
- public void runTest()
+ public void runTestForReal()
{
Model model = ModelFactory.createDefaultModel() ;
try {
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java?rev=1410933&r1=1410932&r2=1410933&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java Sun Nov 18 17:14:25 2012
@@ -27,6 +27,7 @@ import org.openjena.riot.system.JenaRead
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.sparql.junit.EarlReport ;
import com.hp.hpl.jena.util.FileUtils ;
public class UnitTestEval extends LangTestCase
@@ -36,9 +37,9 @@ public class UnitTestEval extends LangTe
String baseIRI ;
Lang2 lang ;
- public UnitTestEval(String name, String input, String output, String baseIRI, Lang2 lang)
+ public UnitTestEval(String name, String testURI, String input, String output, String baseIRI, Lang2 lang, EarlReport earl)
{
- super(name) ;
+ super(name, testURI, earl) ;
this.input = input ;
this.output = output ;
this.baseIRI = baseIRI ;
@@ -54,7 +55,7 @@ public class UnitTestEval extends LangTe
{}
@Override
- public void runTest()
+ public void runTestForReal()
{
Model model = ModelFactory.createDefaultModel() ;
RDFReader rdfreader = new RDFReaderRIOT() ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSurpressed.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSurpressed.java?rev=1410933&r1=1410932&r2=1410933&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSurpressed.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSurpressed.java Sun Nov 18 17:14:25 2012
@@ -18,15 +18,15 @@
package org.apache.jena.riot.langsuite;
+import com.hp.hpl.jena.sparql.junit.EarlReport ;
+
public class UnitTestSurpressed extends LangTestCase
{
- public UnitTestSurpressed(String name)
- {
- super(name) ;
- }
+ public UnitTestSurpressed(String name, String testURI, EarlReport earl)
+ { super(name, testURI, earl) ; }
@Override
- public void runTest()
+ public void runTestForReal()
{ }
@Override
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java?rev=1410933&r1=1410932&r2=1410933&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java Sun Nov 18 17:14:25 2012
@@ -23,15 +23,22 @@ import org.apache.jena.riot.WebReader2 ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
+import com.hp.hpl.jena.sparql.junit.EarlReport ;
public class UnitTestSyntax extends LangTestCase
{
private final String uri ;
private final Lang2 lang ;
- public UnitTestSyntax(String name, String uri, Lang2 lang) { super(name) ; this.uri = uri ; this.lang = lang ; }
+
+ public UnitTestSyntax(String name, String testURI, String uri, Lang2 lang, EarlReport earl)
+ {
+ super(name, testURI, earl) ;
+ this.uri = uri ;
+ this.lang = lang ;
+ }
@Override
- public void runTest()
+ public void runTestForReal()
{
Model model = ModelFactory.createDefaultModel() ;
WebReader2.read(model, uri, uri, lang) ;
Modified: jena/trunk/jena-arq/src/test/java/riotcmd/rdflangtest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/riotcmd/rdflangtest.java?rev=1410933&r1=1410932&r2=1410933&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/riotcmd/rdflangtest.java (original)
+++ jena/trunk/jena-arq/src/test/java/riotcmd/rdflangtest.java Sun Nov 18 17:14:25 2012
@@ -20,6 +20,7 @@ package riotcmd;
import junit.framework.TestSuite ;
import org.apache.jena.riot.langsuite.FactoryTestRiot ;
+import org.apache.jena.riot.langsuite.VocabLangRDF ;
import org.openjena.atlas.junit.BaseTest ;
import org.openjena.riot.RIOT ;
import org.openjena.riot.SysRIOT ;
@@ -39,13 +40,11 @@ import com.hp.hpl.jena.rdf.model.Resourc
import com.hp.hpl.jena.sparql.expr.E_Function ;
import com.hp.hpl.jena.sparql.expr.NodeValue ;
import com.hp.hpl.jena.sparql.junit.EarlReport ;
-import com.hp.hpl.jena.sparql.junit.ScriptTestSuiteFactory ;
import com.hp.hpl.jena.sparql.junit.SimpleTestRunner ;
import com.hp.hpl.jena.sparql.util.NodeFactory ;
import com.hp.hpl.jena.sparql.util.Utils ;
import com.hp.hpl.jena.sparql.vocabulary.DOAP ;
import com.hp.hpl.jena.sparql.vocabulary.FOAF ;
-import com.hp.hpl.jena.sparql.vocabulary.TestManifest ;
import com.hp.hpl.jena.vocabulary.DC ;
import com.hp.hpl.jena.vocabulary.DCTerms ;
import com.hp.hpl.jena.vocabulary.RDF ;
@@ -153,24 +152,24 @@ public class rdflangtest extends CmdGene
static void oneManifestEarl(String testManifest)
{
- String name = "ARQ" ;
- String releaseName = "ARQ" ;
- String version = ARQ.VERSION ;
+ String name = "Apache Jena RIOT" ;
+ String releaseName = "RIOT" ;
+ String version = RIOT.VERSION ;
String homepage = "http://jena.apache.org/" ;
- String systemURI = "http://jena.apache.org/#arq" ; // Null for bNode.
+ String systemURI = "http://jena.apache.org/#riot" ; // Null for bNode.
// Include information later.
EarlReport report = new EarlReport(systemURI, name, version, homepage) ;
- ScriptTestSuiteFactory.results = report ;
+ FactoryTestRiot.report = report ;
Model model = report.getModel() ;
- model.setNsPrefix("dawg", TestManifest.getURI()) ;
+ model.setNsPrefix("rdft", VocabLangRDF.getURI()) ;
// Update the EARL report.
Resource jena = model.createResource()
.addProperty(FOAF.homepage, model.createResource("http://jena.apache.org/")) ;
- // ARQ is part fo Jena.
+ // ARQ is part of Jena.
Resource arq = report.getSystem()
.addProperty(DCTerms.isPartOf, jena) ;
@@ -201,10 +200,10 @@ public class rdflangtest extends CmdGene
release.addProperty(DOAP.created, today) ;
release.addProperty(DOAP.name, releaseName) ; // Again
- TestSuite suite = ScriptTestSuiteFactory.make(testManifest) ;
+ TestSuite suite = FactoryTestRiot.make(testManifest, null, null) ;
SimpleTestRunner.runSilent(suite) ;
- ScriptTestSuiteFactory.results.getModel().write(System.out, "TTL") ;
+ FactoryTestRiot.report.getModel().write(System.out, "TTL") ;
}
}