Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org Received: (qmail 79579 invoked from network); 7 Mar 2008 07:04:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Mar 2008 07:04:04 -0000 Received: (qmail 30102 invoked by uid 500); 7 Mar 2008 07:04:01 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 30055 invoked by uid 500); 7 Mar 2008 07:04:01 -0000 Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sling-dev@incubator.apache.org Delivered-To: mailing list sling-commits@incubator.apache.org Received: (qmail 30046 invoked by uid 99); 7 Mar 2008 07:04:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Mar 2008 23:04:01 -0800 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.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Mar 2008 07:03:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 19DC81A9832; Thu, 6 Mar 2008 23:03:44 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r634564 - /incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpTestBase.java Date: Fri, 07 Mar 2008 07:03:43 -0000 To: sling-commits@incubator.apache.org From: bdelacretaz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080307070344.19DC81A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bdelacretaz Date: Thu Mar 6 23:03:42 2008 New Revision: 634564 URL: http://svn.apache.org/viewvc?rev=634564&view=rev Log: Add content in failure messages when HTTP status is not as expected Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpTestBase.java Modified: incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpTestBase.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpTestBase.java?rev=634564&r1=634563&r2=634564&view=diff ============================================================================== --- incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpTestBase.java (original) +++ incubator/sling/trunk/launchpad/webapp/src/test/java/org/apache/sling/launchpad/webapp/integrationtest/HttpTestBase.java Thu Mar 6 23:03:42 2008 @@ -268,7 +268,8 @@ get.setQueryString(params.toArray(nvp)); } final int status = httpClient.executeMethod(get); - assertEquals("Expected status 200 for " + url,200,status); + final String content = get.getResponseBodyAsString(); + assertEquals("Expected status 200 for " + url + " (content=" + content + ")",200,status); final Header h = get.getResponseHeader("Content-Type"); if(expectedContentType == null) { if(h!=null) { @@ -286,7 +287,7 @@ h.getValue().startsWith(expectedContentType) ); } - return get.getResponseBodyAsString(); + return content; } /** upload rendering test script, and return its URL for future deletion */