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 2013/03/17 18:48:10 UTC
svn commit: r1457500 [2/4] - in /jena/trunk:
jena-arq/src-examples/arq/examples/
jena-arq/src-examples/arq/examples/propertyfunction/
jena-arq/src/main/java/arq/ jena-arq/src/main/java/com/hp/hpl/jena/query/
jena-arq/src/main/java/com/hp/hpl/jena/sparq...
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputStAX.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputStAX.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputStAX.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/XMLInputStAX.java Sun Mar 17 17:48:00 2013
@@ -37,6 +37,7 @@ import org.apache.jena.atlas.logging.Log
import com.hp.hpl.jena.datatypes.RDFDatatype ;
import com.hp.hpl.jena.datatypes.TypeMapper ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.query.QuerySolution ;
import com.hp.hpl.jena.query.ResultSet ;
@@ -467,7 +468,7 @@ class XMLInputStAX extends SPARQLResult
Node node = null ;
//if ( inputGraphLabels.getValue() )
if ( inputGraphLabels )
- node = Node.createAnon(new AnonId(label)) ;
+ node = NodeFactory.createAnon(new AnonId(label)) ;
else
node = bNodes.asNode(label) ;
addBinding(binding, Var.alloc(varName), node) ;
@@ -492,7 +493,7 @@ class XMLInputStAX extends SPARQLResult
if ( datatype != null )
dType = TypeMapper.getInstance().getSafeTypeByName(datatype);
- Node n = Node.createLiteral(text, langTag, dType) ;
+ Node n = NodeFactory.createLiteral(text, langTag, dType) ;
if ( varName == null )
throw new ResultSetException("No name for variable") ;
addBinding(binding, Var.alloc(varName), n) ;
@@ -507,7 +508,7 @@ class XMLInputStAX extends SPARQLResult
if ( isTag(tag, XMLResults.dfURI) )
{
String uri = parser.getElementText() ;
- Node node = Node.createURI(uri) ;
+ Node node = NodeFactory.createURI(uri) ;
addBinding(binding, Var.alloc(varName), node) ;
break ;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/Item.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/Item.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/Item.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/Item.java Sun Mar 17 17:48:00 2013
@@ -24,6 +24,7 @@ import java.util.Iterator ;
import org.apache.jena.atlas.io.IndentedLineBuffer ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.util.FmtUtils ;
@@ -93,7 +94,7 @@ public class Item extends ItemLocation
public static void addPair(ItemList list, String key, String value)
{
- addPair(list, Item.createSymbol(key), Item.createNode(Node.createLiteral(value))) ;
+ addPair(list, Item.createSymbol(key), Item.createNode(NodeFactory.createLiteral(value))) ;
}
public static void addPair(ItemList list, String key, Node node)
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerPlain.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerPlain.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerPlain.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/sse/lang/ParseHandlerPlain.java Sun Mar 17 17:48:00 2013
@@ -26,6 +26,7 @@ import org.apache.jena.atlas.logging.Log
import com.hp.hpl.jena.datatypes.RDFDatatype ;
import com.hp.hpl.jena.datatypes.TypeMapper ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.sparql.ARQConstants ;
import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.core.VarAlloc ;
@@ -136,10 +137,10 @@ public class ParseHandlerPlain implement
datatypeIRI = resolvePrefixedName(datatypePN, line, column) ;
RDFDatatype dType = TypeMapper.getInstance().getSafeTypeByName(datatypeIRI) ;
- n = Node.createLiteral(lexicalForm, null, dType) ;
+ n = NodeFactory.createLiteral(lexicalForm, null, dType) ;
}
else
- n = Node.createLiteral(lexicalForm, langTag, null) ;
+ n = NodeFactory.createLiteral(lexicalForm, langTag, null) ;
Item item = Item.createNode(n, line, column) ;
listAdd(item) ;
}
@@ -151,7 +152,7 @@ public class ParseHandlerPlain implement
Node n = null ;
if ( label.equals("") )
// Fresh anonymous bNode
- n = Node.createAnon() ;
+ n = NodeFactory.createAnon() ;
else
n = bNodeLabels.asNode(label) ;
Item item = Item.createNode(n, line, column) ;
@@ -161,7 +162,7 @@ public class ParseHandlerPlain implement
@Override
public void emitIRI(int line, int column, String iriStr)
{
- Node n = Node.createURI(iriStr) ;
+ Node n = NodeFactory.createURI(iriStr) ;
Item item = Item.createNode(n, line, column) ;
listAdd(item) ;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementService.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementService.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementService.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/syntax/ElementService.java Sun Mar 17 17:48:00 2013
@@ -19,6 +19,7 @@
package com.hp.hpl.jena.sparql.syntax;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import org.apache.jena.atlas.logging.Log ;
@@ -34,12 +35,12 @@ public class ElementService extends Elem
public ElementService(String serviceURI, Element el)
{
- this(Node.createURI(serviceURI), el, false) ;
+ this(NodeFactory.createURI(serviceURI), el, false) ;
}
public ElementService(String serviceURI, Element el, boolean silent)
{
- this(Node.createURI(serviceURI), el, silent) ;
+ this(NodeFactory.createURI(serviceURI), el, silent) ;
}
// Variable?
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Context.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Context.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Context.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Context.java Sun Mar 17 17:48:00 2013
@@ -307,7 +307,7 @@ public class Context
// Copy per-dataset settings.
context.putAll(dataset.getContext()) ;
- context.set(ARQConstants.sysCurrentTime, NodeFactory.nowAsDateTime()) ;
+ context.set(ARQConstants.sysCurrentTime, NodeFactoryExtra.nowAsDateTime()) ;
// Allocators.
// context.set(ARQConstants.sysVarAllocNamed, new VarAlloc(ARQConstants.allocVarMarkerExec)) ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/DatasetUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/DatasetUtils.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/DatasetUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/DatasetUtils.java Sun Mar 17 17:48:00 2013
@@ -23,6 +23,7 @@ import java.util.Iterator ;
import java.util.List ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.n3.IRIResolver ;
import com.hp.hpl.jena.query.Dataset ;
import com.hp.hpl.jena.query.DatasetFactory ;
@@ -190,7 +191,7 @@ public class DatasetUtils
else
absURI = IRIResolver.resolveGlobal(sourceURI) ;
Model m = fileManager.loadModel(sourceURI, absURI, null) ;
- Node gn = Node.createURI(sourceURI) ;
+ Node gn = NodeFactory.createURI(sourceURI) ;
ds.addGraph(gn, m.getGraph()) ;
}
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/ExprUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/ExprUtils.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/ExprUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/ExprUtils.java Sun Mar 17 17:48:00 2013
@@ -143,7 +143,7 @@ public class ExprUtils
public static NodeValue parseNodeValue(String s)
{
- Node n = NodeFactory.parseNode(s) ;
+ Node n = NodeFactoryExtra.parseNode(s) ;
NodeValue nv = NodeValue.makeNode(n) ;
return nv ;
}
@@ -253,7 +253,7 @@ public class ExprUtils
public static NodeValue eval(Expr expr, Binding binding)
{
Context context = ARQ.getContext().copy() ;
- context.set(ARQConstants.sysCurrentTime, NodeFactory.nowAsDateTime()) ;
+ context.set(ARQConstants.sysCurrentTime, NodeFactoryExtra.nowAsDateTime()) ;
FunctionEnv env = new ExecutionContext(context, null, null, null) ;
NodeValue r = expr.eval(binding, env) ;
return r ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/LabelToNodeMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/LabelToNodeMap.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/LabelToNodeMap.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/LabelToNodeMap.java Sun Mar 17 17:48:00 2013
@@ -23,6 +23,7 @@ import java.util.Map ;
import java.util.Set ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.sparql.ARQConstants ;
import com.hp.hpl.jena.sparql.core.VarAlloc ;
@@ -81,7 +82,7 @@ public class LabelToNodeMap
{
if ( generateVars )
return allocAnonVariable() ;
- return Node.createAnon() ;
+ return NodeFactory.createAnon() ;
}
private Node allocAnonVariable()
Copied: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactoryExtra.java (from r1454694, jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactory.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactoryExtra.java?p2=jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactoryExtra.java&p1=jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactory.java&r1=1454694&r2=1457500&rev=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactoryExtra.java Sun Mar 17 17:48:00 2013
@@ -33,7 +33,7 @@ import com.hp.hpl.jena.graph.impl.Litera
import com.hp.hpl.jena.query.QueryParseException ;
import com.hp.hpl.jena.sparql.sse.SSE ;
-public class NodeFactory
+public class NodeFactoryExtra
{
private static final PrefixMap prefixMappingDefault = PrefixMapFactory.createForInput(SSE.getDefaultPrefixMapRead()) ;
@@ -88,7 +88,7 @@ public class NodeFactory
if ( datatypeURI != null )
dType = TypeMapper.getInstance().getSafeTypeByName(datatypeURI);
- Node n = Node.createLiteral(lex, lang, dType) ;
+ Node n = com.hp.hpl.jena.graph.NodeFactory.createLiteral(lex, lang, dType) ;
return n ;
}
@@ -134,34 +134,34 @@ public class NodeFactory
public static Node intToNode(int integer)
{
- return Node.createLiteral(Integer.toString(integer), "", XSDDatatype.XSDinteger) ;
+ return com.hp.hpl.jena.graph.NodeFactory.createLiteral(Integer.toString(integer), "", XSDDatatype.XSDinteger) ;
}
public static Node intToNode(long integer)
{
- return Node.createLiteral(Long.toString(integer), "", XSDDatatype.XSDinteger) ;
+ return com.hp.hpl.jena.graph.NodeFactory.createLiteral(Long.toString(integer), "", XSDDatatype.XSDinteger) ;
}
public static Node floatToNode(float value)
{
- return Node.createLiteral(Float.toString(value), "", XSDDatatype.XSDfloat) ;
+ return com.hp.hpl.jena.graph.NodeFactory.createLiteral(Float.toString(value), "", XSDDatatype.XSDfloat) ;
}
public static Node doubleToNode(double value)
{
- return Node.createLiteral(Double.toString(value), "", XSDDatatype.XSDdouble) ;
+ return com.hp.hpl.jena.graph.NodeFactory.createLiteral(Double.toString(value), "", XSDDatatype.XSDdouble) ;
}
public static Node nowAsDateTime()
{
String lex = Utils.nowAsXSDDateTimeString() ;
- return Node.createLiteral(lex, null, XSDDatatype.XSDdateTime) ;
+ return com.hp.hpl.jena.graph.NodeFactory.createLiteral(lex, null, XSDDatatype.XSDdateTime) ;
}
public static Node todayAsDate()
{
String lex = Utils.todayAsXSDDateString() ;
- return Node.createLiteral(lex, null, XSDDatatype.XSDdate) ;
+ return com.hp.hpl.jena.graph.NodeFactory.createLiteral(lex, null, XSDDatatype.XSDdate) ;
}
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java Sun Mar 17 17:48:00 2013
@@ -27,6 +27,7 @@ import java.util.Set ;
import com.hp.hpl.jena.datatypes.RDFDatatype ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.iri.IRI ;
@@ -48,8 +49,8 @@ public class NodeUtils
{
public interface EqualityTest { boolean equal(Node n1, Node n2) ; }
- public static Node asNode(IRI iri) { return Node.createURI(iri.toString()) ; }
- public static Node asNode(String iri) { return Node.createURI(iri) ; }
+ public static Node asNode(IRI iri) { return NodeFactory.createURI(iri.toString()) ; }
+ public static Node asNode(String iri) { return NodeFactory.createURI(iri) ; }
public static boolean isStringLiteral(Node literal)
{
@@ -103,7 +104,7 @@ public class NodeUtils
{
Set<Node> nodes = new HashSet<Node>() ;
for ( String x : uris )
- nodes.add(Node.createURI(x)) ;
+ nodes.add(NodeFactory.createURI(x)) ;
return nodes ;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphList.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphList.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphList.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphList.java Sun Mar 17 17:48:00 2013
@@ -27,6 +27,7 @@ import java.util.Set ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.BasicPattern ;
@@ -293,12 +294,12 @@ public class GraphList
if ( list.size() == 0 )
return RDF.Nodes.nil ;
- Node head = Node.createAnon() ;
+ Node head = NodeFactory.createAnon() ;
Node n = head ;
for ( Node elt : list )
{
// Cell:
- Node consCell = Node.createAnon() ;
+ Node consCell = NodeFactory.createAnon() ;
// Last cell to this one.
Triple t = new Triple(n, RDF.Nodes.rest, consCell) ;
Triple t1 = new Triple(consCell, RDF.Nodes.first, elt) ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LabelToNode.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LabelToNode.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LabelToNode.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LabelToNode.java Sun Mar 17 17:48:00 2013
@@ -29,6 +29,7 @@ import org.apache.jena.riot.system.MapWi
import org.apache.jena.riot.system.SyntaxLabels ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.rdf.model.AnonId ;
/** Allocation Nodes (Bnodes usually) based on the graph and label
@@ -109,7 +110,7 @@ public class LabelToNode extends MapWith
{
@Override
public Node create(String label)
- { return Node.createAnon() ; }
+ { return NodeFactory.createAnon() ; }
@Override
public void reset() {}
@@ -123,7 +124,7 @@ public class LabelToNode extends MapWith
public Node create(String label)
{
String $ = format("B0x%04X", ++counter) ;
- return Node.createAnon(new AnonId($)) ;
+ return NodeFactory.createAnon(new AnonId($)) ;
}
@Override
@@ -139,7 +140,7 @@ public class LabelToNode extends MapWith
{
if ( label == null )
label = SysRIOT.BNodeGenIdPrefix+counter++ ;
- return Node.createAnon(new AnonId(label)) ;
+ return NodeFactory.createAnon(new AnonId(label)) ;
}
@Override
@@ -155,7 +156,7 @@ public class LabelToNode extends MapWith
{
if ( label == null )
label = SysRIOT.BNodeGenIdPrefix+counter++ ;
- return Node.createAnon(new AnonId(NodeFmtLib.decodeBNodeLabel(label))) ;
+ return NodeFactory.createAnon(new AnonId(NodeFmtLib.decodeBNodeLabel(label))) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangRDFXML.java Sun Mar 17 17:48:00 2013
@@ -39,6 +39,7 @@ import org.xml.sax.SAXParseException ;
import com.hp.hpl.jena.datatypes.RDFDatatype ;
import com.hp.hpl.jena.datatypes.TypeMapper ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.rdf.arp.* ;
import com.hp.hpl.jena.rdf.arp.impl.ARPSaxErrorHandler ;
@@ -176,25 +177,25 @@ public class LangRDFXML implements LangR
private static Node convert(ALiteral lit) {
String dtURI = lit.getDatatypeURI();
if (dtURI == null)
- return Node.createLiteral(lit.toString(), lit.getLang(), false);
+ return NodeFactory.createLiteral(lit.toString(), lit.getLang(), false);
if (lit.isWellFormedXML()) {
- return Node.createLiteral(lit.toString(), null, true);
+ return NodeFactory.createLiteral(lit.toString(), null, true);
}
RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(dtURI);
- return Node.createLiteral(lit.toString(), null, dt);
+ return NodeFactory.createLiteral(lit.toString(), null, dt);
}
private static Node convert(AResource r) {
if (!r.isAnonymous())
- return Node.createURI(r.getURI());
+ return NodeFactory.createURI(r.getURI());
// String id = r.getAnonymousID();
Node rr = (Node) r.getUserData();
if (rr == null) {
- rr = Node.createAnon();
+ rr = NodeFactory.createAnon();
r.setUserData(rr);
}
return rr;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangTurtleBase.java Sun Mar 17 17:48:00 2013
@@ -40,6 +40,7 @@ import org.apache.jena.riot.tokens.Token
import org.apache.jena.riot.tokens.Tokenizer ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.sparql.graph.NodeConst ;
import com.hp.hpl.jena.vocabulary.OWL ;
@@ -300,7 +301,7 @@ public abstract class LangTurtleBase<X>
}
static protected final Node nodeSameAs = OWL.sameAs.asNode() ;
- static protected final Node nodeLogImplies = Node.createURI("http://www.w3.org/2000/10/swap/log#implies") ;
+ static protected final Node nodeLogImplies = NodeFactory.createURI("http://www.w3.org/2000/10/swap/log#implies") ;
/** Get predicate - maybe null for "illegal" */
protected final Node predicate()
@@ -435,7 +436,7 @@ public abstract class LangTurtleBase<X>
protected final Node triplesBlankNode()
{
nextToken() ; // Skip [
- Node subject = Node.createAnon() ;
+ Node subject = NodeFactory.createAnon() ;
if ( peekPredicate() )
predicateObjectList(subject) ;
@@ -478,7 +479,7 @@ public abstract class LangTurtleBase<X>
exception(errorToken, "Malformed list") ;
// Node for the list structre.
- Node nextCell = Node.createAnon() ;
+ Node nextCell = NodeFactory.createAnon() ;
if ( listHead == null )
listHead = nextCell ;
if ( lastCell != null )
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/CanonicalizeLiteral.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/CanonicalizeLiteral.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/CanonicalizeLiteral.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/CanonicalizeLiteral.java Sun Mar 17 17:48:00 2013
@@ -27,6 +27,7 @@ import org.apache.jena.riot.web.LangTag
import com.hp.hpl.jena.datatypes.RDFDatatype ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.sparql.graph.NodeTransform ;
import com.hp.hpl.jena.vocabulary.RDF ;
@@ -74,10 +75,10 @@ public class CanonicalizeLiteral impleme
String langTag2 = LangTag.canonical(langTag) ;
if ( langTag2.equals(langTag) )
return null ;
- return Node.createLiteral(lexicalForm, langTag2, null) ;
+ return NodeFactory.createLiteral(lexicalForm, langTag2, null) ;
}
- private static final RDFDatatype dtPlainLiteral = Node.getType(RDF.getURI()+"PlainLiteral") ;
+ private static final RDFDatatype dtPlainLiteral = NodeFactory.getType(RDF.getURI()+"PlainLiteral") ;
private final static Map<RDFDatatype, DatatypeHandler> dispatch = new HashMap<RDFDatatype, DatatypeHandler>() ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue.java Sun Mar 17 17:48:00 2013
@@ -30,6 +30,7 @@ import javax.xml.datatype.XMLGregorianCa
import com.hp.hpl.jena.datatypes.RDFDatatype ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.sparql.expr.NodeValue ;
import com.hp.hpl.jena.sparql.graph.NodeConst ;
import com.hp.hpl.jena.sparql.util.DateTimeStruct ;
@@ -81,7 +82,7 @@ class NormalizeValue
String lex2 = xcal.toXMLFormat() ;
if ( lex2.equals(lexicalForm) )
return node ;
- return Node.createLiteral(lex2, null, datatype) ;
+ return NodeFactory.createLiteral(lex2, null, datatype) ;
}
// The only variablity for a valid date/dateTime/g* type is:
// Second part can have fractional seconds '.' s+ (if present) represents the fractional seconds;
@@ -106,7 +107,7 @@ class NormalizeValue
// Can't happen. We munged dts.second.
// if ( lex2.equals(lexicalForm) )
// return node ;
- return Node.createLiteral(lex2, null, datatype) ;
+ return NodeFactory.createLiteral(lex2, null, datatype) ;
}
} ;
@@ -141,7 +142,7 @@ class NormalizeValue
// If it's a subtype of integer, then output a new node of datatype integer.
if ( datatype.equals(XSDDatatype.XSDinteger) && lex2.equals(lexicalForm) )
return node ;
- return Node.createLiteral(lex2, null, XSDDatatype.XSDinteger) ;
+ return NodeFactory.createLiteral(lex2, null, XSDDatatype.XSDinteger) ;
}
} ;
@@ -159,7 +160,7 @@ class NormalizeValue
lex2 = lex2+".0" ;
if ( lex2.equals(lexicalForm) )
return node ;
- return Node.createLiteral(lex2, null, datatype) ;
+ return NodeFactory.createLiteral(lex2, null, datatype) ;
}
} ;
@@ -189,7 +190,7 @@ class NormalizeValue
String lex2 = fmtFloatingPoint.format(d) ;
if ( lex2.equals(lexicalForm) )
return node ;
- return Node.createLiteral(lex2, null, datatype) ;
+ return NodeFactory.createLiteral(lex2, null, datatype) ;
}
} ;
@@ -201,7 +202,7 @@ class NormalizeValue
String lex2 = fmtFloatingPoint.format(f) ;
if ( lex2.equals(lexicalForm) )
return node ;
- return Node.createLiteral(lex2, null, datatype) ;
+ return NodeFactory.createLiteral(lex2, null, datatype) ;
}
} ;
@@ -210,7 +211,7 @@ class NormalizeValue
@Override
public Node handle(Node node, String lexicalForm, RDFDatatype datatype)
{
- return Node.createLiteral(lexicalForm) ;
+ return NodeFactory.createLiteral(lexicalForm) ;
}
} ;
@@ -219,7 +220,7 @@ class NormalizeValue
@Override
public Node handle(Node node, String lexicalForm, RDFDatatype datatype)
{
- return Node.createLiteral(lexicalForm, "", datatype) ;
+ return NodeFactory.createLiteral(lexicalForm, "", datatype) ;
}
} ;
@@ -237,9 +238,9 @@ class NormalizeValue
String lex = lexicalForm.substring(0, idx) ;
if ( idx == lexicalForm.length()-1 )
- return Node.createLiteral(lex) ;
+ return NodeFactory.createLiteral(lex) ;
String lang = lexicalForm.substring(idx+1) ;
- return Node.createLiteral(lex,lang, null) ;
+ return NodeFactory.createLiteral(lex,lang, null) ;
}
} ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue2.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue2.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/process/normalize/NormalizeValue2.java Sun Mar 17 17:48:00 2013
@@ -24,6 +24,7 @@ import static org.apache.jena.atlas.lib.
import com.hp.hpl.jena.datatypes.RDFDatatype ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
class NormalizeValue2
{
@@ -132,7 +133,7 @@ class NormalizeValue2
String lex2 = rebuild(chars) ;
if ( lex2 == null )
return node ;
- return Node.createLiteral(lex2, null, datatype) ;
+ return NodeFactory.createLiteral(lex2, null, datatype) ;
}
} ;
@@ -151,7 +152,7 @@ class NormalizeValue2
String lex2 = rebuild(chars) ;
if ( lex2 == null )
return node ;
- return Node.createLiteral(lex2, null, datatype) ;
+ return NodeFactory.createLiteral(lex2, null, datatype) ;
}
} ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java Sun Mar 17 17:48:00 2013
@@ -28,6 +28,7 @@ import org.apache.jena.riot.tokens.Token
import com.hp.hpl.jena.datatypes.RDFDatatype ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.core.Quad ;
@@ -118,19 +119,19 @@ public class ParserProfileBase implement
@Override
public Node createTypedLiteral(String lexical, RDFDatatype dt, long line, long col)
{
- return Node.createLiteral(lexical, null, dt) ;
+ return NodeFactory.createLiteral(lexical, null, dt) ;
}
@Override
public Node createLangLiteral(String lexical, String langTag, long line, long col)
{
- return Node.createLiteral(lexical, langTag, null) ;
+ return NodeFactory.createLiteral(lexical, langTag, null) ;
}
@Override
public Node createPlainLiteral(String lexical, long line, long col)
{
- return Node.createLiteral(lexical) ;
+ return NodeFactory.createLiteral(lexical) ;
}
/** Special token forms*/
@@ -190,7 +191,7 @@ public class ParserProfileBase implement
}
uriStr = resolveIRI(uriStr, tokenDT.getLine(), tokenDT.getColumn()) ;
- RDFDatatype dt = Node.getType(uriStr) ;
+ RDFDatatype dt = NodeFactory.getType(uriStr) ;
return createTypedLiteral(str, dt, line, col) ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileChecker.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileChecker.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileChecker.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileChecker.java Sun Mar 17 17:48:00 2013
@@ -21,6 +21,7 @@ package org.apache.jena.riot.system;
import com.hp.hpl.jena.datatypes.RDFDatatype ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.graph.Triple ;
import org.apache.jena.iri.IRI ;
import org.apache.jena.riot.RiotException ;
@@ -107,7 +108,7 @@ public class ParserProfileChecker extend
else
{
String resolvedIRI = resolveIRI(x, line, col) ;
- return Node.createURI(resolvedIRI) ;
+ return NodeFactory.createURI(resolvedIRI) ;
}
} catch (RiotException ex)
{
@@ -129,7 +130,7 @@ public class ParserProfileChecker extend
@Override
public Node createTypedLiteral(String lexical, RDFDatatype datatype, long line, long col)
{
- Node n = Node.createLiteral(lexical, null, datatype) ;
+ Node n = NodeFactory.createLiteral(lexical, null, datatype) ;
CheckerLiterals.checkLiteral(lexical, datatype, errorHandler, line, col) ;
return n ;
}
@@ -137,7 +138,7 @@ public class ParserProfileChecker extend
@Override
public Node createLangLiteral(String lexical, String langTag, long line, long col)
{
- Node n = Node.createLiteral(lexical, langTag, null) ;
+ Node n = NodeFactory.createLiteral(lexical, langTag, null) ;
CheckerLiterals.checkLiteral(lexical, langTag, errorHandler, line, col) ;
return n ;
}
@@ -145,7 +146,7 @@ public class ParserProfileChecker extend
@Override
public Node createPlainLiteral(String lexical, long line, long col)
{
- return Node.createLiteral(lexical) ;
+ return NodeFactory.createLiteral(lexical) ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java Sun Mar 17 17:48:00 2013
@@ -47,6 +47,7 @@ import org.apache.jena.riot.writer.Write
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.rdf.model.AnonId ;
@@ -72,10 +73,10 @@ public class RiotLib
if ( isBNodeIRI(iri) )
{
String s = iri.substring(bNodeLabelStart.length()) ;
- Node n = Node.createAnon(new AnonId(s)) ;
+ Node n = NodeFactory.createAnon(new AnonId(s)) ;
return n ;
}
- return Node.createURI(iri) ;
+ return NodeFactory.createURI(iri) ;
}
/** Test whether */
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/tokens/Token.java Sun Mar 17 17:48:00 2013
@@ -53,6 +53,7 @@ import com.hp.hpl.jena.datatypes.RDFData
import com.hp.hpl.jena.datatypes.TypeMapper ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.rdf.model.AnonId ;
import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.graph.NodeConst ;
@@ -415,18 +416,18 @@ public final class Token
switch(tokenType)
{
// Assumes that bnode labels have been sorted out already.
- case BNODE : return Node.createAnon(new AnonId(tokenImage)) ;
- case IRI : return Node.createURI(tokenImage) ;
+ case BNODE : return NodeFactory.createAnon(new AnonId(tokenImage)) ;
+ case IRI : return NodeFactory.createURI(tokenImage) ;
case PREFIXED_NAME :
if ( pmap == null )
- return Node.createURI("urn:prefixed-name:"+tokenImage+":"+tokenImage2) ;
+ return NodeFactory.createURI("urn:prefixed-name:"+tokenImage+":"+tokenImage2) ;
String x = pmap.expand(tokenImage, tokenImage2) ;
if ( x == null )
throw new RiotException("Can't expand prefixed name: "+this) ;
- return Node.createURI(x) ;
- case DECIMAL : return Node.createLiteral(tokenImage, null, XSDDatatype.XSDdecimal) ;
- case DOUBLE : return Node.createLiteral(tokenImage, null, XSDDatatype.XSDdouble) ;
- case INTEGER: return Node.createLiteral(tokenImage, null, XSDDatatype.XSDinteger) ;
+ return NodeFactory.createURI(x) ;
+ case DECIMAL : return NodeFactory.createLiteral(tokenImage, null, XSDDatatype.XSDdecimal) ;
+ case DOUBLE : return NodeFactory.createLiteral(tokenImage, null, XSDDatatype.XSDdouble) ;
+ case INTEGER: return NodeFactory.createLiteral(tokenImage, null, XSDDatatype.XSDinteger) ;
case LITERAL_DT :
{
Token lexToken = getSubToken1() ;
@@ -439,15 +440,15 @@ public final class Token
if ( ! n.isURI() )
throw new RiotException("Invalid token: "+this) ;
RDFDatatype dt = TypeMapper.getInstance().getSafeTypeByName(n.getURI()) ;
- return Node.createLiteral(lexToken.getImage(), null, dt) ;
+ return NodeFactory.createLiteral(lexToken.getImage(), null, dt) ;
}
- case LITERAL_LANG : return Node.createLiteral(tokenImage, tokenImage2, null) ;
+ case LITERAL_LANG : return NodeFactory.createLiteral(tokenImage, tokenImage2, null) ;
case STRING:
case STRING1:
case STRING2:
case LONG_STRING1:
case LONG_STRING2:
- return Node.createLiteral(tokenImage) ;
+ return NodeFactory.createLiteral(tokenImage) ;
case VAR:
return Var.alloc(tokenImage) ;
case KEYWORD:
@@ -612,7 +613,7 @@ public final class Token
// Not a recognized form.
// Has datatype.
- Node dt = Node.createURI(datatype) ;
+ Node dt = NodeFactory.createURI(datatype) ;
Token subToken1 = new Token(STRING, s) ;
Token subToken2 = tokenForNode(dt) ;
Token t = new Token(LITERAL_DT, s) ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/web/DatasetAdapter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/web/DatasetAdapter.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/web/DatasetAdapter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/web/DatasetAdapter.java Sun Mar 17 17:48:00 2013
@@ -20,7 +20,7 @@ package org.apache.jena.web;
import com.hp.hpl.jena.graph.Graph ;
-import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.query.DatasetAccessor ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
@@ -44,7 +44,7 @@ public class DatasetAdapter implements D
@Override
public Model getModel(String graphUri)
{
- Graph g = updater.httpGet(Node.createURI(graphUri)) ;
+ Graph g = updater.httpGet(NodeFactory.createURI(graphUri)) ;
if ( g == null )
return null ;
return ModelFactory.createModelForGraph(g) ;
@@ -53,7 +53,7 @@ public class DatasetAdapter implements D
@Override
public boolean containsModel(String graphUri)
{
- return updater.httpHead(Node.createURI(graphUri)) ;
+ return updater.httpHead(NodeFactory.createURI(graphUri)) ;
}
/** Put (replace) the default model of a Dataset */
@@ -67,7 +67,7 @@ public class DatasetAdapter implements D
@Override
public void putModel(String graphUri, Model data)
{
- updater.httpPut(Node.createURI(graphUri), data.getGraph()) ;
+ updater.httpPut(NodeFactory.createURI(graphUri), data.getGraph()) ;
}
/** Delete (which means clear) the default model of a Dataset */
@@ -81,7 +81,7 @@ public class DatasetAdapter implements D
@Override
public void deleteModel(String graphUri)
{
- updater.httpDelete(Node.createURI(graphUri)) ;
+ updater.httpDelete(NodeFactory.createURI(graphUri)) ;
}
/** Add statements to the default model of a Dataset */
@@ -95,6 +95,6 @@ public class DatasetAdapter implements D
@Override
public void add(String graphUri, Model data)
{
- updater.httpPost(Node.createURI(graphUri), data.getGraph()) ;
+ updater.httpPost(NodeFactory.createURI(graphUri), data.getGraph()) ;
}
}
Modified: jena/trunk/jena-arq/src/test/java/arq/qtest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/arq/qtest.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/arq/qtest.java (original)
+++ jena/trunk/jena-arq/src/test/java/arq/qtest.java Sun Mar 17 17:48:00 2013
@@ -39,7 +39,7 @@ import com.hp.hpl.jena.sparql.expr.NodeV
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.NodeFactoryExtra ;
import com.hp.hpl.jena.sparql.util.Utils ;
import com.hp.hpl.jena.sparql.vocabulary.DOAP ;
import com.hp.hpl.jena.sparql.vocabulary.FOAF ;
@@ -236,7 +236,7 @@ public class qtest extends CmdARQ
Resource release = model.createResource(DOAP.Version) ;
system.addProperty(DOAP.release, release) ;
- Node today_node = NodeFactory.todayAsDate() ;
+ Node today_node = NodeFactoryExtra.todayAsDate() ;
Literal today = model.createTypedLiteral(today_node.getLiteralLexicalForm(), today_node.getLiteralDatatype()) ;
release.addProperty(DOAP.created, today) ;
release.addProperty(DOAP.name, releaseName) ; // Again
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/query/TestParameterizedSparqlString.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/query/TestParameterizedSparqlString.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/query/TestParameterizedSparqlString.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/query/TestParameterizedSparqlString.java Sun Mar 17 17:48:00 2013
@@ -26,6 +26,7 @@ import org.junit.Test;
import com.hp.hpl.jena.datatypes.TypeMapper;
import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.Resource;
@@ -1185,7 +1186,7 @@ public class TestParameterizedSparqlStri
// Test positional parameters
ParameterizedSparqlString query = new ParameterizedSparqlString();
query.append("SELECT * WHERE { ? ?p ?o }");
- query.setParam(0, Node.createURI("http://example.org"));
+ query.setParam(0, NodeFactory.createURI("http://example.org"));
test(query, new String[] { "<http://example.org>" }, new String[] { "? " });
}
@@ -1195,9 +1196,9 @@ public class TestParameterizedSparqlStri
// Test regular string injection
String cmdText = "SELECT * WHERE { ? ? ? . }";
ParameterizedSparqlString query = new ParameterizedSparqlString(cmdText);
- query.setParam(0, Node.createURI("http://example.org"));
- query.setParam(1, Node.createURI("http://predicate"));
- query.setParam(2, Node.createLiteral("test"));
+ query.setParam(0, NodeFactory.createURI("http://example.org"));
+ query.setParam(1, NodeFactory.createURI("http://predicate"));
+ query.setParam(2, NodeFactory.createLiteral("test"));
Assert.assertEquals("SELECT * WHERE { <http://example.org> <http://predicate> \"test\" . }", query.toString());
}
@@ -1207,9 +1208,9 @@ public class TestParameterizedSparqlStri
// Test regular string injection
String cmdText = "SELECT * WHERE { ? ? ? . }";
ParameterizedSparqlString query = new ParameterizedSparqlString(cmdText);
- query.setParam(0, Node.createLiteral("with ? mark"));
- query.setParam(1, Node.createURI("http://predicate"));
- query.setParam(2, Node.createLiteral("test"));
+ query.setParam(0, NodeFactory.createLiteral("with ? mark"));
+ query.setParam(1, NodeFactory.createURI("http://predicate"));
+ query.setParam(2, NodeFactory.createLiteral("test"));
Assert.assertEquals("SELECT * WHERE { \"with ? mark\" <http://predicate> \"test\" . }", query.toString());
}
@@ -1219,9 +1220,9 @@ public class TestParameterizedSparqlStri
// Test regular string injection
String cmdText = "SELECT * WHERE { ? ? ? . }";
ParameterizedSparqlString query = new ParameterizedSparqlString(cmdText);
- query.setParam(0, Node.createLiteral("with ? mark"));
- query.setParam(1, Node.createLiteral("with ? mark"));
- query.setParam(2, Node.createLiteral("test"));
+ query.setParam(0, NodeFactory.createLiteral("with ? mark"));
+ query.setParam(1, NodeFactory.createLiteral("with ? mark"));
+ query.setParam(2, NodeFactory.createLiteral("test"));
Assert.assertEquals("SELECT * WHERE { \"with ? mark\" \"with ? mark\" \"test\" . }", query.toString());
}
@@ -1231,9 +1232,9 @@ public class TestParameterizedSparqlStri
// Test regular string injection
String cmdText = "SELECT * WHERE { ? ? ?. }";
ParameterizedSparqlString query = new ParameterizedSparqlString(cmdText);
- query.setParam(0, Node.createURI("http://example.org"));
- query.setParam(1, Node.createURI("http://predicate"));
- query.setParam(2, Node.createLiteral("test"));
+ query.setParam(0, NodeFactory.createURI("http://example.org"));
+ query.setParam(1, NodeFactory.createURI("http://predicate"));
+ query.setParam(2, NodeFactory.createLiteral("test"));
Assert.assertEquals("SELECT * WHERE { <http://example.org> <http://predicate> \"test\". }", query.toString());
}
@@ -1243,9 +1244,9 @@ public class TestParameterizedSparqlStri
// Test regular string injection
String cmdText = "SELECT * WHERE { ? ? ?; ?p ?o . }";
ParameterizedSparqlString query = new ParameterizedSparqlString(cmdText);
- query.setParam(0, Node.createURI("http://example.org"));
- query.setParam(1, Node.createURI("http://predicate"));
- query.setParam(2, Node.createLiteral("test"));
+ query.setParam(0, NodeFactory.createURI("http://example.org"));
+ query.setParam(1, NodeFactory.createURI("http://predicate"));
+ query.setParam(2, NodeFactory.createLiteral("test"));
Assert.assertEquals("SELECT * WHERE { <http://example.org> <http://predicate> \"test\"; ?p ?o . }", query.toString());
}
@@ -1255,9 +1256,9 @@ public class TestParameterizedSparqlStri
// Test regular string injection
String cmdText = "SELECT * WHERE { ? ? ?, ?o . }";
ParameterizedSparqlString query = new ParameterizedSparqlString(cmdText);
- query.setParam(0, Node.createURI("http://example.org"));
- query.setParam(1, Node.createURI("http://predicate"));
- query.setParam(2, Node.createLiteral("test"));
+ query.setParam(0, NodeFactory.createURI("http://example.org"));
+ query.setParam(1, NodeFactory.createURI("http://predicate"));
+ query.setParam(2, NodeFactory.createLiteral("test"));
Assert.assertEquals("SELECT * WHERE { <http://example.org> <http://predicate> \"test\", ?o . }", query.toString());
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractDatasetGraphTests.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractDatasetGraphTests.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractDatasetGraphTests.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/core/AbstractDatasetGraphTests.java Sun Mar 17 17:48:00 2013
@@ -31,6 +31,7 @@ import org.junit.Test ;
import com.hp.hpl.jena.graph.Graph ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.graph.Triple ;
import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.sse.SSE ;
@@ -73,7 +74,7 @@ public abstract class AbstractDatasetGra
// and the graph view.
assertTrue(dsg.getDefaultGraph().isEmpty()) ;
- assertFalse(dsg.getGraph(Node.createURI("g")).isEmpty()) ;
+ assertFalse(dsg.getGraph(NodeFactory.createURI("g")).isEmpty()) ;
}
@Test public void quad_02()
@@ -82,12 +83,12 @@ public abstract class AbstractDatasetGra
assertNotNull(dsg) ;
Quad quad = SSE.parseQuad("(quad <g> <s> <p> <o>)") ;
dsg.add(quad) ;
- dsg.containsGraph(Node.createURI("g")) ;
+ dsg.containsGraph(NodeFactory.createURI("g")) ;
dsg.delete(quad) ;
assertTrue(dsg.isEmpty()) ;
assertTrue(dsg.getDefaultGraph().isEmpty()) ;
- assertTrue(dsg.getGraph(Node.createURI("g")).isEmpty()) ;
+ assertTrue(dsg.getGraph(NodeFactory.createURI("g")).isEmpty()) ;
}
@Test public void quad_03()
@@ -99,7 +100,7 @@ public abstract class AbstractDatasetGra
dsg.add(quad1) ;
dsg.add(quad2) ;
- dsg.deleteAny(Node.createURI("g"), Node.createURI("s"), null, null) ;
+ dsg.deleteAny(NodeFactory.createURI("g"), NodeFactory.createURI("s"), null, null) ;
assertFalse(dsg.contains(quad1)) ;
assertFalse(dsg.contains(quad2)) ;
}
@@ -112,7 +113,7 @@ public abstract class AbstractDatasetGra
Quad quad2 = SSE.parseQuad("(quad <g> <s> <p> <o2>)") ;
dsg.add(quad1) ;
dsg.add(quad2) ;
- Iterator<Quad> iter = dsg.find(Node.createURI("g"), Node.createURI("s"), null, null) ;
+ Iterator<Quad> iter = dsg.find(NodeFactory.createURI("g"), NodeFactory.createURI("s"), null, null) ;
assertTrue(iter.hasNext()) ;
Set<Quad> x = Iter.iter(iter).toSet() ;
@@ -155,7 +156,7 @@ public abstract class AbstractDatasetGra
{
DatasetGraph dsg = emptyDataset() ;
assertNotNull(dsg) ;
- Node gn = Node.createURI("g") ;
+ Node gn = NodeFactory.createURI("g") ;
Graph g = GraphFactory.createDefaultGraph() ;
g.add(SSE.parseTriple("(<s> <p> <o>)")) ; // So the graph is not empty.
dsg.addGraph(gn, g);
@@ -167,7 +168,7 @@ public abstract class AbstractDatasetGra
{
DatasetGraph dsg = emptyDataset() ;
assertNotNull(dsg) ;
- Node g = Node.createURI("g") ;
+ Node g = NodeFactory.createURI("g") ;
Triple t = SSE.parseTriple("(<s> <p> <o>)") ;
@@ -183,12 +184,12 @@ public abstract class AbstractDatasetGra
assertEquals(quad, quad2) ;
assertTrue(dsg.getDefaultGraph().isEmpty()) ;
- assertFalse(dsg.getGraph(Node.createURI("g")).isEmpty()) ;
+ assertFalse(dsg.getGraph(NodeFactory.createURI("g")).isEmpty()) ;
}
@Test public void graph_02()
{
- Node g = Node.createURI("g") ;
+ Node g = NodeFactory.createURI("g") ;
DatasetGraph dsg = emptyDataset() ;
assertNotNull(dsg) ;
Quad quad = SSE.parseQuad("(quad <g> <s> <p> <o>)") ;
@@ -197,13 +198,13 @@ public abstract class AbstractDatasetGra
Triple t = SSE.parseTriple("(<s> <p> <o>)") ;
dsg.getGraph(g).delete(t) ;
assertTrue(dsg.getDefaultGraph().isEmpty()) ;
- assertTrue(dsg.getGraph(Node.createURI("g")).isEmpty()) ;
+ assertTrue(dsg.getGraph(NodeFactory.createURI("g")).isEmpty()) ;
assertFalse(dsg.find(Node.ANY, Node.ANY, Node.ANY, Node.ANY).hasNext()) ;
}
@Test public void graph_03()
{
- Node g = Node.createURI("g") ;
+ Node g = NodeFactory.createURI("g") ;
DatasetGraph dsg = emptyDataset() ;
Graph data = SSE.parseGraph("(graph (<s> <p> <o>))") ;
dsg.addGraph(g, data) ;
@@ -213,7 +214,7 @@ public abstract class AbstractDatasetGra
@Test public void find_01()
{
- Node g1 = Node.createURI("g1") ;
+ Node g1 = NodeFactory.createURI("g1") ;
DatasetGraph dsg = emptyDataset() ;
Quad quad1 = SSE.parseQuad("(quad <g1> <s1> <p1> <o1>)") ;
Quad quad2 = SSE.parseQuad("(quad <g2> <s2> <p2> <o2>)") ;
@@ -229,9 +230,9 @@ public abstract class AbstractDatasetGra
@Test public void deleteAny_01()
{
DatasetGraph dsg = emptyDataset() ;
- Node subject = Node.createURI("http://example/s");
- Node predicate = Node.createURI("http://example/p");
- Node object = Node.createAnon();
+ Node subject = NodeFactory.createURI("http://example/s");
+ Node predicate = NodeFactory.createURI("http://example/p");
+ Node object = NodeFactory.createAnon();
dsg.add(new Quad(Quad.defaultGraphIRI, subject, predicate, object));
dsg.deleteAny(Node.ANY, subject, null, null);
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java Sun Mar 17 17:48:00 2013
@@ -35,6 +35,7 @@ import org.junit.BeforeClass ;
import org.junit.Test ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.rdf.model.AnonId ;
import com.hp.hpl.jena.sparql.core.Var ;
import com.hp.hpl.jena.sparql.resultset.ResultSetCompare ;
@@ -103,7 +104,7 @@ public class TestBindingStreams extends
public void bindingStream_61()
{
BindingMap b = BindingFactory.create() ;
- Node bn = Node.createAnon(new AnonId("unusual")) ;
+ Node bn = NodeFactory.createAnon(new AnonId("unusual")) ;
b.add(Var.alloc("v"), bn) ;
testWriteRead(b) ;
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/http/TestService.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/http/TestService.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/http/TestService.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/http/TestService.java Sun Mar 17 17:48:00 2013
@@ -22,6 +22,7 @@ import org.junit.Assert;
import org.junit.Test;
import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.graph.Triple;
import com.hp.hpl.jena.query.ARQ;
import com.hp.hpl.jena.sparql.algebra.op.OpBGP;
@@ -38,7 +39,7 @@ public class TestService {
{
BasicPattern basicPattern = new BasicPattern();
basicPattern.add( Triple.ANY );
- Node serviceNode = Node.createURI("http://example.com:40000");
+ Node serviceNode = NodeFactory.createURI("http://example.com:40000");
OpService opService = new OpService( serviceNode, new OpBGP( basicPattern ), false);
Context context = new Context();
@@ -69,7 +70,7 @@ public class TestService {
{
BasicPattern basicPattern = new BasicPattern();
basicPattern.add( Triple.ANY );
- Node serviceNode = Node.createURI("http://example.com:40000");
+ Node serviceNode = NodeFactory.createURI("http://example.com:40000");
OpService opService = new OpService( serviceNode, new OpBGP( basicPattern ), false);
Context context = new Context();
@@ -99,7 +100,7 @@ public class TestService {
{
BasicPattern basicPattern = new BasicPattern();
basicPattern.add( Triple.ANY );
- Node serviceNode = Node.createURI("http://example.com:40000");
+ Node serviceNode = NodeFactory.createURI("http://example.com:40000");
OpService opService = new OpService( serviceNode, new OpBGP( basicPattern ), false);
Context context = new Context();
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java Sun Mar 17 17:48:00 2013
@@ -34,7 +34,7 @@ import org.junit.Test ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Graph ;
-import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.query.Query ;
import com.hp.hpl.jena.query.QueryCancelledException ;
@@ -253,16 +253,16 @@ public class TestQueryIterSort {
private Binding randomBinding(Var[] vars)
{
BindingMap binding = BindingFactory.create();
- binding.add(vars[0], Node.createAnon());
- binding.add(vars[1], Node.createURI(randomURI()));
- binding.add(vars[2], Node.createURI(randomURI()));
- binding.add(vars[3], Node.createLiteral(randomString(20)));
- binding.add(vars[4], Node.createAnon());
- binding.add(vars[5], Node.createURI(randomURI()));
- binding.add(vars[6], Node.createURI(randomURI()));
- binding.add(vars[7], Node.createLiteral(randomString(5)));
- binding.add(vars[8], Node.createLiteral("" + random.nextInt(), null, XSDDatatype.XSDinteger));
- binding.add(vars[9], Node.createAnon());
+ binding.add(vars[0], NodeFactory.createAnon());
+ binding.add(vars[1], NodeFactory.createURI(randomURI()));
+ binding.add(vars[2], NodeFactory.createURI(randomURI()));
+ binding.add(vars[3], NodeFactory.createLiteral(randomString(20)));
+ binding.add(vars[4], NodeFactory.createAnon());
+ binding.add(vars[5], NodeFactory.createURI(randomURI()));
+ binding.add(vars[6], NodeFactory.createURI(randomURI()));
+ binding.add(vars[7], NodeFactory.createLiteral(randomString(5)));
+ binding.add(vars[8], NodeFactory.createLiteral("" + random.nextInt(), null, XSDDatatype.XSDinteger));
+ binding.add(vars[9], NodeFactory.createAnon());
return binding;
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestExpressions.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestExpressions.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestExpressions.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestExpressions.java Sun Mar 17 17:48:00 2013
@@ -30,7 +30,7 @@ import org.junit.BeforeClass ;
import org.junit.Test ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
-import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.query.Query ;
import com.hp.hpl.jena.query.QueryFactory ;
import com.hp.hpl.jena.query.QueryParseException ;
@@ -408,9 +408,9 @@ public class TestExpressions
static Binding env ;
static {
BindingMap b = BindingFactory.create() ;
- b.add(Var.alloc("a"), Node.createLiteral("A")) ;
- b.add(Var.alloc("b"), Node.createAnon()) ;
- b.add(Var.alloc("x"), Node.createURI("urn:x")) ;
+ b.add(Var.alloc("a"), NodeFactory.createLiteral("A")) ;
+ b.add(Var.alloc("b"), NodeFactory.createAnon()) ;
+ b.add(Var.alloc("x"), NodeFactory.createURI("urn:x")) ;
env = b ;
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestFunctions.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestFunctions.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestFunctions.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestFunctions.java Sun Mar 17 17:48:00 2013
@@ -24,6 +24,7 @@ import org.junit.Test ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.sparql.ARQConstants ;
import com.hp.hpl.jena.sparql.function.FunctionEnvBase ;
import com.hp.hpl.jena.sparql.util.ExprUtils ;
@@ -201,10 +202,10 @@ public class TestFunctions
@Test public void exprNotOneOf_06() { test("57 not in (1,2,3)", TRUE) ; }
- static Node xyz_en = Node.createLiteral("xyz", "en", null) ;
+ static Node xyz_en = NodeFactory.createLiteral("xyz", "en", null) ;
static NodeValue nv_xyz_en = NodeValue.makeNode(xyz_en) ;
- static Node xyz_xsd_string = Node.createLiteral("xyz", null, XSDDatatype.XSDstring) ;
+ static Node xyz_xsd_string = NodeFactory.createLiteral("xyz", null, XSDDatatype.XSDstring) ;
static NodeValue nv_xyz_string = NodeValue.makeNode(xyz_xsd_string) ;
@@ -215,7 +216,7 @@ public class TestFunctions
@Test public void exprStrDatatype2() { test("strdt('xyz', xsd:string)", nv_xyz_string) ; }
@Test public void exprStrDatatype3() { testEvalException("strdt('123', 'datatype')") ; }
- static Node n_uri = Node.createURI("http://example/") ;
+ static Node n_uri = NodeFactory.createURI("http://example/") ;
static NodeValue nv_uri = NodeValue.makeNode(n_uri) ;
@Test public void exprIRI1() { test("iri('http://example/')", nv_uri ) ; }
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestFunctions2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestFunctions2.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestFunctions2.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestFunctions2.java Sun Mar 17 17:48:00 2013
@@ -26,7 +26,7 @@ import com.hp.hpl.jena.sparql.expr.ExprE
import com.hp.hpl.jena.sparql.expr.NodeValue ;
import com.hp.hpl.jena.sparql.function.FunctionEnvBase ;
import com.hp.hpl.jena.sparql.util.ExprUtils ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.junit.AfterClass ;
@@ -533,7 +533,7 @@ public class TestFunctions2 extends Base
{
Expr expr = ExprUtils.parse(string, pmap) ;
NodeValue nv = expr.eval(null, new FunctionEnvBase()) ;
- Node r = NodeFactory.parseNode(result) ;
+ Node r = NodeFactoryExtra.parseNode(result) ;
NodeValue nvr = NodeValue.makeNode(r) ;
assertTrue("Not same value: Expected: "+nvr+" : Actual = "+nv, NodeValue.sameAs(nvr, nv)) ;
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeFunctions.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeFunctions.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeFunctions.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeFunctions.java Sun Mar 17 17:48:00 2013
@@ -24,6 +24,7 @@ import org.junit.Test ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.sparql.expr.nodevalue.NodeFunctions ;
import com.hp.hpl.jena.sparql.graph.NodeConst ;
import com.hp.hpl.jena.vocabulary.XSD ;
@@ -48,58 +49,58 @@ public class TestNodeFunctions extends T
@Test public void testSameTerm1()
{
- Node n1 = Node.createLiteral("xyz") ;
- Node n2 = Node.createLiteral("xyz") ;
+ Node n1 = NodeFactory.createLiteral("xyz") ;
+ Node n2 = NodeFactory.createLiteral("xyz") ;
assertTrue(NodeFunctions.sameTerm(n1, n2)) ;
}
@Test public void testSameTerm2()
{
- Node n1 = Node.createLiteral("xyz") ;
- Node n2 = Node.createLiteral("abc") ;
+ Node n1 = NodeFactory.createLiteral("xyz") ;
+ Node n2 = NodeFactory.createLiteral("abc") ;
assertFalse(NodeFunctions.sameTerm(n1, n2)) ;
}
@Test public void testSameTerm3()
{
- Node n1 = Node.createLiteral("xyz") ;
- Node n2 = Node.createURI("xyz") ;
+ Node n1 = NodeFactory.createLiteral("xyz") ;
+ Node n2 = NodeFactory.createURI("xyz") ;
assertFalse(NodeFunctions.sameTerm(n1, n2)) ;
}
@Test public void testSameTerm4()
{
- Node n1 = Node.createLiteral("xyz") ;
- Node n2 = Node.createLiteral("xyz", null, XSDDatatype.XSDstring) ;
+ Node n1 = NodeFactory.createLiteral("xyz") ;
+ Node n2 = NodeFactory.createLiteral("xyz", null, XSDDatatype.XSDstring) ;
assertFalse(NodeFunctions.sameTerm(n1, n2)) ;
}
@Test public void testSameTerm5()
{
- Node n1 = Node.createLiteral("xyz", "en", null) ;
- Node n2 = Node.createLiteral("xyz", null, null) ;
+ Node n1 = NodeFactory.createLiteral("xyz", "en", null) ;
+ Node n2 = NodeFactory.createLiteral("xyz", null, null) ;
assertFalse(NodeFunctions.sameTerm(n1, n2)) ;
}
@Test public void testSameTerm6()
{
- Node n1 = Node.createLiteral("xyz", "en", null) ;
- Node n2 = Node.createLiteral("xyz", "EN", null) ;
+ Node n1 = NodeFactory.createLiteral("xyz", "en", null) ;
+ Node n2 = NodeFactory.createLiteral("xyz", "EN", null) ;
assertTrue(NodeFunctions.sameTerm(n1, n2)) ;
}
@Test public void testRDFtermEquals1()
{
- Node n1 = Node.createURI("xyz") ;
- Node n2 = Node.createLiteral("xyz", null, null) ;
+ Node n1 = NodeFactory.createURI("xyz") ;
+ Node n2 = NodeFactory.createLiteral("xyz", null, null) ;
assertFalse(NodeFunctions.rdfTermEquals(n1, n2)) ;
}
@Test public void testRDFtermEquals3()
{
// Unextended - no language tag
- Node n1 = Node.createLiteral("xyz") ;
- Node n2 = Node.createLiteral("xyz", "en", null) ;
+ Node n1 = NodeFactory.createLiteral("xyz") ;
+ Node n2 = NodeFactory.createLiteral("xyz", "en", null) ;
try {
NodeFunctions.rdfTermEquals(n1, n2) ;
fail("Expected an exception from rdfTermEquals") ;
@@ -109,8 +110,8 @@ public class TestNodeFunctions extends T
@Test public void testRDFtermEquals2()
{
- Node n1 = Node.createLiteral("xyz", "en", null) ;
- Node n2 = Node.createLiteral("xyz", "EN", null) ;
+ Node n1 = NodeFactory.createLiteral("xyz", "en", null) ;
+ Node n2 = NodeFactory.createLiteral("xyz", "EN", null) ;
assertTrue(NodeFunctions.rdfTermEquals(n1, n2)) ;
}
@@ -137,7 +138,7 @@ public class TestNodeFunctions extends T
@Test public void testStr4()
{
- Node n = Node.createAnon() ;
+ Node n = NodeFactory.createAnon() ;
try {
String s = NodeFunctions.str(n) ;
fail("Expect a type exception but call succeeded") ;
@@ -187,7 +188,7 @@ public class TestNodeFunctions extends T
@Test public void testDatatype5()
{
try {
- NodeValue nv = NodeValue.makeNode(Node.createURI("http://example")) ;
+ NodeValue nv = NodeValue.makeNode(NodeFactory.createURI("http://example")) ;
NodeValue r = NodeFunctions.datatype(nv) ;
fail("Expect a type exception but call succeeded") ;
}
@@ -196,7 +197,7 @@ public class TestNodeFunctions extends T
@Test public void testDatatype6()
{
- NodeValue nv = NodeValue.makeNode(Node.createAnon()) ;
+ NodeValue nv = NodeValue.makeNode(NodeFactory.createAnon()) ;
try {
NodeValue r = NodeFunctions.datatype(nv) ;
fail("Expect a type exception but call succeeded") ;
@@ -206,7 +207,7 @@ public class TestNodeFunctions extends T
@Test public void testLang1()
{
- Node n = Node.createLiteral("abc", "en-gb", null) ;
+ Node n = NodeFactory.createLiteral("abc", "en-gb", null) ;
assertEquals("en-gb", NodeFunctions.lang(n)) ;
}
@@ -228,7 +229,7 @@ public class TestNodeFunctions extends T
@Test public void testLang4()
{
- NodeValue nv = NodeValue.makeNode(Node.createLiteral("simple")) ;
+ NodeValue nv = NodeValue.makeNode(NodeFactory.createLiteral("simple")) ;
NodeValue r = NodeFunctions.lang(nv) ;
NodeValue e = NodeValue.makeString("") ;
assertEquals(e, r) ;
@@ -236,7 +237,7 @@ public class TestNodeFunctions extends T
@Test public void testLang5()
{
- NodeValue nv = NodeValue.makeNode(Node.createURI("http://example/")) ;
+ NodeValue nv = NodeValue.makeNode(NodeFactory.createURI("http://example/")) ;
try {
NodeValue r = NodeFunctions.lang(nv) ;
fail("Expect a type exception but call succeeded") ;
@@ -314,21 +315,21 @@ public class TestNodeFunctions extends T
@Test public void testIsIRI_1()
{
- NodeValue nv = NodeValue.makeNode(Node.createURI("http://example/")) ;
+ NodeValue nv = NodeValue.makeNode(NodeFactory.createURI("http://example/")) ;
NodeValue r = NodeFunctions.isIRI(nv) ;
assertEquals(NodeValue.TRUE, r) ;
}
@Test public void testIsIRI_2()
{
- NodeValue nv = NodeValue.makeNode(Node.createLiteral("http://example/")) ;
+ NodeValue nv = NodeValue.makeNode(NodeFactory.createLiteral("http://example/")) ;
NodeValue r = NodeFunctions.isIRI(nv) ;
assertEquals(NodeValue.FALSE, r) ;
}
@Test public void testIsBlank1()
{
- NodeValue nv = NodeValue.makeNode(Node.createAnon());
+ NodeValue nv = NodeValue.makeNode(NodeFactory.createAnon());
NodeValue r = NodeFunctions.isBlank(nv) ;
assertEquals(NodeValue.TRUE, r) ;
@@ -336,14 +337,14 @@ public class TestNodeFunctions extends T
@Test public void testIsBlank2()
{
- NodeValue nv = NodeValue.makeNode(Node.createLiteral("xyz")) ;
+ NodeValue nv = NodeValue.makeNode(NodeFactory.createLiteral("xyz")) ;
NodeValue r = NodeFunctions.isBlank(nv) ;
assertEquals(NodeValue.FALSE, r) ;
}
@Test public void testIsBlank3()
{
- NodeValue nv = NodeValue.makeNode(Node.createURI("http://example/")) ;
+ NodeValue nv = NodeValue.makeNode(NodeFactory.createURI("http://example/")) ;
NodeValue r = NodeFunctions.isBlank(nv) ;
assertEquals(NodeValue.FALSE, r) ;
@@ -351,14 +352,14 @@ public class TestNodeFunctions extends T
@Test public void testIsLiteral1()
{
- NodeValue nv = NodeValue.makeNode(Node.createLiteral("xyz")) ;
+ NodeValue nv = NodeValue.makeNode(NodeFactory.createLiteral("xyz")) ;
NodeValue r = NodeFunctions.isLiteral(nv) ;
assertEquals(NodeValue.TRUE, r) ;
}
@Test public void testIsLiteral2()
{
- NodeValue nv = NodeValue.makeNode(Node.createURI("http://example/")) ;
+ NodeValue nv = NodeValue.makeNode(NodeFactory.createURI("http://example/")) ;
NodeValue r = NodeFunctions.isLiteral(nv) ;
assertEquals(NodeValue.FALSE, r) ;
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeValue.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeValue.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeValue.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestNodeValue.java Sun Mar 17 17:48:00 2013
@@ -29,7 +29,7 @@ import org.junit.Test ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.expr.nodevalue.XSDFuncOp ;
-import com.hp.hpl.jena.sparql.util.NodeFactory ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
/** Break expression testing suite into parts
* @see TestExpressions
@@ -426,7 +426,7 @@ public class TestNodeValue extends TestC
static NodeValue make(String str)
{
- Node n = NodeFactory.parseNode(str) ;
+ Node n = NodeFactoryExtra.parseNode(str) ;
NodeValue nv = NodeValue.makeNode(n) ;
return nv ;
}
@@ -724,18 +724,18 @@ public class TestNodeValue extends TestC
@Test public void testLang1()
{
- Node n1 = Node.createLiteral("xyz", "en", null) ;
+ Node n1 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "en", null) ;
NodeValue nv1 = NodeValue.makeNode(n1) ;
- Node n2 = Node.createLiteral("xyz", "en", null) ;
+ Node n2 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "en", null) ;
NodeValue nv2 = NodeValue.makeNode(n2) ;
assertTrue(NodeValue.sameAs(nv1, nv2)) ;
}
@Test public void testLang2()
{
- Node n1 = Node.createLiteral("xyz", "en", null) ;
+ Node n1 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "en", null) ;
NodeValue nv1 = NodeValue.makeNode(n1) ;
- Node n2 = Node.createLiteral("xyz", "EN", null) ;
+ Node n2 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "EN", null) ;
NodeValue nv2 = NodeValue.makeNode(n2) ;
assertTrue(NodeValue.sameAs(nv1, nv2)) ;
assertFalse(nv1.equals(nv2)) ;
@@ -743,18 +743,18 @@ public class TestNodeValue extends TestC
@Test public void testLang3()
{
- Node n1 = Node.createLiteral("xyz", "en", null) ;
+ Node n1 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "en", null) ;
NodeValue nv1 = NodeValue.makeNode(n1) ;
- Node n2 = Node.createLiteral("xyz", "en", null) ;
+ Node n2 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "en", null) ;
NodeValue nv2 = NodeValue.makeNode(n2) ;
assertFalse(NodeValue.notSameAs(nv1, nv2)) ;
}
@Test public void testLang4()
{
- Node n1 = Node.createLiteral("xyz", "en", null) ;
+ Node n1 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "en", null) ;
NodeValue nv1 = NodeValue.makeNode(n1) ;
- Node n2 = Node.createLiteral("xyz", "EN", null) ;
+ Node n2 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("xyz", "EN", null) ;
NodeValue nv2 = NodeValue.makeNode(n2) ;
assertFalse(NodeValue.notSameAs(nv1, nv2)) ;
assertFalse(nv1.equals(nv2)) ;
@@ -783,8 +783,8 @@ public class TestNodeValue extends TestC
@Test public void testEquals4()
{
- NodeValue nv1 = NodeValue.makeNode(Node.createURI("http://example")) ;
- NodeValue nv2 = NodeValue.makeNode(Node.createURI("http://example")) ;
+ NodeValue nv1 = NodeValue.makeNode(com.hp.hpl.jena.graph.NodeFactory.createURI("http://example")) ;
+ NodeValue nv2 = NodeValue.makeNode(com.hp.hpl.jena.graph.NodeFactory.createURI("http://example")) ;
assertEquals("Not NodeValue.equals()", nv1 , nv2) ;
}
@@ -804,8 +804,8 @@ public class TestNodeValue extends TestC
@Test public void testNotEquals3()
{ //Literals and URIs are different.
- NodeValue nv1 = NodeValue.makeNode(Node.createURI("http://example")) ;
- NodeValue nv2 = NodeValue.makeNode(Node.createLiteral("http://example")) ;
+ NodeValue nv1 = NodeValue.makeNode(com.hp.hpl.jena.graph.NodeFactory.createURI("http://example")) ;
+ NodeValue nv2 = NodeValue.makeNode(com.hp.hpl.jena.graph.NodeFactory.createLiteral("http://example")) ;
assertFalse("NodeValue.equals()", nv1.equals(nv2)) ;
}
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestOrdering.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestOrdering.java?rev=1457500&r1=1457499&r2=1457500&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestOrdering.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/expr/TestOrdering.java Sun Mar 17 17:48:00 2013
@@ -24,6 +24,7 @@ import org.junit.Test ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.sparql.util.NodeUtils ;
public class TestOrdering extends TestCase
@@ -132,47 +133,47 @@ public class TestOrdering extends TestCa
@Test public void test_xsd_string1()
{
- NodeValue nv1 = NodeValue.makeNode(Node.createLiteral("abc", "", null)) ;
- NodeValue nv2 = NodeValue.makeNode(Node.createLiteral("abc", "", XSDDatatype.XSDstring)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "", null)) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "", XSDDatatype.XSDstring)) ;
int x = NodeValue.compare(nv1, nv2) ;
assertTrue(Expr.CMP_EQUAL == x ) ;
}
@Test public void test_xsd_string2()
{
- NodeValue nv1 = NodeValue.makeNode(Node.createLiteral("xyz", "", null)) ;
- NodeValue nv2 = NodeValue.makeNode(Node.createLiteral("abc", "", XSDDatatype.XSDstring)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", "", null)) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "", XSDDatatype.XSDstring)) ;
int x = NodeValue.compare(nv1, nv2) ;
assertTrue(Expr.CMP_GREATER == x ) ;
}
@Test public void test_xsd_string3()
{
- NodeValue nv1 = NodeValue.makeNode(Node.createLiteral("xyz", "", XSDDatatype.XSDstring)) ;
- NodeValue nv2 = NodeValue.makeNode(Node.createLiteral("abc", "", null)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", "", XSDDatatype.XSDstring)) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "", null)) ;
int x = NodeValue.compare(nv1, nv2) ;
assertTrue(Expr.CMP_GREATER == x ) ;
}
@Test public void test_xsd_string4()
{
- NodeValue nv1 = NodeValue.makeNode(Node.createLiteral("abc", "", null)) ;
- NodeValue nv2 = NodeValue.makeNode(Node.createLiteral("xyz", "", XSDDatatype.XSDstring)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "", null)) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", "", XSDDatatype.XSDstring)) ;
int x = NodeValue.compare(nv1, nv2) ;
assertTrue(Expr.CMP_LESS == x ) ;
}
@Test public void test_xsd_string5()
{
- NodeValue nv1 = NodeValue.makeNode(Node.createLiteral("abc", "", XSDDatatype.XSDstring)) ;
- NodeValue nv2 = NodeValue.makeNode(Node.createLiteral("xyz", "", null)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "", XSDDatatype.XSDstring)) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", "", null)) ;
int x = NodeValue.compare(nv1, nv2) ;
assertTrue(Expr.CMP_LESS == x ) ;
}
@Test public void test_lang1()
{
- NodeValue nv1 = NodeValue.makeNode(Node.createLiteral("abc", "en", null)) ;
- NodeValue nv2 = NodeValue.makeNode(Node.createLiteral("abc", "", null)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "en", null)) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "", null)) ;
int x = NodeUtils.compareRDFTerms(nv1.asNode() , nv2.asNode()) ;
assertTrue("Lang tags should sort after plain literal", Expr.CMP_GREATER == x ) ;
@@ -180,8 +181,8 @@ public class TestOrdering extends TestCa
@Test public void test_lang2()
{
- NodeValue nv1 = NodeValue.makeNode(Node.createLiteral("abc", "en", null)) ;
- NodeValue nv2 = NodeValue.makeNode(Node.createLiteral("abc", "EN", null)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "en", null)) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "EN", null)) ;
int x = NodeUtils.compareRDFTerms(nv1.asNode() , nv2.asNode()) ;
assertTrue("Lang tags should sort by case", Expr.CMP_GREATER == x ) ;
@@ -189,8 +190,8 @@ public class TestOrdering extends TestCa
@Test public void test_lang3()
{
- NodeValue nv1 = NodeValue.makeNode(Node.createLiteral("ABC", "en", null)) ;
- NodeValue nv2 = NodeValue.makeNode(Node.createLiteral("abc", "EN", null)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("ABC", "en", null)) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "EN", null)) ;
int x = NodeValue.compareAlways(nv1, nv2) ;
assertTrue("Lang nodes should sort by lexical if tags value-same", Expr.CMP_LESS == x ) ;
@@ -200,8 +201,8 @@ public class TestOrdering extends TestCa
@Test public void test_lang4()
{
- NodeValue nv1 = NodeValue.makeNode(Node.createLiteral("ABC", "en", null)) ;
- NodeValue nv2 = NodeValue.makeNode(Node.createLiteral("abc", "en", null)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("ABC", "en", null)) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "en", null)) ;
int x = NodeValue.compareAlways(nv1, nv2) ;
assertTrue("Lang nodes should sort by lexical if tags the same", Expr.CMP_LESS == x ) ;
@@ -211,8 +212,8 @@ public class TestOrdering extends TestCa
@Test public void test_lang5()
{
- NodeValue nv1 = NodeValue.makeNode(Node.createLiteral("abc", "", null)) ;
- NodeValue nv2 = NodeValue.makeNode(Node.createLiteral("xyz", "en", null)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "", null)) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", "en", null)) ;
int x = NodeValue.compareAlways(nv1, nv2) ;
assertTrue("Lang nodes should sort by lexical form if one is plain", Expr.CMP_LESS == x ) ;
@@ -222,8 +223,8 @@ public class TestOrdering extends TestCa
@Test public void test_lang6()
{
- NodeValue nv1 = NodeValue.makeNode(Node.createLiteral("xyz", "", null)) ;
- NodeValue nv2 = NodeValue.makeNode(Node.createLiteral("abc", "en", null)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", "", null)) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "en", null)) ;
int x = NodeValue.compareAlways(nv1, nv2) ;
assertTrue("Lang nodes should sort by lexical form if one is plain", Expr.CMP_GREATER == x ) ;
@@ -233,8 +234,8 @@ public class TestOrdering extends TestCa
@Test public void test_lang7()
{
- NodeValue nv1 = NodeValue.makeNode(Node.createLiteral("abc", "", XSDDatatype.XSDstring)) ;
- NodeValue nv2 = NodeValue.makeNode(Node.createLiteral("xyz", "en", null)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "", XSDDatatype.XSDstring)) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", "en", null)) ;
int x = NodeValue.compareAlways(nv1, nv2) ;
assertTrue("Lang nodes should sort by lexical form if other is XSD string", Expr.CMP_LESS == x ) ;
@@ -244,8 +245,8 @@ public class TestOrdering extends TestCa
@Test public void test_lang8()
{
- NodeValue nv1 = NodeValue.makeNode(Node.createLiteral("xyz", "", XSDDatatype.XSDstring)) ;
- NodeValue nv2 = NodeValue.makeNode(Node.createLiteral("abc", "en", null)) ;
+ NodeValue nv1 = NodeValue.makeNode(NodeFactory.createLiteral("xyz", "", XSDDatatype.XSDstring)) ;
+ NodeValue nv2 = NodeValue.makeNode(NodeFactory.createLiteral("abc", "en", null)) ;
int x = NodeValue.compareAlways(nv1, nv2) ;
assertTrue("Lang nodes should sort by lexical form if other is XSD string", Expr.CMP_GREATER == x ) ;