Return-Path: Delivered-To: apmail-sling-commits-archive@www.apache.org Received: (qmail 23584 invoked from network); 10 Mar 2010 16:23:18 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 10 Mar 2010 16:23:18 -0000 Received: (qmail 49678 invoked by uid 500); 10 Mar 2010 16:22:48 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 49618 invoked by uid 500); 10 Mar 2010 16:22:48 -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 49611 invoked by uid 99); 10 Mar 2010 16:22:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Mar 2010 16:22:48 +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; Wed, 10 Mar 2010 16:22:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A517A23889E9; Wed, 10 Mar 2010 16:22:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r921430 - /sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java Date: Wed, 10 Mar 2010 16:22:24 -0000 To: commits@sling.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100310162224.A517A23889E9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bdelacretaz Date: Wed Mar 10 16:22:24 2010 New Revision: 921430 URL: http://svn.apache.org/viewvc?rev=921430&view=rev Log: Fix test, failed when testing against Sling mounted at / Modified: sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java Modified: sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java?rev=921430&r1=921429&r2=921430&view=diff ============================================================================== --- sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java (original) +++ sling/trunk/launchpad/testing/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java Wed Mar 10 16:22:24 2010 @@ -131,8 +131,10 @@ public class JsonRenderingTest extends H System.err.println("Url: " + url + "\npostUrl: " + postUrl); // Get the resource url. (everything after the port) // We skip http://localhost:8888/org.apache.sling.launchpad.testing-6-SNAPSHOT/ + // or http://localhost:8888/ String resourceUrl = url; - for (int i = 4;i>0;i--) { + final int toSkip = resourceUrl.contains("/org.apache.sling.launchpad") ? 4 : 3; + for (int i = toSkip;i>0;i--) { resourceUrl = resourceUrl.substring(resourceUrl.indexOf("/") + 1); } for (int i = 10; i >=0; i--) {