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:41:54 UTC
svn commit: r1457497 [2/2] - in /jena/trunk/jena-core/src:
main/java/com/hp/hpl/jena/graph/ main/java/com/hp/hpl/jena/n3/turtle/
main/java/com/hp/hpl/jena/ontology/impl/ main/java/com/hp/hpl/jena/rdf/arp/
main/java/com/hp/hpl/jena/rdf/model/ main/java/...
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/DebugOWL.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/DebugOWL.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/DebugOWL.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/DebugOWL.java Sun Mar 17 17:41:52 2013
@@ -188,9 +188,9 @@ public class DebugOWL {
Node property = null;
if (i == 0) {
for (int j = 0; j < NS; j++) {
- Node concept = Node.createURI("concept" + conceptPtr);
+ Node concept = NodeFactory.createURI("concept" + conceptPtr);
if (withProps) {
- property = Node.createURI("prop" + conceptPtr);
+ property = NodeFactory.createURI("prop" + conceptPtr);
properties[conceptPtr] = property;
}
concepts[conceptPtr++] = concept;
@@ -199,9 +199,9 @@ public class DebugOWL {
for (int j = levelStart; j < levelEnd; j++) {
Node superConcept = concepts[j];
for (int k = 0; k < NS; k++) {
- Node concept = Node.createURI("concept" + conceptPtr);
+ Node concept = NodeFactory.createURI("concept" + conceptPtr);
if (withProps) {
- property = Node.createURI("prop" + conceptPtr);
+ property = NodeFactory.createURI("prop" + conceptPtr);
properties[conceptPtr] = property;
}
concepts[conceptPtr++] = concept;
@@ -215,7 +215,7 @@ public class DebugOWL {
for (int j = levelStart; j < levelEnd; j++) {
Node concept = concepts[j];
for (int k = 0; k < NI; k++) {
- Node instance = Node.createURI("instance"+instancePtr);
+ Node instance = NodeFactory.createURI("instance"+instancePtr);
testdata.add(new Triple(instance, RDF.type.asNode(), concept));
if (withProps && (k-1)%3 == 0) {
testdata.add(new Triple(instances[instancePtr-1], property, instance));
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBackchainer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBackchainer.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBackchainer.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBackchainer.java Sun Mar 17 17:41:52 2013
@@ -47,18 +47,18 @@ public class TestBackchainer extends Tes
private static final int MAX_VARS = 10;
// Useful constants
- protected Node p = Node.createURI("p");
- protected Node q = Node.createURI("q");
- protected Node r = Node.createURI("r");
- protected Node s = Node.createURI("s");
- protected Node t = Node.createURI("t");
- protected Node a = Node.createURI("a");
- protected Node b = Node.createURI("b");
- protected Node c = Node.createURI("c");
- protected Node d = Node.createURI("d");
- protected Node C1 = Node.createURI("C1");
- protected Node C2 = Node.createURI("C2");
- protected Node C3 = Node.createURI("C3");
+ protected Node p = NodeFactory.createURI("p");
+ protected Node q = NodeFactory.createURI("q");
+ protected Node r = NodeFactory.createURI("r");
+ protected Node s = NodeFactory.createURI("s");
+ protected Node t = NodeFactory.createURI("t");
+ protected Node a = NodeFactory.createURI("a");
+ protected Node b = NodeFactory.createURI("b");
+ protected Node c = NodeFactory.createURI("c");
+ protected Node d = NodeFactory.createURI("d");
+ protected Node C1 = NodeFactory.createURI("C1");
+ protected Node C2 = NodeFactory.createURI("C2");
+ protected Node C3 = NodeFactory.createURI("C3");
protected Node sP = RDFS.Nodes.subPropertyOf;
protected Node sC = RDFS.Nodes.subClassOf;
protected Node ty = RDF.Nodes.type;
@@ -895,9 +895,9 @@ public class TestBackchainer extends Tes
*/
public void testBug1() throws IOException {
Graph data = Factory.createGraphMem();
- Node p = Node.createURI("http://www.hpl.hp.com/semweb/2003/eg#p");
- Node r = Node.createURI("http://www.hpl.hp.com/semweb/2003/eg#r");
- Node C1 = Node.createURI("http://www.hpl.hp.com/semweb/2003/eg#C1");
+ Node p = NodeFactory.createURI("http://www.hpl.hp.com/semweb/2003/eg#p");
+ Node r = NodeFactory.createURI("http://www.hpl.hp.com/semweb/2003/eg#r");
+ Node C1 = NodeFactory.createURI("http://www.hpl.hp.com/semweb/2003/eg#C1");
data.add(new Triple(a, p, b));
List<Rule> rules = Rule.parseRules(Util.loadRuleParserFromResourceFile("testing/reasoners/bugs/rdfs-error1.brules"));
Reasoner reasoner = createReasoner(rules);
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasicLP.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasicLP.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasicLP.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasicLP.java Sun Mar 17 17:41:52 2013
@@ -41,24 +41,24 @@ import junit.framework.TestSuite;
public class TestBasicLP extends TestCase {
// Useful constants
- Node p = Node.createURI("p");
- Node q = Node.createURI("q");
- Node r = Node.createURI("r");
- Node s = Node.createURI("s");
- Node t = Node.createURI("t");
- Node u = Node.createURI("u");
- Node a = Node.createURI("a");
- Node b = Node.createURI("b");
- Node c = Node.createURI("c");
- Node d = Node.createURI("d");
- Node e = Node.createURI("e");
- Node C1 = Node.createURI("C1");
- Node C2 = Node.createURI("C2");
- Node C3 = Node.createURI("C3");
- Node C4 = Node.createURI("C4");
- Node D1 = Node.createURI("D1");
- Node D2 = Node.createURI("D2");
- Node D3 = Node.createURI("D3");
+ Node p = NodeFactory.createURI("p");
+ Node q = NodeFactory.createURI("q");
+ Node r = NodeFactory.createURI("r");
+ Node s = NodeFactory.createURI("s");
+ Node t = NodeFactory.createURI("t");
+ Node u = NodeFactory.createURI("u");
+ Node a = NodeFactory.createURI("a");
+ Node b = NodeFactory.createURI("b");
+ Node c = NodeFactory.createURI("c");
+ Node d = NodeFactory.createURI("d");
+ Node e = NodeFactory.createURI("e");
+ Node C1 = NodeFactory.createURI("C1");
+ Node C2 = NodeFactory.createURI("C2");
+ Node C3 = NodeFactory.createURI("C3");
+ Node C4 = NodeFactory.createURI("C4");
+ Node D1 = NodeFactory.createURI("D1");
+ Node D2 = NodeFactory.createURI("D2");
+ Node D3 = NodeFactory.createURI("D3");
Node sP = RDFS.Nodes.subPropertyOf;
Node sC = RDFS.Nodes.subClassOf;
Node ty = RDF.Nodes.type;
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasics.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasics.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasics.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBasics.java Sun Mar 17 17:41:52 2013
@@ -41,16 +41,16 @@ public class TestBasics extends TestCase
private static final int MAX_VARS = 10;
// Useful constants
- Node p = Node.createURI("p");
- Node q = Node.createURI("q");
- Node r = Node.createURI("r");
- Node s = Node.createURI("s");
- Node n1 = Node.createURI("n1");
- Node n2 = Node.createURI("n2");
- Node n3 = Node.createURI("n3");
- Node n4 = Node.createURI("n4");
- Node n5 = Node.createURI("n5");
- Node res = Node.createURI("res");
+ Node p = NodeFactory.createURI("p");
+ Node q = NodeFactory.createURI("q");
+ Node r = NodeFactory.createURI("r");
+ Node s = NodeFactory.createURI("s");
+ Node n1 = NodeFactory.createURI("n1");
+ Node n2 = NodeFactory.createURI("n2");
+ Node n3 = NodeFactory.createURI("n3");
+ Node n4 = NodeFactory.createURI("n4");
+ Node n5 = NodeFactory.createURI("n5");
+ Node res = NodeFactory.createURI("res");
/**
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBugs.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBugs.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBugs.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestBugs.java Sun Mar 17 17:41:52 2013
@@ -25,6 +25,7 @@ import junit.framework.TestCase ;
import junit.framework.TestSuite ;
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.graph.impl.LiteralLabelFactory ;
import com.hp.hpl.jena.ontology.* ;
@@ -819,8 +820,8 @@ public class TestBugs extends TestCase {
public boolean bodyCall(Node[] args, int length, RuleContext context) {
checkArgs(length, context);
BindingEnvironment env = context.getEnv();
- Triple t = new Triple( Node.createAnon(), Node.createURI("http://jena.hpl.hp.com/example#"), Node.createAnon());
- Node l = Node.createLiteral( LiteralLabelFactory.create(t) );
+ Triple t = new Triple( NodeFactory.createAnon(), NodeFactory.createURI("http://jena.hpl.hp.com/example#"), NodeFactory.createAnon());
+ Node l = NodeFactory.createLiteral( LiteralLabelFactory.create(t) );
return env.bind(args[0], l);
}
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestComparatorBuiltins.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestComparatorBuiltins.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestComparatorBuiltins.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestComparatorBuiltins.java Sun Mar 17 17:41:52 2013
@@ -21,6 +21,7 @@ package com.hp.hpl.jena.reasoner.rulesys
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.reasoner.InfGraph;
import com.hp.hpl.jena.reasoner.TriplePattern;
@@ -58,14 +59,14 @@ public class TestComparatorBuiltins exte
doTestComparator("1.0", "1.1", XSDDatatype.XSDfloat);
doTestComparator("1.0", "1.1", XSDDatatype.XSDdouble);
doTestComparator(
- Node.createLiteral("1.0", "", XSDDatatype.XSDfloat),
- Node.createLiteral("1.1", "", XSDDatatype.XSDdouble) );
+ NodeFactory.createLiteral("1.0", "", XSDDatatype.XSDfloat),
+ NodeFactory.createLiteral("1.1", "", XSDDatatype.XSDdouble) );
doTestComparator(
- Node.createLiteral("1", "", XSDDatatype.XSDint),
- Node.createLiteral("2", "", XSDDatatype.XSDinteger) );
+ NodeFactory.createLiteral("1", "", XSDDatatype.XSDint),
+ NodeFactory.createLiteral("2", "", XSDDatatype.XSDinteger) );
doTestComparator(
- Node.createLiteral("1", "", XSDDatatype.XSDint),
- Node.createLiteral("2", "", XSDDatatype.XSDlong) );
+ NodeFactory.createLiteral("1", "", XSDDatatype.XSDint),
+ NodeFactory.createLiteral("2", "", XSDDatatype.XSDlong) );
}
public void testComparatorTime() {
@@ -76,8 +77,8 @@ public class TestComparatorBuiltins exte
}
public void doTestComparator(String lLow, String lHigh, RDFDatatype type) {
- Node nl = Node.createLiteral(lLow, "", type);
- Node nh = Node.createLiteral(lHigh, "", type);
+ Node nl = NodeFactory.createLiteral(lLow, "", type);
+ Node nh = NodeFactory.createLiteral(lHigh, "", type);
doTestComparator(nl, nh);
doTestBuiltins(nl, nh);
@@ -90,8 +91,8 @@ public class TestComparatorBuiltins exte
}
public void doTestBuiltins(String lLow, String lHigh, RDFDatatype type) {
- Node nl = Node.createLiteral(lLow, "", type);
- Node nh = Node.createLiteral(lHigh, "", type);
+ Node nl = NodeFactory.createLiteral(lLow, "", type);
+ Node nh = NodeFactory.createLiteral(lHigh, "", type);
doTestBuiltins(nl, nh);
}
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java Sun Mar 17 17:41:52 2013
@@ -48,28 +48,28 @@ public class TestFBRules extends TestCas
protected static Logger logger = LoggerFactory.getLogger(TestFBRules.class);
// Useful constants
- protected Node p = Node.createURI("p");
- protected Node q = Node.createURI("q");
- protected Node n1 = Node.createURI("n1");
- protected Node n2 = Node.createURI("n2");
- protected Node n3 = Node.createURI("n3");
- protected Node n4 = Node.createURI("n4");
- protected Node n5 = Node.createURI("n5");
- protected Node res = Node.createURI("res");
- protected Node r = Node.createURI("r");
- protected Node s = Node.createURI("s");
- protected Node t = Node.createURI("t");
- protected Node u = Node.createURI("u");
- protected Node v = Node.createURI("v");
- protected Node w = Node.createURI("w");
- protected Node x = Node.createURI("x");
- protected Node a = Node.createURI("a");
- protected Node b = Node.createURI("b");
- protected Node c = Node.createURI("c");
- protected Node d = Node.createURI("d");
- protected Node C1 = Node.createURI("C1");
- protected Node C2 = Node.createURI("C2");
- protected Node C3 = Node.createURI("C3");
+ protected Node p = NodeFactory.createURI("p");
+ protected Node q = NodeFactory.createURI("q");
+ protected Node n1 = NodeFactory.createURI("n1");
+ protected Node n2 = NodeFactory.createURI("n2");
+ protected Node n3 = NodeFactory.createURI("n3");
+ protected Node n4 = NodeFactory.createURI("n4");
+ protected Node n5 = NodeFactory.createURI("n5");
+ protected Node res = NodeFactory.createURI("res");
+ protected Node r = NodeFactory.createURI("r");
+ protected Node s = NodeFactory.createURI("s");
+ protected Node t = NodeFactory.createURI("t");
+ protected Node u = NodeFactory.createURI("u");
+ protected Node v = NodeFactory.createURI("v");
+ protected Node w = NodeFactory.createURI("w");
+ protected Node x = NodeFactory.createURI("x");
+ protected Node a = NodeFactory.createURI("a");
+ protected Node b = NodeFactory.createURI("b");
+ protected Node c = NodeFactory.createURI("c");
+ protected Node d = NodeFactory.createURI("d");
+ protected Node C1 = NodeFactory.createURI("C1");
+ protected Node C2 = NodeFactory.createURI("C2");
+ protected Node C3 = NodeFactory.createURI("C3");
protected Node sP = RDFS.Nodes.subPropertyOf;
protected Node sC = RDFS.Nodes.subClassOf;
protected Node ty = RDF.Nodes.type;
@@ -630,7 +630,7 @@ public class TestFBRules extends TestCas
data.add(new Triple(n2, p, Functor.makeFunctorNode("f", new Node[] {
a, Util.makeIntNode(0) })));
data.add(new Triple(n3, p, Functor.makeFunctorNode("f", new Node[] {
- a, Node.createLiteral( "0", "", XSDDatatype.XSDnonNegativeInteger ) } )));
+ a, NodeFactory.createLiteral( "0", "", XSDDatatype.XSDnonNegativeInteger ) } )));
InfGraph infgraph = createInfGraph(rules, data);
TestUtil.assertIteratorValues(this, infgraph.find(null, s, null),
@@ -645,12 +645,12 @@ public class TestFBRules extends TestCas
*/
public void testBuiltins2() {
// Numeric comparisions
- Node lt = Node.createURI("lt");
- Node gt = Node.createURI("gt");
- Node le = Node.createURI("le");
- Node ge = Node.createURI("ge");
- Node eq = Node.createURI("eq");
- Node ne = Node.createURI("ne");
+ Node lt = NodeFactory.createURI("lt");
+ Node gt = NodeFactory.createURI("gt");
+ Node le = NodeFactory.createURI("le");
+ Node ge = NodeFactory.createURI("ge");
+ Node eq = NodeFactory.createURI("eq");
+ Node ne = NodeFactory.createURI("ne");
String rules =
"[r1: (?x q ?vx), (?y q ?vy), lessThan(?vx, ?vy) -> (?x lt ?y)]" +
"[r2: (?x q ?vx), (?y q ?vy), greaterThan(?vx, ?vy) -> (?x gt ?y)]" +
@@ -707,9 +707,9 @@ public class TestFBRules extends TestCas
// XSD timeDate point comparisons
data = Factory.createGraphMem();
XSDDatatype dt = new XSDDatatype("dateTime");
- data.add(new Triple(n1, q, Node.createLiteral("2000-03-04T20:00:00Z", "", XSDDatatype.XSDdateTime)));
- data.add(new Triple(n2, q, Node.createLiteral("2001-03-04T20:00:00Z", "", XSDDatatype.XSDdateTime)));
- data.add(new Triple(n3, q, Node.createLiteral("2002-03-04T20:00:00Z", "", XSDDatatype.XSDdateTime)));
+ data.add(new Triple(n1, q, NodeFactory.createLiteral("2000-03-04T20:00:00Z", "", XSDDatatype.XSDdateTime)));
+ data.add(new Triple(n2, q, NodeFactory.createLiteral("2001-03-04T20:00:00Z", "", XSDDatatype.XSDdateTime)));
+ data.add(new Triple(n3, q, NodeFactory.createLiteral("2002-03-04T20:00:00Z", "", XSDDatatype.XSDdateTime)));
infgraph = createInfGraph(rules, data);
TestUtil.assertIteratorValues(this, infgraph.find(n1, null, n2),
@@ -785,23 +785,23 @@ public class TestFBRules extends TestCas
data = Factory.createGraphMem();
data.add(new Triple(n1, p, Util.makeIntNode(3)) );
data.add(new Triple(n2, p, res));
- data.add(new Triple(n3, p, Node.createAnon()));
+ data.add(new Triple(n3, p, NodeFactory.createAnon()));
infgraph = createInfGraph(rules, data);
TestUtil.assertIteratorValues(this, infgraph.find(n1, s, null),
new Triple[] {
- new Triple(n1, s, Node.createLiteral("literal", "", null)),
- new Triple(n1, s, Node.createLiteral("notBNode", "", null)),
+ new Triple(n1, s, NodeFactory.createLiteral("literal", "", null)),
+ new Triple(n1, s, NodeFactory.createLiteral("notBNode", "", null)),
});
TestUtil.assertIteratorValues(this, infgraph.find(n2, s, null),
new Triple[] {
- new Triple(n2, s, Node.createLiteral("notLiteral", "", null)),
- new Triple(n2, s, Node.createLiteral("notBNode", "", null)),
+ new Triple(n2, s, NodeFactory.createLiteral("notLiteral", "", null)),
+ new Triple(n2, s, NodeFactory.createLiteral("notBNode", "", null)),
});
TestUtil.assertIteratorValues(this, infgraph.find(n3, s, null),
new Triple[] {
- new Triple(n3, s, Node.createLiteral("notLiteral", "", null)),
- new Triple(n3, s, Node.createLiteral("bNode", "", null)),
+ new Triple(n3, s, NodeFactory.createLiteral("notLiteral", "", null)),
+ new Triple(n3, s, NodeFactory.createLiteral("bNode", "", null)),
});
// Data type checking
@@ -815,33 +815,33 @@ public class TestFBRules extends TestCas
"";
data = Factory.createGraphMem();
data.add(new Triple(n1, p, Util.makeIntNode(3)) );
- data.add(new Triple(n2, p, Node.createLiteral("foo", "", null)) );
- data.add(new Triple(n3, p, Node.createLiteral("foo", "", XSDDatatype.XSDstring)) );
+ data.add(new Triple(n2, p, NodeFactory.createLiteral("foo", "", null)) );
+ data.add(new Triple(n3, p, NodeFactory.createLiteral("foo", "", XSDDatatype.XSDstring)) );
data.add(new Triple(n4, p, n4));
- data.add(new Triple(n5, p, Node.createLiteral("-1", "", XSDDatatype.XSDnonNegativeInteger)) );
+ data.add(new Triple(n5, p, NodeFactory.createLiteral("-1", "", XSDDatatype.XSDnonNegativeInteger)) );
infgraph = createInfGraph(rules, data);
TestUtil.assertIteratorValues(this, infgraph.find(null, s, null),
new Triple[] {
- new Triple(n1, s, Node.createLiteral("isLiteral", "", null)),
- new Triple(n1, s, Node.createLiteral("isXSDInt", "", null)),
- new Triple(n1, s, Node.createLiteral("notXSDString", "", null)),
+ new Triple(n1, s, NodeFactory.createLiteral("isLiteral", "", null)),
+ new Triple(n1, s, NodeFactory.createLiteral("isXSDInt", "", null)),
+ new Triple(n1, s, NodeFactory.createLiteral("notXSDString", "", null)),
- new Triple(n2, s, Node.createLiteral("isLiteral", "", null)),
- new Triple(n2, s, Node.createLiteral("notXSDInt", "", null)),
- new Triple(n2, s, Node.createLiteral("isXSDString", "", null)),
+ new Triple(n2, s, NodeFactory.createLiteral("isLiteral", "", null)),
+ new Triple(n2, s, NodeFactory.createLiteral("notXSDInt", "", null)),
+ new Triple(n2, s, NodeFactory.createLiteral("isXSDString", "", null)),
- new Triple(n3, s, Node.createLiteral("isLiteral", "", null)),
- new Triple(n3, s, Node.createLiteral("notXSDInt", "", null)),
- new Triple(n3, s, Node.createLiteral("isXSDString", "", null)),
+ new Triple(n3, s, NodeFactory.createLiteral("isLiteral", "", null)),
+ new Triple(n3, s, NodeFactory.createLiteral("notXSDInt", "", null)),
+ new Triple(n3, s, NodeFactory.createLiteral("isXSDString", "", null)),
- new Triple(n4, s, Node.createLiteral("notLiteral", "", null)),
- new Triple(n4, s, Node.createLiteral("notXSDInt", "", null)),
- new Triple(n4, s, Node.createLiteral("notXSDString", "", null)),
+ new Triple(n4, s, NodeFactory.createLiteral("notLiteral", "", null)),
+ new Triple(n4, s, NodeFactory.createLiteral("notXSDInt", "", null)),
+ new Triple(n4, s, NodeFactory.createLiteral("notXSDString", "", null)),
- new Triple(n5, s, Node.createLiteral("notLiteral", "", null)),
- new Triple(n5, s, Node.createLiteral("notXSDInt", "", null)),
- new Triple(n5, s, Node.createLiteral("notXSDString", "", null)),
+ new Triple(n5, s, NodeFactory.createLiteral("notLiteral", "", null)),
+ new Triple(n5, s, NodeFactory.createLiteral("notXSDInt", "", null)),
+ new Triple(n5, s, NodeFactory.createLiteral("notXSDString", "", null)),
});
// Literal counting
@@ -883,14 +883,14 @@ public class TestFBRules extends TestCas
"[r1: (?x p ?y) strConcat(?z) -> (?x q ?z) ] \n" +
"[r2: (?x p ?y) uriConcat('http://jena.hpl.hp.com/test#', ?y, ?z) -> (?x q ?z) ]";
Graph data = Factory.createGraphMem();
- data.add(new Triple(n1, p, Node.createLiteral("test")) );
+ data.add(new Triple(n1, p, NodeFactory.createLiteral("test")) );
InfGraph infgraph = createInfGraph(rules, data);
TestUtil.assertIteratorValues(this, infgraph.find(null, q, null),
new Triple[] {
- new Triple(n1, q, Node.createLiteral("testhttp://www.w3.org/1999/02/22-rdf-syntax-ns#typefoo")),
- new Triple(n1, q, Node.createLiteral("")),
- new Triple(n1, q, Node.createURI("http://jena.hpl.hp.com/test#test")),
+ new Triple(n1, q, NodeFactory.createLiteral("testhttp://www.w3.org/1999/02/22-rdf-syntax-ns#typefoo")),
+ new Triple(n1, q, NodeFactory.createLiteral("")),
+ new Triple(n1, q, NodeFactory.createURI("http://jena.hpl.hp.com/test#test")),
});
rules =
@@ -898,16 +898,16 @@ public class TestFBRules extends TestCas
"[r2: (?x p ?y) regex(?y, '(.*)\\\\s(.*) (f.*)', ?m1, ?m2, ?m3) -> (?x r ?m2) ] \n" +
"";
data = Factory.createGraphMem();
- data.add(new Triple(n1, p, Node.createLiteral("foo bar foo")) );
- data.add(new Triple(n2, p, Node.createLiteral("foo bar baz")) );
+ data.add(new Triple(n1, p, NodeFactory.createLiteral("foo bar foo")) );
+ data.add(new Triple(n2, p, NodeFactory.createLiteral("foo bar baz")) );
infgraph = createInfGraph(rules, data);
TestUtil.assertIteratorValues(this, infgraph.find(null, q, null),
new Triple[] {
- new Triple(n1, q, Node.createLiteral("ok")),
+ new Triple(n1, q, NodeFactory.createLiteral("ok")),
});
TestUtil.assertIteratorValues(this, infgraph.find(null, r, null),
new Triple[] {
- new Triple(n1, r, Node.createLiteral("bar")),
+ new Triple(n1, r, NodeFactory.createLiteral("bar")),
});
}
@@ -919,14 +919,14 @@ public class TestFBRules extends TestCas
"[r2: (?x p ?y) regex(?y, '((Boys)|(Girls))(.*)', ?m1, ?m2, ?m3, ?m4) -> (?x q ?m2) (?x r ?m3) (?x s ?m4) ] \n" +
"";
Graph data = Factory.createGraphMem();
- data.add(new Triple(n1, p, Node.createLiteral("Girls44")) );
+ data.add(new Triple(n1, p, NodeFactory.createLiteral("Girls44")) );
InfGraph infgraph = createInfGraph(rules, data);
infgraph.prepare();
TestUtil.assertIteratorValues(this, infgraph.getDeductionsGraph().find(null, null, null),
new Triple[] {
- new Triple(n1, q, Node.createLiteral("")),
- new Triple(n1, r, Node.createLiteral("Girls")),
- new Triple(n1, s, Node.createLiteral("44")),
+ new Triple(n1, q, NodeFactory.createLiteral("")),
+ new Triple(n1, r, NodeFactory.createLiteral("Girls")),
+ new Triple(n1, s, NodeFactory.createLiteral("44")),
});
}
@@ -988,7 +988,7 @@ public class TestFBRules extends TestCas
Graph data = premisesM.getGraph();
Reasoner reasoner = new OWLFBRuleReasoner(OWLFBRuleReasonerFactory.theInstance());
InfGraph infgraph = reasoner.bind(data);
- Node rbPrototypeProp = Node.createURI(ReasonerVocabulary.RBNamespace+"prototype");
+ Node rbPrototypeProp = NodeFactory.createURI(ReasonerVocabulary.RBNamespace+"prototype");
int count = 0;
for (Iterator<Triple> i = infgraph.find(null, rbPrototypeProp, null); i.hasNext(); ) {
Object t = i.next();
@@ -1025,14 +1025,14 @@ public class TestFBRules extends TestCas
assertNotSame( getSkolem(a, Util.makeIntNode(42)),
getSkolem(a, Util.makeIntNode(43)) );
- assertNotSame( getSkolem(a, Node.createLiteral("foo")),
- getSkolem(a, Node.createLiteral("foo", "en", false)) );
+ assertNotSame( getSkolem(a, NodeFactory.createLiteral("foo")),
+ getSkolem(a, NodeFactory.createLiteral("foo", "en", false)) );
- assertEquals( getSkolem(Node.createLiteral("foo")),
- getSkolem(Node.createLiteral("foo")));
+ assertEquals( getSkolem(NodeFactory.createLiteral("foo")),
+ getSkolem(NodeFactory.createLiteral("foo")));
- assertNotSame( getSkolem(Node.createLiteral("foo")),
- getSkolem(Node.createLiteral("bar")));
+ assertNotSame( getSkolem(NodeFactory.createLiteral("foo")),
+ getSkolem(NodeFactory.createLiteral("bar")));
}
private Node getSkolem(Node x, Node y) {
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestGenericRules.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestGenericRules.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestGenericRules.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestGenericRules.java Sun Mar 17 17:41:52 2013
@@ -21,7 +21,7 @@ package com.hp.hpl.jena.reasoner.rulesys
import com.hp.hpl.jena.rdf.model.*;
import com.hp.hpl.jena.reasoner.*;
import com.hp.hpl.jena.reasoner.rulesys.*;
-import com.hp.hpl.jena.reasoner.rulesys.GenericRuleReasoner.RuleMode;
+import com.hp.hpl.jena.reasoner.rulesys.GenericRuleReasoner.RuleMode ;
import com.hp.hpl.jena.reasoner.test.TestUtil;
import com.hp.hpl.jena.util.FileManager;
import com.hp.hpl.jena.util.LocationMapper;
@@ -50,18 +50,18 @@ public class TestGenericRules extends Te
protected static Logger logger = LoggerFactory.getLogger(TestFBRules.class);
// Useful constants
- Node p = Node.createURI("p");
- Node q = Node.createURI("q");
- Node r = Node.createURI("r");
- Node s = Node.createURI("s");
- Node t = Node.createURI("t");
- Node a = Node.createURI("a");
- Node b = Node.createURI("b");
- Node c = Node.createURI("c");
- Node d = Node.createURI("d");
- Node C1 = Node.createURI("C1");
- Node C2 = Node.createURI("C2");
- Node C3 = Node.createURI("C3");
+ Node p = NodeFactory.createURI("p");
+ Node q = NodeFactory.createURI("q");
+ Node r = NodeFactory.createURI("r");
+ Node s = NodeFactory.createURI("s");
+ Node t = NodeFactory.createURI("t");
+ Node a = NodeFactory.createURI("a");
+ Node b = NodeFactory.createURI("b");
+ Node c = NodeFactory.createURI("c");
+ Node d = NodeFactory.createURI("d");
+ Node C1 = NodeFactory.createURI("C1");
+ Node C2 = NodeFactory.createURI("C2");
+ Node C3 = NodeFactory.createURI("C3");
Node ty = RDF.Nodes.type;
Node sC = RDFS.Nodes.subClassOf;
@@ -253,9 +253,9 @@ public class TestGenericRules extends Te
reasoner = (GenericRuleReasoner)GenericRuleReasonerFactory.theInstance().create(configuration);
infgraph = reasoner.bind(Factory.createGraphMem());
- Node an = Node.createURI(PrintUtil.egNS + "a");
- Node C = Node.createURI(PrintUtil.egNS + "C");
- Node D = Node.createURI(PrintUtil.egNS + "D");
+ Node an = NodeFactory.createURI(PrintUtil.egNS + "a");
+ Node C = NodeFactory.createURI(PrintUtil.egNS + "C");
+ Node D = NodeFactory.createURI(PrintUtil.egNS + "D");
TestUtil.assertIteratorValues(this,
infgraph.find(null, null, null), new Object[] {
new Triple(an, RDF.Nodes.type, C),
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestLPDerivation.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestLPDerivation.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestLPDerivation.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestLPDerivation.java Sun Mar 17 17:41:52 2013
@@ -22,11 +22,7 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
-import com.hp.hpl.jena.graph.Factory;
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.Triple;
-import com.hp.hpl.jena.graph.TripleMatch;
+import com.hp.hpl.jena.graph.* ;
import com.hp.hpl.jena.reasoner.Derivation;
import com.hp.hpl.jena.reasoner.InfGraph;
import com.hp.hpl.jena.reasoner.rulesys.FBRuleInfGraph;
@@ -60,15 +56,15 @@ public class TestLPDerivation extends Te
}
// Useful constants
- Node p = Node.createURI("p");
- Node q = Node.createURI("q");
- Node r = Node.createURI("r");
- Node s = Node.createURI("s");
- Node a = Node.createURI("a");
- Node b = Node.createURI("b");
- Node c = Node.createURI("c");
- Node d = Node.createURI("d");
- Node e = Node.createURI("e");
+ Node p = NodeFactory.createURI("p");
+ Node q = NodeFactory.createURI("q");
+ Node r = NodeFactory.createURI("r");
+ Node s = NodeFactory.createURI("s");
+ Node a = NodeFactory.createURI("a");
+ Node b = NodeFactory.createURI("b");
+ Node c = NodeFactory.createURI("c");
+ Node d = NodeFactory.createURI("d");
+ Node e = NodeFactory.createURI("e");
/**
* Return an inference graph working over the given rule set and raw data.
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestRDFS9.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestRDFS9.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestRDFS9.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestRDFS9.java Sun Mar 17 17:41:52 2013
@@ -54,16 +54,16 @@ public class TestRDFS9 extends TestCase
* Test a type inheritance example.
*/
public void testRDFSInheritance() {
- Node C1 = Node.createURI("C1");
- Node C2 = Node.createURI("C2");
- Node C3 = Node.createURI("C3");
- Node C4 = Node.createURI("C4");
- Node D = Node.createURI("D");
- Node a = Node.createURI("a");
- Node b = Node.createURI("b");
- Node p = Node.createURI("p");
- Node q = Node.createURI("q");
- Node r = Node.createURI("r");
+ Node C1 = NodeFactory.createURI("C1");
+ Node C2 = NodeFactory.createURI("C2");
+ Node C3 = NodeFactory.createURI("C3");
+ Node C4 = NodeFactory.createURI("C4");
+ Node D = NodeFactory.createURI("D");
+ Node a = NodeFactory.createURI("a");
+ Node b = NodeFactory.createURI("b");
+ Node p = NodeFactory.createURI("p");
+ Node q = NodeFactory.createURI("q");
+ Node r = NodeFactory.createURI("r");
Node sC = RDFS.subClassOf.asNode();
Node ty = RDF.type.asNode();
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestRETE.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestRETE.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestRETE.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestRETE.java Sun Mar 17 17:41:52 2013
@@ -35,20 +35,20 @@ public class TestRETE extends TestCase
Node_RuleVariable x = new Node_RuleVariable("x", 0);
Node_RuleVariable y = new Node_RuleVariable("y", 1);
Node_RuleVariable z = new Node_RuleVariable("z", 2);
- Node p = Node.createURI("p");
- Node q = Node.createURI("q");
- Node a = Node.createURI("a");
- Node b = Node.createURI("b");
- Node c = Node.createURI("c");
- Node d = Node.createURI("d");
- Node e = Node.createURI("e");
- Node r = Node.createURI("r");
- Node s = Node.createURI("s");
- Node n1 = Node.createURI("n1");
- Node n2 = Node.createURI("n2");
- Node n3 = Node.createURI("n3");
- Node n4 = Node.createURI("n4");
- Node res = Node.createURI("res");
+ Node p = NodeFactory.createURI("p");
+ Node q = NodeFactory.createURI("q");
+ Node a = NodeFactory.createURI("a");
+ Node b = NodeFactory.createURI("b");
+ Node c = NodeFactory.createURI("c");
+ Node d = NodeFactory.createURI("d");
+ Node e = NodeFactory.createURI("e");
+ Node r = NodeFactory.createURI("r");
+ Node s = NodeFactory.createURI("s");
+ Node n1 = NodeFactory.createURI("n1");
+ Node n2 = NodeFactory.createURI("n2");
+ Node n3 = NodeFactory.createURI("n3");
+ Node n4 = NodeFactory.createURI("n4");
+ Node res = NodeFactory.createURI("res");
/**
* Boilerplate for junit
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/Matcher.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/Matcher.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/Matcher.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/Matcher.java Sun Mar 17 17:41:52 2013
@@ -25,6 +25,7 @@ import org.slf4j.LoggerFactory ;
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.shared.JenaException ;
@@ -197,7 +198,7 @@ public class Matcher
int counter = 0 ;
@Override
public Node allocate()
- { return Node.createVariable("v"+(counter++)) ; }
+ { return NodeFactory.createVariable("v"+(counter++)) ; }
@Override
public boolean test(Node n) { return n.isBlank() ; }
@Override
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestReasoners.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestReasoners.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestReasoners.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestReasoners.java Sun Mar 17 17:41:52 2013
@@ -69,10 +69,10 @@ public class TestReasoners extends TestC
*/
public void testTransitiveRebind() {
Graph data = Factory.createGraphMem();
- Node C1 = Node.createURI("C1");
- Node C2 = Node.createURI("C2");
- Node C3 = Node.createURI("C3");
- Node C4 = Node.createURI("C4");
+ Node C1 = NodeFactory.createURI("C1");
+ Node C2 = NodeFactory.createURI("C2");
+ Node C3 = NodeFactory.createURI("C3");
+ Node C4 = NodeFactory.createURI("C4");
data.add( new Triple(C1, RDFS.subClassOf.asNode(), C2) );
data.add( new Triple(C2, RDFS.subClassOf.asNode(), C3) );
Reasoner reasoner = TransitiveReasonerFactory.theInstance().create(null);
@@ -92,9 +92,9 @@ public class TestReasoners extends TestC
infgraph.rebind(data2);
// Incremental additions
- Node a = Node.createURI("a");
- Node b = Node.createURI("b");
- Node c = Node.createURI("c");
+ Node a = NodeFactory.createURI("a");
+ Node b = NodeFactory.createURI("b");
+ Node c = NodeFactory.createURI("c");
infgraph.add(new Triple(a, RDFS.subClassOf.asNode(), b));
infgraph.add(new Triple(b, RDFS.subClassOf.asNode(), c));
TestUtil.assertIteratorValues(this,
@@ -110,9 +110,9 @@ public class TestReasoners extends TestC
new Triple(a, RDFS.subClassOf.asNode(), b),
new Triple(a, RDFS.subClassOf.asNode(), c)
} );
- Node p = Node.createURI("p");
- Node q = Node.createURI("q");
- Node r = Node.createURI("r");
+ Node p = NodeFactory.createURI("p");
+ Node q = NodeFactory.createURI("q");
+ Node r = NodeFactory.createURI("r");
infgraph.add(new Triple(p, RDFS.subPropertyOf.asNode(), q));
infgraph.add(new Triple(q, RDFS.subPropertyOf.asNode(), r));
TestUtil.assertIteratorValues(this,
@@ -135,11 +135,11 @@ public class TestReasoners extends TestC
*/
public void testTransitiveRemove() {
Graph data = Factory.createGraphMem();
- Node a = Node.createURI("a");
- Node b = Node.createURI("b");
- Node c = Node.createURI("c");
- Node d = Node.createURI("d");
- Node e = Node.createURI("e");
+ Node a = NodeFactory.createURI("a");
+ Node b = NodeFactory.createURI("b");
+ Node c = NodeFactory.createURI("c");
+ Node d = NodeFactory.createURI("d");
+ Node e = NodeFactory.createURI("e");
Node closedP = RDFS.subClassOf.asNode();
data.add( new Triple(a, RDFS.subClassOf.asNode(), b) );
data.add( new Triple(a, RDFS.subClassOf.asNode(), c) );
@@ -214,11 +214,11 @@ public class TestReasoners extends TestC
*/
public void doTestMetaLevel(ReasonerFactory rf) {
Graph data = Factory.createGraphMem();
- Node c1 = Node.createURI("C1");
- Node c2 = Node.createURI("C2");
- Node c3 = Node.createURI("C3");
- Node p = Node.createURI("p");
- Node q = Node.createURI("q");
+ Node c1 = NodeFactory.createURI("C1");
+ Node c2 = NodeFactory.createURI("C2");
+ Node c3 = NodeFactory.createURI("C3");
+ Node p = NodeFactory.createURI("p");
+ Node q = NodeFactory.createURI("q");
Node sC = RDFS.subClassOf.asNode();
Node sP = RDFS.subPropertyOf.asNode();
Node ty = RDF.type.asNode();
@@ -336,10 +336,10 @@ public class TestReasoners extends TestC
*/
public void testRDFSRebind() {
Graph data = Factory.createGraphMem();
- Node C1 = Node.createURI("C1");
- Node C2 = Node.createURI("C2");
- Node C3 = Node.createURI("C3");
- Node C4 = Node.createURI("C4");
+ Node C1 = NodeFactory.createURI("C1");
+ Node C2 = NodeFactory.createURI("C2");
+ Node C3 = NodeFactory.createURI("C3");
+ Node C4 = NodeFactory.createURI("C4");
data.add( new Triple(C1, RDFS.subClassOf.asNode(), C2) );
data.add( new Triple(C2, RDFS.subClassOf.asNode(), C3) );
Reasoner reasoner = RDFSRuleReasonerFactory.theInstance().create(null);
@@ -442,9 +442,9 @@ public class TestReasoners extends TestC
* Assumes the reasoner can at least implement RDFS subClassOf.
*/
public void doTestFindWithPremises(ReasonerFactory rf) {
- Node c1 = Node.createURI("C1");
- Node c2 = Node.createURI("C2");
- Node c3 = Node.createURI("C3");
+ Node c1 = NodeFactory.createURI("C1");
+ Node c2 = NodeFactory.createURI("C2");
+ Node c3 = NodeFactory.createURI("C3");
Node sC = RDFS.subClassOf.asNode();
Graph data = Factory.createGraphMem();
data.add( new Triple(c2, sC, c3));
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestTransitiveGraphCache.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestTransitiveGraphCache.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestTransitiveGraphCache.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/reasoner/test/TestTransitiveGraphCache.java Sun Mar 17 17:41:52 2013
@@ -21,6 +21,7 @@ package com.hp.hpl.jena.reasoner.test;
import com.hp.hpl.jena.reasoner.transitiveReasoner.TransitiveGraphCache;
import com.hp.hpl.jena.reasoner.TriplePattern;
import com.hp.hpl.jena.graph.Node;
+import com.hp.hpl.jena.graph.NodeFactory ;
import com.hp.hpl.jena.graph.Triple;
import junit.framework.TestCase;
@@ -38,16 +39,16 @@ public class TestTransitiveGraphCache ex
// Dummy predicates and nodes for the graph
String NS = "urn:x-hp-test:ex/";
- Node directP = Node.createURI(NS+"directSubProperty");
- Node closedP = Node.createURI(NS+"subProperty");
+ Node directP = NodeFactory.createURI(NS+"directSubProperty");
+ Node closedP = NodeFactory.createURI(NS+"subProperty");
- Node a = Node.createURI(NS+"a");
- Node b = Node.createURI(NS+"b");
- Node c = Node.createURI(NS+"c");
- Node d = Node.createURI(NS+"d");
- Node e = Node.createURI(NS+"e");
- Node f = Node.createURI(NS+"f");
- Node g = Node.createURI(NS+"g");
+ Node a = NodeFactory.createURI(NS+"a");
+ Node b = NodeFactory.createURI(NS+"b");
+ Node c = NodeFactory.createURI(NS+"c");
+ Node d = NodeFactory.createURI(NS+"d");
+ Node e = NodeFactory.createURI(NS+"e");
+ Node f = NodeFactory.createURI(NS+"f");
+ Node g = NodeFactory.createURI(NS+"g");
/**
* Boilerplate for junit
Modified: jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestXMLFeatures.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestXMLFeatures.java?rev=1457497&r1=1457496&r2=1457497&view=diff
==============================================================================
--- jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestXMLFeatures.java (original)
+++ jena/trunk/jena-core/src/test/java/com/hp/hpl/jena/xmloutput/TestXMLFeatures.java Sun Mar 17 17:41:52 2013
@@ -23,6 +23,7 @@ import java.util.*;
import java.util.regex.Pattern;
import com.hp.hpl.jena.graph.*;
+
import org.apache.jena.iri.*;
import com.hp.hpl.jena.rdf.model.*;
import com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler;
@@ -411,8 +412,8 @@ public class TestXMLFeatures extends XML
// SystemOutAndErr.block();
// TestLogger tl = new TestLogger(BaseXMLWriter.class);
blockLogger();
- Node blank = Node.createAnon();
- Node prop = Node.createURI(s);
+ Node blank = NodeFactory.createAnon();
+ Node prop = NodeFactory.createURI(s);
Graph g = Factory.createGraphMem();
g.add(Triple.create(blank, prop, blank));
// create Model