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 2018/03/09 20:40:59 UTC

[1/3] jena git commit: JENA-1503: Bug in XSDDateTime toString

Repository: jena
Updated Branches:
  refs/heads/master 4590fc1a8 -> c656cf107


JENA-1503: Bug in XSDDateTime toString


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/bd1ee9ed
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/bd1ee9ed
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/bd1ee9ed

Branch: refs/heads/master
Commit: bd1ee9ed2a0aebc055f8b280e31fe087686934c8
Parents: 46e2f56
Author: ajs6f <aj...@apache.org>
Authored: Fri Mar 9 10:19:28 2018 -0500
Committer: ajs6f <aj...@apache.org>
Committed: Fri Mar 9 10:19:28 2018 -0500

----------------------------------------------------------------------
 .../org/apache/jena/datatypes/xsd/XSDDateTime.java    |  3 ++-
 .../org/apache/jena/graph/test/TestTypedLiterals.java | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/bd1ee9ed/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDateTime.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDateTime.java b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDateTime.java
index bb831b6..dfb6a6d 100644
--- a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDateTime.java
+++ b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDateTime.java
@@ -261,11 +261,12 @@ public class XSDDateTime extends AbstractDateTime {
         if ((mask & YEAR_MASK) != 0) {
             int cy = data[CY] ;
             int absCY = Math.abs(cy) ;
+            if ( cy    < 0   )  buff.append('-') ;
             // XSD dateTime requires at least 4 digits for the year field
             if ( absCY < 10  )  buff.append('0') ;
             if ( absCY < 100 )  buff.append('0') ;
             if ( absCY < 1000 ) buff.append('0') ;
-            buff.append(data[CY]);
+            buff.append(absCY);
         } else {
             buff.append("-");
         }

http://git-wip-us.apache.org/repos/asf/jena/blob/bd1ee9ed/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java
index 5bfccf6..2a5616f 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java
@@ -18,6 +18,8 @@
 
 package org.apache.jena.graph.test;
 
+import static org.apache.jena.graph.NodeFactory.createLiteral;
+
 import java.io.FileReader;
 import java.io.IOException;
 import java.math.BigDecimal ;
@@ -989,7 +991,17 @@ public class TestTypedLiterals extends TestCase {
         Node node2 = NodeFactory.createLiteral("http://example/", XSDDatatype.XSDstring) ;
         assertFalse(node1.sameValueAs(node2)) ;
     }
-    
+
+    /**
+     * Test a user error report concerning date/time literals from JENA-1503
+     */
+    public void testDateTimeBug3() {
+        final RDFDatatype XSDdateTime = TypeMapper.getInstance().getSafeTypeByName(XSD.dateTime.getURI());
+        final String testLex = "-0001-02-03T04:05:06";
+        Node n = createLiteral(testLex, XSDdateTime);
+        assertEquals("Got wrong XSDDateTime representation!", testLex, n.getLiteralValue().toString());
+    }
+
     /**
      * Test a user error report concerning date/time literals
      */


[2/3] jena git commit: Using better constant

Posted by an...@apache.org.
Using better constant


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/d715f67e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/d715f67e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/d715f67e

Branch: refs/heads/master
Commit: d715f67e3728913582b35513be7d920d385f97c5
Parents: bd1ee9e
Author: ajs6f <aj...@apache.org>
Authored: Fri Mar 9 11:33:27 2018 -0500
Committer: ajs6f <aj...@apache.org>
Committed: Fri Mar 9 11:33:27 2018 -0500

----------------------------------------------------------------------
 .../test/java/org/apache/jena/graph/test/TestTypedLiterals.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/d715f67e/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java
index 2a5616f..3d2c633 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java
@@ -996,9 +996,8 @@ public class TestTypedLiterals extends TestCase {
      * Test a user error report concerning date/time literals from JENA-1503
      */
     public void testDateTimeBug3() {
-        final RDFDatatype XSDdateTime = TypeMapper.getInstance().getSafeTypeByName(XSD.dateTime.getURI());
         final String testLex = "-0001-02-03T04:05:06";
-        Node n = createLiteral(testLex, XSDdateTime);
+        Node n = createLiteral(testLex, XSDDatatype.XSDdateTime);
         assertEquals("Got wrong XSDDateTime representation!", testLex, n.getLiteralValue().toString());
     }
 


[3/3] jena git commit: JENA-1503: Merge commit 'refs/pull/377/head' of https://github.com/apache/jena

Posted by an...@apache.org.
JENA-1503: Merge commit 'refs/pull/377/head' of https://github.com/apache/jena

This closes #377.


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/c656cf10
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/c656cf10
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/c656cf10

Branch: refs/heads/master
Commit: c656cf10734f4d6316c28e96090588425de8d981
Parents: 4590fc1 d715f67
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Mar 9 20:36:07 2018 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Mar 9 20:36:07 2018 +0000

----------------------------------------------------------------------
 .../org/apache/jena/datatypes/xsd/XSDDateTime.java     |  3 ++-
 .../org/apache/jena/graph/test/TestTypedLiterals.java  | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------