Return-Path: Delivered-To: apmail-hc-commits-archive@www.apache.org Received: (qmail 68338 invoked from network); 20 Mar 2009 02:12:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Mar 2009 02:12:01 -0000 Received: (qmail 98387 invoked by uid 500); 20 Mar 2009 02:12:01 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 98360 invoked by uid 500); 20 Mar 2009 02:12:01 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 98351 invoked by uid 99); 20 Mar 2009 02:12:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Mar 2009 19:12:01 -0700 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; Fri, 20 Mar 2009 02:11:58 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7414B23888D5; Fri, 20 Mar 2009 02:11:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r756305 - in /httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs: TestIdentityDecoder.java TestLengthDelimitedDecoder.java TestLengthDelimitedEncoder.java Date: Fri, 20 Mar 2009 02:11:37 -0000 To: commits@hc.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090320021137.7414B23888D5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sebb Date: Fri Mar 20 02:11:36 2009 New Revision: 756305 URL: http://svn.apache.org/viewvc?rev=756305&view=rev Log: Report file deletion failures Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestIdentityDecoder.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestLengthDelimitedDecoder.java httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestLengthDelimitedEncoder.java Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestIdentityDecoder.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestIdentityDecoder.java?rev=756305&r1=756304&r2=756305&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestIdentityDecoder.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestIdentityDecoder.java Fri Mar 20 02:11:36 2009 @@ -208,9 +208,15 @@ assertEquals("stuff; more stuff; a lot more stuff!", readFromFile(fileHandle)); - fileHandle.delete(); + deleteWithCheck(fileHandle); } + private void deleteWithCheck(File handle){ + if (!handle.delete()){ + System.err.println("Failed to delete: "+handle.getPath()); + } + } + public void testDecodingFileWithBufferedSessionData() throws Exception { ReadableByteChannel channel = new ReadableByteChannelMockup( new String[] {"stuff; ", "more stuff; ", "a lot more stuff!"}, "US-ASCII"); @@ -243,7 +249,7 @@ assertEquals("stuff; more stuff; a lot more stuff!", readFromFile(fileHandle)); - fileHandle.delete(); + deleteWithCheck(fileHandle); } public void testDecodingFileWithOffsetAndBufferedSessionData() throws Exception { @@ -285,7 +291,7 @@ assertEquals("beginning; stuff; more stuff; a lot more stuff!", readFromFile(fileHandle)); - fileHandle.delete(); + deleteWithCheck(fileHandle); } public void testWriteBeyondFileSize() throws Exception { @@ -309,7 +315,7 @@ fail("expected IOException"); } catch(IOException iox) {} - fileHandle.delete(); + deleteWithCheck(fileHandle); } public void testInvalidConstructor() { Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestLengthDelimitedDecoder.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestLengthDelimitedDecoder.java?rev=756305&r1=756304&r2=756305&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestLengthDelimitedDecoder.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestLengthDelimitedDecoder.java Fri Mar 20 02:11:36 2009 @@ -316,9 +316,15 @@ assertEquals("stuff; more stuff; a lot more stuff!", readFromFile(fileHandle)); - fileHandle.delete(); + deleteWithCheck(fileHandle); } + private void deleteWithCheck(File handle){ + if (!handle.delete()){ + System.err.println("Failed to delete: "+handle.getPath()); + } + } + public void testDecodingFileWithBufferedSessionData() throws Exception { ReadableByteChannel channel = new ReadableByteChannelMockup( new String[] {"stuff; ", "more stuff; ", "a lot more stuff!!!"}, "US-ASCII"); @@ -350,7 +356,7 @@ assertEquals("stuff; more stuff; a lot more stuff!", readFromFile(fileHandle)); - fileHandle.delete(); + deleteWithCheck(fileHandle); } public void testDecodingFileWithOffsetAndBufferedSessionData() throws Exception { @@ -392,7 +398,7 @@ assertEquals("beginning; stuff; more stuff; a lot more stuff!", readFromFile(fileHandle)); - fileHandle.delete(); + deleteWithCheck(fileHandle); } public void testWriteBeyondFileSize() throws Exception { @@ -416,7 +422,7 @@ fail("expected IOException"); } catch(IOException iox) {} - fileHandle.delete(); + deleteWithCheck(fileHandle); } public void testCodingBeyondContentLimitFile() throws Exception { @@ -450,7 +456,7 @@ assertTrue(decoder.isCompleted()); assertEquals(16, metrics.getBytesTransferred()); - fileHandle.delete(); + deleteWithCheck(fileHandle); } public void testInvalidConstructor() { Modified: httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestLengthDelimitedEncoder.java URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestLengthDelimitedEncoder.java?rev=756305&r1=756304&r2=756305&view=diff ============================================================================== --- httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestLengthDelimitedEncoder.java (original) +++ httpcomponents/httpcore/trunk/httpcore-nio/src/test/java/org/apache/http/impl/nio/codecs/TestLengthDelimitedEncoder.java Fri Mar 20 02:11:36 2009 @@ -193,9 +193,14 @@ assertTrue(encoder.isCompleted()); assertEquals("stuff;more stuff", s); - tmpFile.delete(); + deleteWithCheck(tmpFile); } + private void deleteWithCheck(File handle){ + if (!handle.delete()){ + System.err.println("Failed to delete: "+handle.getPath()); + } + } public void testCodingEmptyFile() throws Exception { ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -227,7 +232,7 @@ assertTrue(encoder.isCompleted()); assertEquals("stuff;more stuff", s); - tmpFile.delete(); + deleteWithCheck(tmpFile); } public void testCodingCompletedFromFile() throws Exception { @@ -257,7 +262,7 @@ } catch (IllegalStateException ex) { // ignore } finally { - tmpFile.delete(); + deleteWithCheck(tmpFile); } } @@ -290,7 +295,7 @@ assertTrue(encoder.isCompleted()); assertEquals("stuff;more stuff", s); - tmpFile.delete(); + deleteWithCheck(tmpFile); } public void testInvalidConstructor() {