Return-Path: 
 <jena-commits-return-2763-apmail-incubator-jena-commits-archive=incubator.apache.org@incubator.apache.org>
X-Original-To: apmail-incubator-jena-commits-archive@minotaur.apache.org
Delivered-To: apmail-incubator-jena-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 355ACBCF4
	for <apmail-incubator-jena-commits-archive@minotaur.apache.org>;
 Mon, 16 Jan 2012 18:40:25 +0000 (UTC)
Received: (qmail 62397 invoked by uid 500); 16 Jan 2012 18:40:25 -0000
Delivered-To: apmail-incubator-jena-commits-archive@incubator.apache.org
Received: (qmail 62369 invoked by uid 500); 16 Jan 2012 18:40:24 -0000
Mailing-List: contact jena-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:jena-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:jena-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:jena-commits@incubator.apache.org>
List-Id: <jena-commits.incubator.apache.org>
Reply-To: jena-dev@incubator.apache.org
Delivered-To: mailing list jena-commits@incubator.apache.org
Received: (qmail 62362 invoked by uid 99); 16 Jan 2012 18:40:24 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Jan 2012 18:40:24 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Jan 2012 18:40:21 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 62F6623888FD;
	Mon, 16 Jan 2012 18:40:00 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1232109 - in
 /incubator/jena/Jena2/ARQ/trunk/src/test/java/org/openjena/riot:
 lang/TestLangRdfJson.java out/TestOutputRDFJSON.java
Date: Mon, 16 Jan 2012 18:40:00 -0000
To: jena-commits@incubator.apache.org
From: castagna@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120116184000.62F6623888FD@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: castagna
Date: Mon Jan 16 18:39:59 2012
New Revision: 1232109

URL: http://svn.apache.org/viewvc?rev=1232109&view=rev
Log:
JENA-184

Additional tests, thank you Andy.

Modified:
    incubator/jena/Jena2/ARQ/trunk/src/test/java/org/openjena/riot/lang/TestLangRdfJson.java
    incubator/jena/Jena2/ARQ/trunk/src/test/java/org/openjena/riot/out/TestOutputRDFJSON.java

Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/org/openjena/riot/lang/TestLangRdfJson.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/org/openjena/riot/lang/TestLangRdfJson.java?rev=1232109&r1=1232108&r2=1232109&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/org/openjena/riot/lang/TestLangRdfJson.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/org/openjena/riot/lang/TestLangRdfJson.java Mon Jan 16 18:39:59 2012
@@ -55,7 +55,7 @@ public class TestLangRdfJson extends Bas
 		assertTrue(m.isIsomorphicWith(m2)) ;
 	}
 
-	public void rdfjson_valid_traling_comment()
+	public void rdfjson_valid_trailing_comment()
 	{
 		String s = "{}//Comment" ;
 

Modified: incubator/jena/Jena2/ARQ/trunk/src/test/java/org/openjena/riot/out/TestOutputRDFJSON.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/ARQ/trunk/src/test/java/org/openjena/riot/out/TestOutputRDFJSON.java?rev=1232109&r1=1232108&r2=1232109&view=diff
==============================================================================
--- incubator/jena/Jena2/ARQ/trunk/src/test/java/org/openjena/riot/out/TestOutputRDFJSON.java (original)
+++ incubator/jena/Jena2/ARQ/trunk/src/test/java/org/openjena/riot/out/TestOutputRDFJSON.java Mon Jan 16 18:39:59 2012
@@ -26,6 +26,7 @@ import org.openjena.atlas.json.JSON;
 import org.openjena.atlas.json.JsonObject;
 import org.openjena.atlas.junit.BaseTest;
 import org.openjena.atlas.lib.Sink;
+import org.openjena.atlas.lib.StrUtils ;
 import org.openjena.riot.RiotReader;
 import org.openjena.riot.lang.LangRIOT;
 import org.openjena.riot.lang.SinkTriplesToGraph;
@@ -37,7 +38,12 @@ import com.hp.hpl.jena.sparql.sse.SSE;
 
 public class TestOutputRDFJSON extends BaseTest
 {
-
+    @Test public void rdfjson_00()
+    {
+        // Empty graph
+        test ("(base <http://example/> (graph))") ;
+    }
+    
     @Test public void rdfjson_01()
     {
     	test ("(base <http://example/> (graph (<s> <p> 1)))") ;
@@ -45,11 +51,87 @@ public class TestOutputRDFJSON extends B
 
     @Test public void rdfjson_02()
     {
-    	test ("(base <http://example/> (graph (<s> <p> 1)(<s> <p> 2)))") ;
+        // Different subjects
+    	test ("(base <http://example/> (graph (<s1> <p> 1)(<s> <p> 2)))") ;
+    }
+
+    @Test public void rdfjson_03()
+    {
+        // Same subject, different predicates
+        test ("(base <http://example/> (graph (<s> <p> 1)(<s> <q> 2)))") ;
+    }
+
+    @Test public void rdfjson_04()
+    {
+        // Same subject, same predicates
+        test ("(base <http://example/> (graph (<s> <p> 1)(<s> <p> 2)))") ;
+    }
+
+    @Test public void rdfjson_05()
+    {
+        // Multiple subjects
+        test ("(base <http://example/> (graph ",
+              "(<s> <p> 1)" ,
+              "(<s> <p> 2)" ,
+              "(<s1> <p> 2)" ,
+              "))") ;
+    }
+
+    @Test public void rdfjson_06()
+    {
+        // Blank nodes / subjects
+        test ("(base <http://example/> (graph ",
+              "(_:a <p> 1)" ,
+              "(_:a <p> 2)" ,
+              "(_:b <p> 3)" ,
+              "))") ;
+    }
+    
+    @Test public void rdfjson_07()
+    {
+        // Shared blank node objects
+        test ("(base <http://example/> (graph ",
+              "(<s> <p> _:abc)" ,
+              "(<s> <p> 2)" ,
+              "(<s1> <p> _:abc)" ,
+              "))") ;
     }
+    
+    @Test public void rdfjson_08()
+    {
+        // Shared IRI objects
+        test ("(base <http://example/> (graph ",
+              "(<s> <p> <http://example.org/abc>)" ,
+              "(<s> <p> 2)" ,
+              "(<s1> <p> <http://example.org/abc>)" ,
+              "))") ;
+    }
+    
+    
+    @Test public void rdfjson_09()
+    {
+        // Shared ...
+        test ("(base <http://example/> (graph ",
+              "(_:s <p> <http://example.org/abc>)" ,
+              "(<http://example.org/abc> <p> _:s)" ,
+              "))") ;
+    }
+    @Test public void rdfjson_literals()
+    {
+        // Literals, various
+        test ("(base <http://example/> (graph ",
+             "(<s> <p> 'abc')",
+             "(<s> <p> 'abc'@en)",
+             "(<s> <p> 'abc'^^xsd:string)",
+             "(<s> <p> '1'^^xsd:integer)",
+             "(<s> <p> '1e+100'^^xsd:double)",
+             "(<s> <p> '1.05'^^xsd:decimal)",
+            "))") ;
+    }    
 
-    private void test (String str) 
+    private void test (String... strings) 
     {
+        String str = StrUtils.strjoinNL(strings) ;
         Graph g = SSE.parseGraph(str) ;
         ByteArrayOutputStream bout = serializeAsJSON(g) ;
         parseAsJSON(bout) ; // make sure valid JSON