Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6E4DA6A7E for ; Tue, 2 Aug 2011 13:45:40 +0000 (UTC) Received: (qmail 97504 invoked by uid 500); 2 Aug 2011 13:45:40 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 97410 invoked by uid 500); 2 Aug 2011 13:45:39 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 97403 invoked by uid 99); 2 Aug 2011 13:45:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Aug 2011 13:45:38 +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; Tue, 02 Aug 2011 13:45:36 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B782623888E4; Tue, 2 Aug 2011 13:45:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1153123 - in /jackrabbit/sandbox/microkernel/src: main/java/org/apache/jackrabbit/mk/json/JsopBuilder.java test/java/org/apache/jackrabbit/mk/json/JsonBuilderTest.java test/java/org/apache/jackrabbit/mk/json/JsopTest.java Date: Tue, 02 Aug 2011 13:45:14 -0000 To: commits@jackrabbit.apache.org From: thomasm@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110802134514.B782623888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: thomasm Date: Tue Aug 2 13:45:13 2011 New Revision: 1153123 URL: http://svn.apache.org/viewvc?rev=1153123&view=rev Log: JsopBuilder append bugfix Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsopBuilder.java jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/json/JsonBuilderTest.java jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/json/JsopTest.java Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsopBuilder.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsopBuilder.java?rev=1153123&r1=1153122&r2=1153123&view=diff ============================================================================== --- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsopBuilder.java (original) +++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/json/JsopBuilder.java Tue Aug 2 13:45:13 2011 @@ -37,7 +37,6 @@ public class JsopBuilder { */ public JsopBuilder append(String string) { buff.append(string); - needComma = false; return this; } Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/json/JsonBuilderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/json/JsonBuilderTest.java?rev=1153123&r1=1153122&r2=1153123&view=diff ============================================================================== --- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/json/JsonBuilderTest.java (original) +++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/json/JsonBuilderTest.java Tue Aug 2 13:45:13 2011 @@ -40,7 +40,7 @@ import static junit.framework.Assert.ass public class JsonBuilderTest { - @Test + @Test public void jsonBuilder() throws IOException { StringWriter sw = new StringWriter(); @@ -121,8 +121,12 @@ public class JsonBuilderTest { this.objectBuilder = objectBuilder; } - public void startJSON() throws ParseException, IOException {} - public void endJSON() throws ParseException, IOException {} + public void startJSON() throws ParseException, IOException { + // ignore + } + public void endJSON() throws ParseException, IOException { + // ignore + } public boolean startObject() throws ParseException, IOException { if (currentKey != null) { Modified: jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/json/JsopTest.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/json/JsopTest.java?rev=1153123&r1=1153122&r2=1153123&view=diff ============================================================================== --- jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/json/JsopTest.java (original) +++ jackrabbit/sandbox/microkernel/src/test/java/org/apache/jackrabbit/mk/json/JsopTest.java Tue Aug 2 13:45:13 2011 @@ -230,6 +230,14 @@ public class JsopTest extends TestCase { assertEquals("+ {\"foo\":\"bar\",\"int\":3,\"decimal\":3.0," + "\"obj\":{\"boolean\":true,\"null\":null," + "\"arr\":[1,\"42\"]},\"some\":\"more\"}", json); + + buff = new JsopBuilder(); + buff.array(). + object().key("x").value("1").endObject().append("\n"). + object().key("y").value("2").endObject().append("\n"). + endArray(); + json = buff.toString(); + assertEquals("[{\"x\":\"1\"}\n,{\"y\":\"2\"}\n]", json); } public void testEscape() throws IOException {