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/10/28 20:10:02 UTC
svn commit: r1403078 - in /jena/Experimental/riot-reader/src/test/java:
org/apache/jena/riot/langsuite/ riotcmd/
Author: andy
Date: Sun Oct 28 19:10:01 2012
New Revision: 1403078
URL: http://svn.apache.org/viewvc?rev=1403078&view=rev
Log:
Extend test infrastructure to N-triples; structure for any language.
Added:
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java
- copied, changed from r1400868, jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiotTurtle.java
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEvalTurtle.java
- copied, changed from r1400868, jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestTurtleBadEval.java
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java
- copied, changed from r1400868, jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestTurtleBadSyntax.java
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntaxNTriples.java
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntaxTurtle.java
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestEvalTurtle.java
- copied, changed from r1400868, jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestTurtleEval.java
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java
- copied, changed from r1400868, jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestTurtleSyntax.java
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntaxNTriples.java
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntaxTurtle.java
Removed:
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiotTurtle.java
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestTurtleBadEval.java
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestTurtleBadSyntax.java
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestTurtleEval.java
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestTurtleSyntax.java
Modified:
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/TestSuiteTurtle.java
jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/VocabLangRDF.java
jena/Experimental/riot-reader/src/test/java/riotcmd/rdflangtest.java
Copied: jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java (from r1400868, jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiotTurtle.java)
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java?p2=jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java&p1=jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiotTurtle.java&r1=1400868&r2=1403078&rev=1403078&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiotTurtle.java (original)
+++ jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java Sun Oct 28 19:10:01 2012
@@ -28,18 +28,18 @@ import com.hp.hpl.jena.util.junit.TestFa
import com.hp.hpl.jena.util.junit.TestUtils ;
import com.hp.hpl.jena.vocabulary.RDF ;
-public class FactoryTestRiotTurtle extends TestFactoryManifest
+public class FactoryTestRiot extends TestFactoryManifest
{
public static TestSuite make(String manifest, Resource dftTestType, String labelPrefix)
{
- return new FactoryTestRiotTurtle(dftTestType, labelPrefix).process(manifest) ;
+ return new FactoryTestRiot(dftTestType, labelPrefix).process(manifest) ;
}
private Resource dftTestType ;
private String labelPrefix ;
- public FactoryTestRiotTurtle(Resource dftTestType, String labelPrefix)
+ public FactoryTestRiot(Resource dftTestType, String labelPrefix)
{
// FileManager?
@@ -75,17 +75,23 @@ public class FactoryTestRiotTurtle exten
baseIRI = baseIRI+x ;
if (r.equals(VocabLangRDF.TestPositiveSyntaxTTL) )
- return new UnitTestTurtleSyntax(testName, input.getURI()) ;
+ return new UnitTestSyntaxTurtle(testName, input.getURI()) ;
if (r.equals(VocabLangRDF.TestNegativeSyntaxTTL) )
- return new UnitTestTurtleBadSyntax(testName, input.getURI()) ;
+ return new UnitTestBadSyntaxTurtle(testName, input.getURI()) ;
if (r.equals(VocabLangRDF.TestPositiveEvalTTL) )
- return new UnitTestTurtleEval(testName, input.getURI(), result.getURI(), baseIRI) ;
+ return new UnitTestEvalTurtle(testName, input.getURI(), result.getURI(), baseIRI) ;
if (r.equals(VocabLangRDF.TestNegativeEvalTTL) )
- return new UnitTestTurtleBadEval(testName, input.getURI(), result.getURI(), baseIRI) ;
+ return new UnitTestBadEvalTurtle(testName, input.getURI(), result.getURI(), baseIRI) ;
+ if (r.equals(VocabLangRDF.TestPositiveSyntaxNT) )
+ return new UnitTestSyntaxNTriples(testName, input.getURI()) ;
+
+ if (r.equals(VocabLangRDF.TestNegativeSyntaxNT) )
+ return new UnitTestBadSyntaxNTriples(testName, input.getURI()) ;
+
if ( r.equals(VocabLangRDF.TestSurpressed ))
return new UnitTestSurpressed(testName) ;
Modified: jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/TestSuiteTurtle.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/TestSuiteTurtle.java?rev=1403078&r1=1403077&r2=1403078&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/TestSuiteTurtle.java (original)
+++ jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/TestSuiteTurtle.java Sun Oct 28 19:10:01 2012
@@ -34,7 +34,7 @@ public class TestSuiteTurtle extends Tes
static public TestSuite suite()
{
TestSuite ts = new TestSuite("Turtle") ;
- ts.addTest(FactoryTestRiotTurtle.make(manifest1, TestVocabRIOT.TestInOut, "Turtle-")) ;
+ ts.addTest(FactoryTestRiot.make(manifest1, TestVocabRIOT.TestInOut, "Turtle-")) ;
return ts ;
}
}
Copied: jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEvalTurtle.java (from r1400868, jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestTurtleBadEval.java)
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEvalTurtle.java?p2=jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEvalTurtle.java&p1=jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestTurtleBadEval.java&r1=1400868&r2=1403078&rev=1403078&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestTurtleBadEval.java (original)
+++ jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEvalTurtle.java Sun Oct 28 19:10:01 2012
@@ -34,13 +34,13 @@ import com.hp.hpl.jena.rdf.model.RDFRead
import com.hp.hpl.jena.util.FileManager ;
import com.hp.hpl.jena.util.FileUtils ;
-public class UnitTestTurtleBadEval extends TestCase
+public class UnitTestBadEvalTurtle extends TestCase
{
String input ;
String output ;
String baseIRI ;
- public UnitTestTurtleBadEval(String name, String input, String output, String baseIRI)
+ public UnitTestBadEvalTurtle(String name, String input, String output, String baseIRI)
{
super(name) ;
this.input = input ;
Copied: jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java (from r1400868, jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestTurtleBadSyntax.java)
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java?p2=jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java&p1=jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestTurtleBadSyntax.java&r1=1400868&r2=1403078&rev=1403078&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestTurtleBadSyntax.java (original)
+++ jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java Sun Oct 28 19:10:01 2012
@@ -31,10 +31,11 @@ import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
-public class UnitTestTurtleBadSyntax extends TestCase
+public class UnitTestBadSyntax extends TestCase
{
private final String uri ;
- public UnitTestTurtleBadSyntax(String name, String uri) { super(name) ; this.uri = uri ; }
+ private final Lang2 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()
@@ -69,27 +70,14 @@ public class UnitTestTurtleBadSyntax ext
@Override
public void runTest()
{
- // Just the parser.
-// InputStream in = IO.openFile(uri) ;
-// assertNotNull(in) ;
-// LangRIOT parser = RiotReader.createParserTurtle(in, uri, new SinkNull<Triple>()) ;
-// try {
-// parser.parse() ;
-// } catch (RiotException ex) { return ; }
-// catch (RuntimeException ex) {
-// ex.printStackTrace(System.err) ;
-// fail("Unexpected exception") ;
-//
-// }
Model model = ModelFactory.createDefaultModel() ;
try {
- WebReader2.read(model, uri, uri, Lang2.TURTLE) ;
+ WebReader2.read(model, uri, uri, lang) ;
} catch (RiotException ex) { return ; }
catch (RuntimeException ex) {
ex.printStackTrace(System.err) ;
fail("Unexpected exception") ;
-
}
- fail("Bad syntax Turtle test succeed in parsing the file") ;
+ fail("Bad syntax test succeed in parsing the file") ;
}
}
Added: jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntaxNTriples.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntaxNTriples.java?rev=1403078&view=auto
==============================================================================
--- jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntaxNTriples.java (added)
+++ jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntaxNTriples.java Sun Oct 28 19:10:01 2012
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.riot.langsuite;
+
+import org.apache.jena.riot.Lang2 ;
+
+
+public class UnitTestBadSyntaxNTriples extends UnitTestBadSyntax
+{
+ public UnitTestBadSyntaxNTriples(String name, String uri) { super(name, uri, Lang2.NTRIPLES) ; }
+}
Added: jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntaxTurtle.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntaxTurtle.java?rev=1403078&view=auto
==============================================================================
--- jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntaxTurtle.java (added)
+++ jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntaxTurtle.java Sun Oct 28 19:10:01 2012
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.riot.langsuite;
+
+import org.apache.jena.riot.Lang2 ;
+
+
+public class UnitTestBadSyntaxTurtle extends UnitTestBadSyntax
+{
+ public UnitTestBadSyntaxTurtle(String name, String uri) { super(name, uri, Lang2.TURTLE) ; }
+}
Copied: jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestEvalTurtle.java (from r1400868, jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestTurtleEval.java)
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestEvalTurtle.java?p2=jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestEvalTurtle.java&p1=jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestTurtleEval.java&r1=1400868&r2=1403078&rev=1403078&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestTurtleEval.java (original)
+++ jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestEvalTurtle.java Sun Oct 28 19:10:01 2012
@@ -34,13 +34,13 @@ import com.hp.hpl.jena.rdf.model.RDFRead
import com.hp.hpl.jena.util.FileManager ;
import com.hp.hpl.jena.util.FileUtils ;
-public class UnitTestTurtleEval extends TestCase
+public class UnitTestEvalTurtle extends TestCase
{
String input ;
String output ;
String baseIRI ;
- public UnitTestTurtleEval(String name, String input, String output, String baseIRI)
+ public UnitTestEvalTurtle(String name, String input, String output, String baseIRI)
{
super(name) ;
this.input = input ;
Copied: jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java (from r1400868, jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestTurtleSyntax.java)
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java?p2=jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java&p1=jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestTurtleSyntax.java&r1=1400868&r2=1403078&rev=1403078&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestTurtleSyntax.java (original)
+++ jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java Sun Oct 28 19:10:01 2012
@@ -18,35 +18,25 @@
package org.apache.jena.riot.langsuite;
-import java.io.InputStream ;
-
import junit.framework.TestCase ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.lib.SinkNull ;
-import org.openjena.riot.RiotException ;
-import org.openjena.riot.RiotReader ;
-import org.openjena.riot.lang.LangRIOT ;
+import org.apache.jena.riot.Lang2 ;
+import org.apache.jena.riot.WebReader2 ;
-import com.hp.hpl.jena.graph.Triple ;
+import com.hp.hpl.jena.rdf.model.Model ;
+import com.hp.hpl.jena.rdf.model.ModelFactory ;
-public class UnitTestTurtleSyntax extends TestCase
+public class UnitTestSyntax extends TestCase
{
private final String uri ;
- public UnitTestTurtleSyntax(String name, String uri) { super(name) ; this.uri = uri ; }
+ private final Lang2 lang ;
+ public UnitTestSyntax(String name, String uri, Lang2 lang) { super(name) ; this.uri = uri ; this.lang = lang ; }
@Override
public void runTest()
{
- InputStream in = IO.openFile(uri) ;
- assertNotNull(in) ;
- LangRIOT parser = RiotReader.createParserTurtle(in, uri, new SinkNull<Triple>()) ;
- try {
- parser.parse() ;
- } catch (RiotException ex) {
- // Debug point
- throw ex ;
- }
+ Model model = ModelFactory.createDefaultModel() ;
+ WebReader2.read(model, uri, uri, lang) ;
}
}
Added: jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntaxNTriples.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntaxNTriples.java?rev=1403078&view=auto
==============================================================================
--- jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntaxNTriples.java (added)
+++ jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntaxNTriples.java Sun Oct 28 19:10:01 2012
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.riot.langsuite;
+
+import org.apache.jena.riot.Lang2 ;
+
+
+public class UnitTestSyntaxNTriples extends UnitTestSyntax
+{
+ public UnitTestSyntaxNTriples(String name, String uri) { super(name, uri, Lang2.NTRIPLES) ; }
+}
Added: jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntaxTurtle.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntaxTurtle.java?rev=1403078&view=auto
==============================================================================
--- jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntaxTurtle.java (added)
+++ jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntaxTurtle.java Sun Oct 28 19:10:01 2012
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.riot.langsuite;
+
+import org.apache.jena.riot.Lang2 ;
+
+
+public class UnitTestSyntaxTurtle extends UnitTestSyntax
+{
+ public UnitTestSyntaxTurtle(String name, String uri) { super(name, uri, Lang2.TURTLE) ; }
+}
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=1403078&r1=1403077&r2=1403078&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 Oct 28 19:10:01 2012
@@ -47,6 +47,38 @@ public class VocabLangRDF
public static final Resource TestNegativeEvalTTL = m_model.createResource( NS+"TestTurtleNegativeEval" );
+ public static final Resource TestPositiveSyntaxNT = m_model.createResource( NS+"TestNTriplesPositiveSyntax" );
+
+ public static final Resource TestNegativeSyntaxNT = m_model.createResource( NS+"TestNTriplesNegativeSyntax" );
+
+ public static final Resource TestPositiveEvalNT = m_model.createResource( NS+"TestNTriplesPositiveEval" );
+
+ public static final Resource TestNegativeEvalNT = m_model.createResource( NS+"TestNTriplesNegativeEval" );
+
+ public static final Resource TestPositiveSyntaxRJ = m_model.createResource( NS+"TestRDFJSONPositiveSyntax" );
+
+ public static final Resource TestNegativeSyntaxRJ = m_model.createResource( NS+"TestRDFJSONNegativeSyntax" );
+
+ public static final Resource TestPositiveEvalRJ = m_model.createResource( NS+"TestRDFJSONPositiveEval" );
+
+ public static final Resource TestNegativeEvalRJ = m_model.createResource( NS+"TestRDFJSONNegativeEval" );
+
+ public static final Resource TestPositiveSyntaxNQ = m_model.createResource( NS+"TestNQuadsPositiveSyntax" );
+
+ public static final Resource TestNegativeSyntaxNQ = m_model.createResource( NS+"TestNQuadsNegativeSyntax" );
+
+ public static final Resource TestPositiveEvalNQ = m_model.createResource( NS+"TestNQuadsPositiveEval" );
+
+ 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 TestPositiveEvalTriG = m_model.createResource( NS+"TestTrigPositiveEval" );
+
+ public static final Resource TestNegativeEvalTriG = m_model.createResource( NS+"TestTrigNegativeEval" );
+
public static final Resource TestSurpressed = m_model.createResource( NS+"Test" );
}
Modified: jena/Experimental/riot-reader/src/test/java/riotcmd/rdflangtest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/test/java/riotcmd/rdflangtest.java?rev=1403078&r1=1403077&r2=1403078&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/test/java/riotcmd/rdflangtest.java (original)
+++ jena/Experimental/riot-reader/src/test/java/riotcmd/rdflangtest.java Sun Oct 28 19:10:01 2012
@@ -19,7 +19,7 @@
package riotcmd;
import junit.framework.TestSuite ;
-import org.apache.jena.riot.langsuite.FactoryTestRiotTurtle ;
+import org.apache.jena.riot.langsuite.FactoryTestRiot ;
import org.openjena.atlas.junit.BaseTest ;
import org.openjena.riot.RIOT ;
import org.openjena.riot.SysRIOT ;
@@ -145,7 +145,7 @@ public class rdflangtest extends CmdGene
static void oneManifest(String testManifest)
{
- TestSuite suite = FactoryTestRiotTurtle.make(testManifest, null, null) ;
+ TestSuite suite = FactoryTestRiot.make(testManifest, null, null) ;
//junit.textui.TestRunner.run(suite) ;
SimpleTestRunner.runAndReport(suite) ;