Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-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 E58D0CD06 for ; Tue, 14 Aug 2012 06:26:47 +0000 (UTC) Received: (qmail 39304 invoked by uid 500); 14 Aug 2012 06:26:47 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 39200 invoked by uid 500); 14 Aug 2012 06:26:46 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 39170 invoked by uid 99); 14 Aug 2012 06:26:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 Aug 2012 06:26:44 +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, 14 Aug 2012 06:26:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 14F1D2388994; Tue, 14 Aug 2012 06:25:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1372742 - /sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingDefaultValuesTest.java Date: Tue, 14 Aug 2012 06:25:58 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120814062558.14F1D2388994@eris.apache.org> Author: cziegeler Date: Tue Aug 14 06:25:57 2012 New Revision: 1372742 URL: http://svn.apache.org/viewvc?rev=1372742&view=rev Log: Add some tests for arrays and @IgnoreBlanks Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingDefaultValuesTest.java Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingDefaultValuesTest.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingDefaultValuesTest.java?rev=1372742&r1=1372741&r2=1372742&view=diff ============================================================================== --- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingDefaultValuesTest.java (original) +++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingDefaultValuesTest.java Tue Aug 14 06:25:57 2012 @@ -21,6 +21,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.sling.commons.testing.integration.HttpTestBase; +import org.apache.sling.commons.testing.integration.NameValuePairList; import org.apache.sling.servlets.post.SlingPostConstants; /** {#link SlingPropertyValueSetter} sets the value of some properties @@ -61,6 +62,45 @@ public class SlingDefaultValuesTest exte content = getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON); assertJavascript("undefined", content, "out.println(\"\" + data.a)"); + + // check array + NameValuePairList params = new NameValuePairList(); + params.add("x", "1"); + params.add("x", "2"); + params.add("x", "3"); + + testClient.createNode(createdNodeUrl, params, null, false); + content = getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON); + + assertJavascript("123", content, "out.println(data.x)"); + + // check array with empty value + params = new NameValuePairList(); + params.add("x", "1"); + params.add("x", ""); + params.add("x", "3"); + + testClient.createNode(createdNodeUrl, params, null, false); + content = getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON); + + assertJavascript("3.0", content, "out.println(data.x.length)"); + assertJavascript("1", content, "out.println(data.x[0])"); + assertJavascript("", content, "out.println(data.x[1])"); + assertJavascript("3", content, "out.println(data.x[2])"); + + // check array with empty value and ignore blanks + params = new NameValuePairList(); + params.add("x", "1"); + params.add("x", ""); + params.add("x", "3"); + params.add("x@IgnoreBlanks", "true"); + + testClient.createNode(createdNodeUrl, params, null, false); + content = getContent(createdNodeUrl + ".json", CONTENT_TYPE_JSON); + + assertJavascript("2.0", content, "out.println(data.x.length)"); + assertJavascript("1", content, "out.println(data.x[0])"); + assertJavascript("3", content, "out.println(data.x[1])"); } public void testWithSpecificDefault() throws IOException {