Return-Path: Delivered-To: apmail-incubator-rat-commits-archive@minotaur.apache.org Received: (qmail 75403 invoked from network); 18 Mar 2011 17:22:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Mar 2011 17:22:37 -0000 Received: (qmail 84969 invoked by uid 500); 18 Mar 2011 17:22:37 -0000 Delivered-To: apmail-incubator-rat-commits-archive@incubator.apache.org Received: (qmail 84936 invoked by uid 500); 18 Mar 2011 17:22:37 -0000 Mailing-List: contact rat-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: rat-dev@incubator.apache.org Delivered-To: mailing list rat-commits@incubator.apache.org Received: (qmail 84908 invoked by uid 99); 18 Mar 2011 17:22:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Mar 2011 17:22:37 +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; Fri, 18 Mar 2011 17:22:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 144CD23888E7; Fri, 18 Mar 2011 17:22:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1082981 - /incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenceAppender.java Date: Fri, 18 Mar 2011 17:22:14 -0000 To: rat-commits@incubator.apache.org From: bodewig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110318172214.144CD23888E7@eris.apache.org> Author: bodewig Date: Fri Mar 18 17:22:13 2011 New Revision: 1082981 URL: http://svn.apache.org/viewvc?rev=1082981&view=rev Log: get rid of redundancy Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenceAppender.java Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenceAppender.java URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenceAppender.java?rev=1082981&r1=1082980&r2=1082981&view=diff ============================================================================== --- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenceAppender.java (original) +++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenceAppender.java Fri Mar 18 17:22:13 2011 @@ -59,6 +59,12 @@ public class TestLicenceAppender extends } } + private static void tryToDelete(File f) throws IOException { + if (f != null && f.exists() && !f.delete()) { + f.deleteOnExit(); + } + } + private static void commonTestTemplate(String relativeName, FileCreator creator, NewFileReader reader) @@ -81,14 +87,8 @@ public class TestLicenceAppender extends } } } finally { - File f = new File(name); - if (f.exists() && !f.delete()) { - f.deleteOnExit(); - } - f = new File(name + ".new"); - if (f.exists() && !f.delete()) { - f.deleteOnExit(); - } + tryToDelete(new File(name)); + tryToDelete(new File(name + ".new")); } } @@ -127,12 +127,8 @@ public class TestLicenceAppender extends newFile = new File(filename + ".new"); assertFalse("No new file should have been written", newFile.exists()); } finally { - if (file.exists() && !file.delete()) { - file.deleteOnExit(); - } - if (newFile.exists() && !newFile.delete()) { - newFile.deleteOnExit(); - } + tryToDelete(file); + tryToDelete(newFile); } }