http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java ---------------------------------------------------------------------- diff --git a/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java b/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java index 62c4db0..fb89958 100644 --- a/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java +++ b/jena-core/src/test/java/com/hp/hpl/jena/reasoner/rulesys/test/TestFBRules.java @@ -636,7 +636,7 @@ public class TestFBRules extends TestCase { 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, NodeFactory.createLiteral( "0", "", XSDDatatype.XSDnonNegativeInteger ) } ))); + a, NodeFactory.createLiteral( "0", XSDDatatype.XSDnonNegativeInteger ) } ))); InfGraph infgraph = createInfGraph(rules, data); TestUtil.assertIteratorValues(this, infgraph.find(null, s, null), @@ -713,9 +713,9 @@ public class TestFBRules extends TestCase { // XSD timeDate point comparisons data = Factory.createGraphMem(); XSDDatatype dt = new XSDDatatype("dateTime"); - 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))); + 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), @@ -796,18 +796,18 @@ public class TestFBRules extends TestCase { TestUtil.assertIteratorValues(this, infgraph.find(n1, s, null), new Triple[] { - new Triple(n1, s, NodeFactory.createLiteral("literal", "", null)), - new Triple(n1, s, NodeFactory.createLiteral("notBNode", "", null)), + new Triple(n1, s, NodeFactory.createLiteral("literal")), + new Triple(n1, s, NodeFactory.createLiteral("notBNode")), }); TestUtil.assertIteratorValues(this, infgraph.find(n2, s, null), new Triple[] { - new Triple(n2, s, NodeFactory.createLiteral("notLiteral", "", null)), - new Triple(n2, s, NodeFactory.createLiteral("notBNode", "", null)), + new Triple(n2, s, NodeFactory.createLiteral("notLiteral")), + new Triple(n2, s, NodeFactory.createLiteral("notBNode")), }); TestUtil.assertIteratorValues(this, infgraph.find(n3, s, null), new Triple[] { - new Triple(n3, s, NodeFactory.createLiteral("notLiteral", "", null)), - new Triple(n3, s, NodeFactory.createLiteral("bNode", "", null)), + new Triple(n3, s, NodeFactory.createLiteral("notLiteral")), + new Triple(n3, s, NodeFactory.createLiteral("bNode")), }); // Data type checking @@ -821,33 +821,33 @@ public class TestFBRules extends TestCase { ""; data = Factory.createGraphMem(); data.add(new Triple(n1, p, Util.makeIntNode(3)) ); - 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(n2, p, NodeFactory.createLiteral("foo")) ); + data.add(new Triple(n3, p, NodeFactory.createLiteral("foo", XSDDatatype.XSDstring)) ); data.add(new Triple(n4, p, n4)); - data.add(new Triple(n5, p, NodeFactory.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, NodeFactory.createLiteral("isLiteral", "", null)), - new Triple(n1, s, NodeFactory.createLiteral("isXSDInt", "", null)), - new Triple(n1, s, NodeFactory.createLiteral("notXSDString", "", null)), + new Triple(n1, s, NodeFactory.createLiteral("isLiteral")), + new Triple(n1, s, NodeFactory.createLiteral("isXSDInt")), + new Triple(n1, s, NodeFactory.createLiteral("notXSDString")), - 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(n2, s, NodeFactory.createLiteral("isLiteral")), + new Triple(n2, s, NodeFactory.createLiteral("notXSDInt")), + new Triple(n2, s, NodeFactory.createLiteral("isXSDString")), - 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(n3, s, NodeFactory.createLiteral("isLiteral")), + new Triple(n3, s, NodeFactory.createLiteral("notXSDInt")), + new Triple(n3, s, NodeFactory.createLiteral("isXSDString")), - 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(n4, s, NodeFactory.createLiteral("notLiteral")), + new Triple(n4, s, NodeFactory.createLiteral("notXSDInt")), + new Triple(n4, s, NodeFactory.createLiteral("notXSDString")), - new Triple(n5, s, NodeFactory.createLiteral("notLiteral", "", null)), - new Triple(n5, s, NodeFactory.createLiteral("notXSDInt", "", null)), - new Triple(n5, s, NodeFactory.createLiteral("notXSDString", "", null)), + new Triple(n5, s, NodeFactory.createLiteral("notLiteral")), + new Triple(n5, s, NodeFactory.createLiteral("notXSDInt")), + new Triple(n5, s, NodeFactory.createLiteral("notXSDString")), }); // Literal counting
http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/NodeId.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/NodeId.java b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/NodeId.java index 5dd327e..4e1d537 100644 --- a/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/NodeId.java +++ b/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/NodeId.java @@ -297,23 +297,23 @@ public class NodeId case INTEGER : { long val = IntegerNode.unpack(v) ; - Node n = NodeFactory.createLiteral(Long.toString(val), null, XSDDatatype.XSDinteger) ; + Node n = NodeFactory.createLiteral(Long.toString(val), XSDDatatype.XSDinteger) ; return n ; } case DECIMAL : { BigDecimal d = DecimalNode.unpackAsBigDecimal(v) ; String x = d.toPlainString() ; - return NodeFactory.createLiteral(x, null, XSDDatatype.XSDdecimal) ; + return NodeFactory.createLiteral(x, XSDDatatype.XSDdecimal) ; } case DATETIME : { long val = BitsLong.clear(v, 56, 64) ; String lex = DateTimeNode.unpackDateTime(val) ; - return NodeFactory.createLiteral(lex, null, XSDDatatype.XSDdateTime) ; + return NodeFactory.createLiteral(lex, XSDDatatype.XSDdateTime) ; } case DATE : { long val = BitsLong.clear(v, 56, 64) ; String lex = DateTimeNode.unpackDate(val) ; - return NodeFactory.createLiteral(lex, null, XSDDatatype.XSDdate) ; + return NodeFactory.createLiteral(lex, XSDDatatype.XSDdate) ; } case BOOLEAN : { long val = BitsLong.clear(v, 56, 64) ; http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystem.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystem.java b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystem.java index 1b459db..706aed5 100644 --- a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystem.java +++ b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystem.java @@ -566,7 +566,7 @@ public class T_TransSystem Node s = NodeFactory.createURI("S") ; Node p = NodeFactory.createURI("P"+value) ; // Integer - that gets inlined. - Node o = NodeFactory.createLiteral(Integer.toString(value), null, XSDDatatype.XSDinteger) ; + Node o = NodeFactory.createLiteral(Integer.toString(value), XSDDatatype.XSDinteger) ; return new Quad(g,s,p,o) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystemMultiDatasets.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystemMultiDatasets.java b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystemMultiDatasets.java index 1acfc68..185b49e 100644 --- a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystemMultiDatasets.java +++ b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystemMultiDatasets.java @@ -520,7 +520,7 @@ public class T_TransSystemMultiDatasets Node g = Quad.defaultGraphNodeGenerated ; // urn:x-arq:DefaultGraphNode Node s = NodeFactory.createURI("S") ; Node p = NodeFactory.createURI("P") ; - Node o = NodeFactory.createLiteral(Integer.toString(value), null, XSDDatatype.XSDinteger) ; + Node o = NodeFactory.createLiteral(Integer.toString(value), XSDDatatype.XSDinteger) ; return new Quad(g,s,p,o) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestNodeId.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestNodeId.java b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestNodeId.java index 279096f..439048a 100644 --- a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestNodeId.java +++ b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestNodeId.java @@ -111,7 +111,7 @@ public class TestNodeId extends BaseTest // Just this once, directly create the Node. @Test public void nodeId_decimal_3() - { test("12.89", NodeFactory.createLiteral("12.89", null, XSDDatatype.XSDdecimal)) ; } + { test("12.89", NodeFactory.createLiteral("12.89", XSDDatatype.XSDdecimal)) ; } @Test public void nodeId_decimal_4() { test("-1.0", NodeFactoryExtra.parseNode("-1.0")) ; } @@ -126,11 +126,11 @@ public class TestNodeId extends BaseTest @Test public void nodeId_decimal_7() { test("'0.00000001'^^xsd:decimal", - NodeFactory.createLiteral("0.00000001", null, XSDDatatype.XSDdecimal)) ; + NodeFactory.createLiteral("0.00000001", XSDDatatype.XSDdecimal)) ; } @Test public void nodeId_decimal_8() - { test("0.00000001", NodeFactory.createLiteral("0.00000001", null, XSDDatatype.XSDdecimal)) ; } + { test("0.00000001", NodeFactory.createLiteral("0.00000001", XSDDatatype.XSDdecimal)) ; } @Test public void nodeId_dateTime_01() { test("'2008-04-28T15:36:15+01:00'^^xsd:dateTime") ; } http://git-wip-us.apache.org/repos/asf/jena/blob/d3d43e9c/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/AbstractTestNodeTable.java ---------------------------------------------------------------------- diff --git a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/AbstractTestNodeTable.java b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/AbstractTestNodeTable.java index dbf787f..dc51167 100644 --- a/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/AbstractTestNodeTable.java +++ b/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/nodetable/AbstractTestNodeTable.java @@ -83,7 +83,7 @@ public abstract class AbstractTestNodeTable extends BaseTest @Test public void nodetable_06() { testNode("'x'^^<http://example/dt>") ; } @Test public void nodetable_07() { testNode("'ÙÙاÙ'") ; } - static Node badNode1 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("abc", "99bad", null) ; + static Node badNode1 = com.hp.hpl.jena.graph.NodeFactory.createLiteral("abc", "99bad") ; @Test public void nodetable_bad_01() { testNodeBad(badNode1) ; } @Test public void nodetable_bad_02()
