Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 92707 invoked from network); 4 Jan 2011 10:46:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Jan 2011 10:46:28 -0000 Received: (qmail 5735 invoked by uid 500); 4 Jan 2011 10:46:28 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 5675 invoked by uid 500); 4 Jan 2011 10:46:26 -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 5668 invoked by uid 99); 4 Jan 2011 10:46:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jan 2011 10:46:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 04 Jan 2011 10:46:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id ADA8523889B2; Tue, 4 Jan 2011 10:46:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1054965 - /sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java Date: Tue, 04 Jan 2011 10:46:04 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110104104604.ADA8523889B2@eris.apache.org> Author: cziegeler Date: Tue Jan 4 10:46:04 2011 New Revision: 1054965 URL: http://svn.apache.org/viewvc?rev=1054965&view=rev Log: Fix test cases. Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java Modified: sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java?rev=1054965&r1=1054964&r2=1054965&view=diff ============================================================================== --- sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java (original) +++ sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java Tue Jan 4 10:46:04 2011 @@ -17,8 +17,6 @@ package org.apache.sling.launchpad.webapp.integrationtest; import java.io.IOException; -import java.util.HashMap; -import java.util.Map; import org.apache.sling.commons.testing.integration.NameValuePairList; import org.apache.sling.servlets.post.SlingPostConstants; @@ -29,7 +27,7 @@ import org.apache.sling.servlets.post.Sl public class PropertyRenderingTest extends RenderingTestBase { private String slingResourceType; - + private String testMultiText1; private String testMultiText2; @@ -41,12 +39,12 @@ public class PropertyRenderingTest exten testText = "This is a test " + System.currentTimeMillis(); testMultiText1 = "This is a multivalued test " + System.currentTimeMillis(); testMultiText2 = "This is another multivalued test " + System.currentTimeMillis(); - + slingResourceType = getClass().getName(); // create the test node, under a path that's specific to this class to allow collisions final String url = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis() + SlingPostConstants.DEFAULT_CREATE_SUFFIX; - + NameValuePairList list = new NameValuePairList(); list.add("sling:resourceType", slingResourceType); list.add("text", testText); @@ -78,7 +76,7 @@ public class PropertyRenderingTest exten } public void testTextNoExt() throws IOException { - final String data = getContent(displayUrl + "/text", null); + final String data = getContent(displayUrl + "/text", CONTENT_TYPE_PLAIN); assertEquals(testText, data); } @@ -105,7 +103,7 @@ public class PropertyRenderingTest exten } public void testResourceTypeNoExt() throws IOException { - final String data = getContent(displayUrl + "/sling:resourceType", null); + final String data = getContent(displayUrl + "/sling:resourceType", CONTENT_TYPE_PLAIN); assertEquals(slingResourceType, data); } } \ No newline at end of file