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/12/17 17:57:11 UTC
svn commit: r1423018 - in /jena/trunk/jena-arq/src:
main/java/org/apache/jena/riot/ test/java/org/apache/jena/riot/
test/java/org/apache/jena/riot/lang/
test/java/org/apache/jena/riot/langsuite/
Author: andy
Date: Mon Dec 17 16:57:06 2012
New Revision: 1423018
URL: http://svn.apache.org/viewvc?rev=1423018&view=rev
Log:
Rename new language constants.
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang2.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/ParserRegistry.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderFactoryRIOT.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebReader2.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadDataset.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTurtle.java
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/UnitTestEval.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang2.java?rev=1423018&r1=1423017&r2=1423018&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang2.java Mon Dec 17 16:57:06 2012
@@ -69,9 +69,6 @@ public class Lang2
return x ;
}
-// public boolean isTriples() { return RDFLanguages.isTriples(this) ; }
-// public boolean isQuads() { return RDFLanguages.isQuads(this) ; }
-
@Override
public int hashCode() { return label.hashCode() ; }
@@ -107,11 +104,11 @@ public class Lang2
{
String x = "Lang:" + label + " " + getContentType() ;
if (getAltNames().size() > 0)
- x = " " + getAltNames() ;
+ x = x + " " + getAltNames() ;
if (getAltContentTypes().size() > 0)
- x = " " + getAltContentTypes() ;
+ x = x + " " + getAltContentTypes() ;
if (getFileExtensions().size() > 0)
- x = " " + getFileExtensions() ;
+ x = x + " " + getFileExtensions() ;
return x ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/ParserRegistry.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/ParserRegistry.java?rev=1423018&r1=1423017&r2=1423018&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/ParserRegistry.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/ParserRegistry.java Mon Dec 17 16:57:06 2012
@@ -18,12 +18,12 @@
package org.apache.jena.riot;
-import static org.apache.jena.riot.RDFLanguages.langNQuads ;
-import static org.apache.jena.riot.RDFLanguages.langNTriples ;
-import static org.apache.jena.riot.RDFLanguages.langRDFJSON ;
-import static org.apache.jena.riot.RDFLanguages.langRDFXML ;
-import static org.apache.jena.riot.RDFLanguages.langTriG ;
-import static org.apache.jena.riot.RDFLanguages.langTurtle ;
+import static org.apache.jena.riot.RDFLanguages.NQuads ;
+import static org.apache.jena.riot.RDFLanguages.NTriples ;
+import static org.apache.jena.riot.RDFLanguages.RDFJSON ;
+import static org.apache.jena.riot.RDFLanguages.RDFXML ;
+import static org.apache.jena.riot.RDFLanguages.TriG ;
+import static org.apache.jena.riot.RDFLanguages.Turtle ;
import java.io.InputStream ;
import java.util.Map ;
@@ -74,37 +74,37 @@ public class ParserRegistry
RDFLanguages.init() ;
// Reader name and variations to lang - must include Jena old-name.
- registerShortNameForLang("RDF/XML", langRDFXML) ;
- registerShortNameForLang("RDFXML", langRDFXML) ;
- registerShortNameForLang("RDF/XML-ABBREV", langRDFXML) ;
-
- registerShortNameForLang("N-TRIPLE", langNTriples) ;
- registerShortNameForLang("N-TRIPLES", langNTriples) ;
- registerShortNameForLang("NTRIPLE", langNTriples) ;
- registerShortNameForLang("NTRIPLES", langNTriples) ;
- registerShortNameForLang("NT", langNTriples) ;
+ registerShortNameForLang("RDF/XML", RDFXML) ;
+ registerShortNameForLang("RDFXML", RDFXML) ;
+ registerShortNameForLang("RDF/XML-ABBREV", RDFXML) ;
+
+ registerShortNameForLang("N-TRIPLE", NTriples) ;
+ registerShortNameForLang("N-TRIPLES", NTriples) ;
+ registerShortNameForLang("NTRIPLE", NTriples) ;
+ registerShortNameForLang("NTRIPLES", NTriples) ;
+ registerShortNameForLang("NT", NTriples) ;
- registerShortNameForLang("TURTLE", langTurtle) ;
- registerShortNameForLang("TTL", langTurtle) ;
+ registerShortNameForLang("TURTLE", Turtle) ;
+ registerShortNameForLang("TTL", Turtle) ;
- registerShortNameForLang("RDF/JSON", langRDFJSON) ;
- registerShortNameForLang("RDFJSON", langRDFJSON) ;
+ registerShortNameForLang("RDF/JSON", RDFJSON) ;
+ registerShortNameForLang("RDFJSON", RDFJSON) ;
- registerShortNameForLang("N-QUADS", langNQuads) ;
- registerShortNameForLang("NQUADS", langNQuads) ;
- registerShortNameForLang("N-QUAD", langNQuads) ;
- registerShortNameForLang("NQUAD", langNQuads) ;
- registerShortNameForLang("NQ", langNQuads) ;
+ registerShortNameForLang("N-QUADS", NQuads) ;
+ registerShortNameForLang("NQUADS", NQuads) ;
+ registerShortNameForLang("N-QUAD", NQuads) ;
+ registerShortNameForLang("NQUAD", NQuads) ;
+ registerShortNameForLang("NQ", NQuads) ;
- registerShortNameForLang("TRIG", langTriG) ;
+ registerShortNameForLang("TRIG", TriG) ;
- registerLangTriples(langRDFXML, pfTriples) ;
- registerLangTriples(langNTriples, pfTriples) ;
- registerLangTriples(langTurtle, pfTriples) ;
- registerLangTriples(langRDFJSON, pfTriples) ;
+ registerLangTriples(RDFXML, pfTriples) ;
+ registerLangTriples(NTriples, pfTriples) ;
+ registerLangTriples(Turtle, pfTriples) ;
+ registerLangTriples(RDFJSON, pfTriples) ;
- registerLangQuads(langNQuads, pfQuads) ;
- registerLangQuads(langTriG, pfQuads) ;
+ registerLangQuads(NQuads, pfQuads) ;
+ registerLangQuads(TriG, pfQuads) ;
}
/** Register a Jena IO name */
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java?rev=1423018&r1=1423017&r2=1423018&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java Mon Dec 17 16:57:06 2012
@@ -47,6 +47,7 @@ import com.hp.hpl.jena.util.FileUtils ;
*/
public class RDFLanguages
{
+ // Display names
public static final String strLangRDFXML = "RDF/XML" ;
public static final String strLangTurtle = "Turtle" ;
public static final String strLangNTriples = "N-Triples" ;
@@ -56,13 +57,13 @@ public class RDFLanguages
public static final String strLangTriG = "TriG" ;
/** RDF/XML */
- public static final Lang2 langRDFXML = LangBuilder.create(strLangRDFXML, contentTypeRDFXML)
+ public static final Lang2 RDFXML = LangBuilder.create(strLangRDFXML, contentTypeRDFXML)
.addAltNames("RDFXML", "RDF/XML-ABBREV", "RDFXML-ABBREV")
.addFileExtensions("rdf","owl","xml")
.build() ;
/** Turtle */
- public static final Lang2 langTurtle = LangBuilder.create(strLangTurtle, contentTypeTurtle)
+ public static final Lang2 Turtle = LangBuilder.create(strLangTurtle, contentTypeTurtle)
.addAltNames("TTL")
.addAltContentTypes(contentTypeTurtleAlt1, contentTypeTurtleAlt2)
.addFileExtensions("ttl")
@@ -70,26 +71,26 @@ public class RDFLanguages
.build() ;
/** N-Triples */
- public static final Lang2 langNTriples = LangBuilder.create(strLangNTriples, contentTypeNTriples)
+ public static final Lang2 NTriples = LangBuilder.create(strLangNTriples, contentTypeNTriples)
.addAltNames("NT", "NTriples", "NTriple", "N-Triple")
.addAltContentTypes(contentTypeNTriplesAlt)
.addFileExtensions("nt")
.build() ;
/** RDF/JSON (this is not JSON-LD) */
- public static final Lang2 langRDFJSON = LangBuilder.create(strLangRDFJSON, contentTypeRDFJSON)
+ public static final Lang2 RDFJSON = LangBuilder.create(strLangRDFJSON, contentTypeRDFJSON)
.addAltNames("RDFJSON")
.addFileExtensions("rj", "json")
.build() ;
/** TriG */
- public static final Lang2 langTriG = LangBuilder.create(strLangTriG, contentTypeTriG)
+ public static final Lang2 TriG = LangBuilder.create(strLangTriG, contentTypeTriG)
.addAltContentTypes(contentTypeTriGAlt1, contentTypeTriGAlt2)
.addFileExtensions("trig")
.build() ;
/** N-Quads */
- public static final Lang2 langNQuads = LangBuilder.create(strLangNQuads, contentTypeNQuads)
+ public static final Lang2 NQuads = LangBuilder.create(strLangNQuads, contentTypeNQuads)
.addAltNames("NQ", "NQuads", "NQuad", "N-Quad")
.addAltContentTypes(contentTypeNQuadsAlt1, contentTypeNQuadsAlt2)
.addFileExtensions("nq")
@@ -119,12 +120,12 @@ public class RDFLanguages
/** Standard built-in languages */
private static void initStandard()
{
- register(langRDFXML) ;
- register(langTurtle) ;
- register(langNTriples) ;
- register(langRDFJSON) ;
- register(langTriG) ;
- register(langNQuads) ;
+ register(RDFXML) ;
+ register(Turtle) ;
+ register(NTriples) ;
+ register(RDFJSON) ;
+ register(TriG) ;
+ register(NQuads) ;
}
/** Register a language.
@@ -280,12 +281,12 @@ public class RDFLanguages
// TEMPORARY
public static Lang convert(Lang2 lang2)
{
- if ( lang2 == langRDFXML ) return Lang.RDFXML ;
- if ( lang2 == langTurtle ) return Lang.TURTLE ;
- if ( lang2 == langNTriples ) return Lang.NTRIPLES ;
- if ( lang2 == langRDFJSON ) return Lang.RDFJSON ;
- if ( lang2 == langTriG ) return Lang.TRIG ;
- if ( lang2 == langNQuads ) return Lang.NQUADS ;
+ if ( lang2 == RDFXML ) return Lang.RDFXML ;
+ if ( lang2 == Turtle ) return Lang.TURTLE ;
+ if ( lang2 == NTriples ) return Lang.NTRIPLES ;
+ if ( lang2 == RDFJSON ) return Lang.RDFJSON ;
+ if ( lang2 == TriG ) return Lang.TRIG ;
+ if ( lang2 == NQuads ) return Lang.NQUADS ;
throw new RiotException("No such language to convert: "+lang2) ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderFactoryRIOT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderFactoryRIOT.java?rev=1423018&r1=1423017&r2=1423018&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderFactoryRIOT.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/RDFReaderFactoryRIOT.java Mon Dec 17 16:57:06 2012
@@ -39,7 +39,7 @@ public class RDFReaderFactoryRIOT implem
// If RDF/XML, then return an ARP
Lang2 lang = RDFLanguages.nameToLang(langname) ;
- if ( lang == RDFLanguages.langRDFXML )
+ if ( RDFLanguages.RDFXML.equals(lang) )
return new RDFReaderRIOT_ARP() ;
return new RDFReaderRIOT(langname) ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebReader2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebReader2.java?rev=1423018&r1=1423017&r2=1423018&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebReader2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/WebReader2.java Mon Dec 17 16:57:06 2012
@@ -460,9 +460,9 @@ public class WebReader2
throw new RiotException("Failed to determine the triples content type: (URI="+base+" : hint="+hintLang+")") ;
Tokenizer tokenizer =
- hintLang == RDFLanguages.langRDFJSON ?
- new TokenizerJSON(PeekReader.make(in)) :
- TokenizerFactory.makeTokenizer(in) ;
+ RDFLanguages.RDFJSON.equals(hintLang)?
+ new TokenizerJSON(PeekReader.make(in)) :
+ TokenizerFactory.makeTokenizer(in) ;
if ( hintLang == null )
throw new RiotException("No language specificied") ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java?rev=1423018&r1=1423017&r2=1423018&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestJenaReaderRIOT.java Mon Dec 17 16:57:06 2012
@@ -79,7 +79,7 @@ public class TestJenaReaderRIOT extends
{
TypedInputStream2 in = WebReader2.open(filename("D-not-TTL.ttl") );
Model m0 = ModelFactory.createDefaultModel() ;
- WebReader2.read(m0, in.getInput(), RDFLanguages.langRDFXML) ;
+ WebReader2.read(m0, in.getInput(), RDFLanguages.RDFXML) ;
}
TypedInputStream2 in1 = WebReader2.open(filename("D-not-TTL.ttl") );
@@ -96,7 +96,7 @@ public class TestJenaReaderRIOT extends
{
StringReader s = new StringReader(x) ;
Model m = ModelFactory.createDefaultModel() ;
- WebReader2.read(m, s, null, RDFLanguages.langNTriples) ;
+ WebReader2.read(m, s, null, RDFLanguages.NTriples) ;
}
StringReader s1 = new StringReader("<s> <p> <p> .") ;
@@ -117,7 +117,7 @@ public class TestJenaReaderRIOT extends
{
StringReader s = new StringReader(x) ;
Model m = ModelFactory.createDefaultModel() ;
- WebReader2.read(m, s, null, RDFLanguages.langRDFXML) ;
+ WebReader2.read(m, s, null, RDFLanguages.RDFXML) ;
}
StringReader s1 = new StringReader(x) ;
Model m = ModelFactory.createDefaultModel() ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java?rev=1423018&r1=1423017&r2=1423018&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java Mon Dec 17 16:57:06 2012
@@ -26,42 +26,42 @@ public class TestLangRIOT extends BaseTe
{
@BeforeClass public static void beforeClass() { RDFLanguages.init() ; }
- @Test public void lang_01() { test(RDFLanguages.langNTriples, "NT") ; }
- @Test public void lang_02() { test(RDFLanguages.langNTriples, "N-Triples") ; }
- @Test public void lang_03() { test(RDFLanguages.langNTriples, "N-TRIPLES") ; }
- @Test public void lang_04() { test(RDFLanguages.langNTriples, "NTRIPLE") ; }
- @Test public void lang_05() { test(RDFLanguages.langNTriples, "NTRIPLES") ; }
+ @Test public void lang_01() { test(RDFLanguages.NTriples, "NT") ; }
+ @Test public void lang_02() { test(RDFLanguages.NTriples, "N-Triples") ; }
+ @Test public void lang_03() { test(RDFLanguages.NTriples, "N-TRIPLES") ; }
+ @Test public void lang_04() { test(RDFLanguages.NTriples, "NTRIPLE") ; }
+ @Test public void lang_05() { test(RDFLanguages.NTriples, "NTRIPLES") ; }
- @Test public void lang_11() { test(RDFLanguages.langTurtle, "TTL") ; }
- @Test public void lang_12() { test(RDFLanguages.langTurtle, "TUrtLE") ; }
+ @Test public void lang_11() { test(RDFLanguages.Turtle, "TTL") ; }
+ @Test public void lang_12() { test(RDFLanguages.Turtle, "TUrtLE") ; }
- @Test public void lang_21() { test(RDFLanguages.langRDFXML, "RDF/XML") ; }
- @Test public void lang_22() { test(RDFLanguages.langRDFXML, "RDFXML") ; }
- @Test public void lang_23() { test(RDFLanguages.langRDFXML, "RDF/XML-ABBREV") ; }
+ @Test public void lang_21() { test(RDFLanguages.RDFXML, "RDF/XML") ; }
+ @Test public void lang_22() { test(RDFLanguages.RDFXML, "RDFXML") ; }
+ @Test public void lang_23() { test(RDFLanguages.RDFXML, "RDF/XML-ABBREV") ; }
- @Test public void lang_30() { test(RDFLanguages.langRDFJSON, "RDFJSON") ; }
- @Test public void lang_31() { test(RDFLanguages.langRDFJSON, "RDF/json") ; }
+ @Test public void lang_30() { test(RDFLanguages.RDFJSON, "RDFJSON") ; }
+ @Test public void lang_31() { test(RDFLanguages.RDFJSON, "RDF/json") ; }
- @Test public void lang_40() { test(RDFLanguages.langNQuads, "N-QUADS") ; }
- @Test public void lang_41() { test(RDFLanguages.langNQuads, "NQuads") ; }
+ @Test public void lang_40() { test(RDFLanguages.NQuads, "N-QUADS") ; }
+ @Test public void lang_41() { test(RDFLanguages.NQuads, "NQuads") ; }
- @Test public void lang_50() { test(RDFLanguages.langTriG, "TriG") ; }
- @Test public void lang_51() { test(RDFLanguages.langTriG, "trig") ; }
- @Test public void lang_52() { test(RDFLanguages.langTriG, "TRIG") ; }
+ @Test public void lang_50() { test(RDFLanguages.TriG, "TriG") ; }
+ @Test public void lang_51() { test(RDFLanguages.TriG, "trig") ; }
+ @Test public void lang_52() { test(RDFLanguages.TriG, "TRIG") ; }
- @Test public void guess_01() { guess("D.nt", RDFLanguages.langNTriples) ; }
- @Test public void guess_02() { guess("D.ttl.nt", RDFLanguages.langNTriples) ; }
+ @Test public void guess_01() { guess("D.nt", RDFLanguages.NTriples) ; }
+ @Test public void guess_02() { guess("D.ttl.nt", RDFLanguages.NTriples) ; }
- @Test public void guess_03() { guess("D.ttl", RDFLanguages.langTurtle) ; }
+ @Test public void guess_03() { guess("D.ttl", RDFLanguages.Turtle) ; }
- @Test public void guess_04() { guess("D.rdf", RDFLanguages.langRDFXML) ; }
- @Test public void guess_05() { guess("D.owl", RDFLanguages.langRDFXML) ; }
+ @Test public void guess_04() { guess("D.rdf", RDFLanguages.RDFXML) ; }
+ @Test public void guess_05() { guess("D.owl", RDFLanguages.RDFXML) ; }
- @Test public void guess_06() { guess("D.rj", RDFLanguages.langRDFJSON) ; }
- @Test public void guess_07() { guess("D.json", RDFLanguages.langRDFJSON) ; }
+ @Test public void guess_06() { guess("D.rj", RDFLanguages.RDFJSON) ; }
+ @Test public void guess_07() { guess("D.json", RDFLanguages.RDFJSON) ; }
- @Test public void guess_08() { guess("D.nq", RDFLanguages.langNQuads) ; }
- @Test public void guess_09() { guess("D.trig", RDFLanguages.langTriG) ; }
+ @Test public void guess_08() { guess("D.nq", RDFLanguages.NQuads) ; }
+ @Test public void guess_09() { guess("D.trig", RDFLanguages.TriG) ; }
private void test(Lang2 expected, String string)
{
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadDataset.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadDataset.java?rev=1423018&r1=1423017&r2=1423018&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadDataset.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestReadDataset.java Mon Dec 17 16:57:06 2012
@@ -49,8 +49,8 @@ public class TestReadDataset extends Bas
@Test public void read_01() { read("D.nq") ; }
@Test public void read_02() { read("D.trig") ; }
- @Test public void read_03() { read("D.nq", RDFLanguages.langNQuads) ; }
- @Test public void read_04() { read("D.trig", RDFLanguages.langTriG) ; }
+ @Test public void read_03() { read("D.nq", RDFLanguages.NQuads) ; }
+ @Test public void read_04() { read("D.trig", RDFLanguages.TriG) ; }
@Test public void read_11() { read("D.nq", "N-Quads") ; }
@@ -59,8 +59,8 @@ public class TestReadDataset extends Bas
@Test public void read_14() { read("D.trig", "TriG") ; }
@Test public void read_15() { read("D.trig", "trig") ; }
- @Test public void read_21() { read("D-nq", RDFLanguages.langNQuads) ; }
- @Test public void read_22() { read("D-trig", RDFLanguages.langTriG) ; }
+ @Test public void read_21() { read("D-nq", RDFLanguages.NQuads) ; }
+ @Test public void read_22() { read("D-trig", RDFLanguages.TriG) ; }
@Test public void read_23() { read("D-nq", "NQuads") ; }
@Test public void read_24() { read("D-trig", "TRIG") ; }
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java?rev=1423018&r1=1423017&r2=1423018&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java Mon Dec 17 16:57:06 2012
@@ -47,7 +47,7 @@ public class TestLangNTriples extends Te
StringReader r = new StringReader(s) ;
Model m = ModelFactory.createDefaultModel() ;
- WebReader2.read(m, r, null, RDFLanguages.langNTriples) ;
+ WebReader2.read(m, r, null, RDFLanguages.NTriples) ;
assertEquals(1, m.size()) ;
String x = m.listStatements().next().getSubject().getId().getLabelString() ;
@@ -55,7 +55,7 @@ public class TestLangNTriples extends Te
// reset - reread - new bNode.
r = new StringReader(s) ;
- WebReader2.read(m, r, null, RDFLanguages.langNTriples) ;
+ WebReader2.read(m, r, null, RDFLanguages.NTriples) ;
assertEquals(2, m.size()) ;
}
@@ -110,7 +110,7 @@ public class TestLangNTriples extends Te
{
StringReader r = new StringReader(string) ;
Model model = ModelFactory.createDefaultModel() ;
- WebReader2.read(model, r, null, RDFLanguages.langNTriples) ;
+ WebReader2.read(model, r, null, RDFLanguages.NTriples) ;
return model ;
}
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java?rev=1423018&r1=1423017&r2=1423018&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java Mon Dec 17 16:57:06 2012
@@ -522,7 +522,7 @@ public class TestLangRdfJson extends Bas
{
StringReader r = new StringReader(string) ;
Model model = ModelFactory.createDefaultModel() ;
- WebReader2.read(model, r, null, RDFLanguages.langNTriples) ;
+ WebReader2.read(model, r, null, RDFLanguages.NTriples) ;
return model ;
}
@@ -530,7 +530,7 @@ public class TestLangRdfJson extends Bas
{
StringReader r = new StringReader(string) ;
Model model = ModelFactory.createDefaultModel() ;
- WebReader2.read(model, r, null, RDFLanguages.langRDFJSON) ;
+ WebReader2.read(model, r, null, RDFLanguages.RDFJSON) ;
return model ;
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTurtle.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTurtle.java?rev=1423018&r1=1423017&r2=1423018&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTurtle.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTurtle.java Mon Dec 17 16:57:06 2012
@@ -56,7 +56,7 @@ public class TestLangTurtle extends Base
String s = "_:a <http://example/p> 'foo' . " ;
StringReader r = new StringReader(s) ;
Model m = ModelFactory.createDefaultModel() ;
- WebReader2.read(m, r, null, RDFLanguages.langTurtle) ;
+ WebReader2.read(m, r, null, RDFLanguages.Turtle) ;
assertEquals(1, m.size()) ;
String x = m.listStatements().next().getSubject().getId().getLabelString() ;
@@ -64,7 +64,7 @@ public class TestLangTurtle extends Base
// reset - reread - new bNode.
r = new StringReader(s) ;
- WebReader2.read(m, r, null, RDFLanguages.langTurtle) ;
+ WebReader2.read(m, r, null, RDFLanguages.Turtle) ;
assertEquals(2, m.size()) ;
}
@@ -74,7 +74,7 @@ public class TestLangTurtle extends Base
String s = "_:a <http://example/p> 'foo' . _:a <http://example/p> 'foo' ." ;
StringReader r = new StringReader(s) ;
Model m = ModelFactory.createDefaultModel() ;
- WebReader2.read(m, r, null, RDFLanguages.langTurtle) ;
+ WebReader2.read(m, r, null, RDFLanguages.Turtle) ;
assertEquals(1, m.size()) ;
}
@@ -83,7 +83,7 @@ public class TestLangTurtle extends Base
{
Model model = ModelFactory.createDefaultModel() ;
StringReader reader = new StringReader("@prefix x: <http://example/x>.") ;
- WebReader2.read(model, reader, null, RDFLanguages.langTurtle) ;
+ WebReader2.read(model, reader, null, RDFLanguages.Turtle) ;
assertEquals(1, model.getNsPrefixMap().size()) ;
assertEquals("http://example/x", model.getNsPrefixURI("x")) ;
}
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=1423018&r1=1423017&r2=1423018&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 Mon Dec 17 16:57:06 2012
@@ -74,22 +74,22 @@ public class FactoryTestRiot extends Tes
baseIRI = baseIRI+x ;
if ( r.equals(VocabLangRDF.TestPositiveSyntaxTTL) )
- return new UnitTestSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.langTurtle, report) ;
+ return new UnitTestSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.Turtle, report) ;
if ( r.equals(VocabLangRDF.TestNegativeSyntaxTTL) )
- return new UnitTestBadSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.langTurtle, report) ;
+ return new UnitTestBadSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.Turtle, report) ;
if ( r.equals(VocabLangRDF.TestPositiveSyntaxNT) )
- return new UnitTestSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.langNTriples, report) ;
+ return new UnitTestSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.NTriples, report) ;
if ( r.equals(VocabLangRDF.TestNegativeSyntaxNT) )
- return new UnitTestBadSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.langNTriples, report) ;
+ return new UnitTestBadSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.NTriples, report) ;
if ( r.equals(VocabLangRDF.TestPositiveSyntaxRJ) )
- return new UnitTestSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.langRDFJSON, report) ;
+ return new UnitTestSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.RDFJSON, report) ;
if ( r.equals(VocabLangRDF.TestNegativeSyntaxRJ) )
- return new UnitTestBadSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.langRDFJSON, report) ;
+ return new UnitTestBadSyntax(testName, item.getURI(), input.getURI(), RDFLanguages.RDFJSON, report) ;
if ( r.equals(VocabLangRDF.TestSurpressed ))
return new UnitTestSurpressed(testName, item.getURI(), report) ;
@@ -97,22 +97,22 @@ public class FactoryTestRiot extends Tes
// Eval.
if ( r.equals(VocabLangRDF.TestEvalTTL) )
- return new UnitTestEval(testName, item.getURI(), input.getURI(), result.getURI(), baseIRI, RDFLanguages.langTurtle, report) ;
+ return new UnitTestEval(testName, item.getURI(), input.getURI(), result.getURI(), baseIRI, RDFLanguages.Turtle, report) ;
if ( r.equals(VocabLangRDF.TestNegativeEvalTTL) )
- return new UnitTestBadEval(testName, item.getURI(), input.getURI(), RDFLanguages.langTurtle, report) ;
+ return new UnitTestBadEval(testName, item.getURI(), input.getURI(), RDFLanguages.Turtle, report) ;
if ( r.equals(VocabLangRDF.TestEvalNT) )
- return new UnitTestEval(testName, item.getURI(), input.getURI(), result.getURI(), baseIRI, RDFLanguages.langNTriples, report) ;
+ return new UnitTestEval(testName, item.getURI(), input.getURI(), result.getURI(), baseIRI, RDFLanguages.NTriples, report) ;
if ( r.equals(VocabLangRDF.TestNegativeEvalNT) )
- return new UnitTestBadEval(testName, item.getURI(), input.getURI(), RDFLanguages.langNTriples, report) ;
+ return new UnitTestBadEval(testName, item.getURI(), input.getURI(), RDFLanguages.NTriples, report) ;
if ( r.equals(VocabLangRDF.TestEvalRJ) )
- return new UnitTestEval(testName, item.getURI(), input.getURI(), result.getURI(), baseIRI, RDFLanguages.langRDFJSON, report) ;
+ return new UnitTestEval(testName, item.getURI(), input.getURI(), result.getURI(), baseIRI, RDFLanguages.RDFJSON, report) ;
if ( r.equals(VocabLangRDF.TestNegativeEvalRJ) )
- return new UnitTestBadEval(testName, item.getURI(), input.getURI(), RDFLanguages.langRDFJSON, report) ;
+ return new UnitTestBadEval(testName, item.getURI(), input.getURI(), RDFLanguages.RDFJSON, report) ;
System.err.println("Unrecognized turtle test : " + testName) ;
return null ;
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=1423018&r1=1423017&r2=1423018&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 Mon Dec 17 16:57:06 2012
@@ -72,7 +72,7 @@ public class UnitTestEval extends LangTe
Model results = ModelFactory.createDefaultModel() ;
// Directly get an N-triples reader
InputStream in = StreamManager.get().open(output).getInput() ;
- WebReader2.read(results, in, null, RDFLanguages.langNTriples) ;
+ WebReader2.read(results, in, null, RDFLanguages.NTriples) ;
boolean b = model.isIsomorphicWith(results) ;
if ( !b )