You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by bo...@apache.org on 2011/03/18 18:22:14 UTC
svn commit: r1082981 -
/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenceAppender.java
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);
}
}