Author: pottlinger
Date: Fri May 29 22:15:24 2015
New Revision: 1682561
URL: http://svn.apache.org/r1682561
Log:
RAT-204: Unify resource handling.
* Module apache-rat-tasks
** Replace indexOf() with contains.
** Use IOUtils.closeQuietly in finally blocks.
Modified:
creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
creadur/rat/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/AbstractRatAntTaskTest.java
creadur/rat/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
Modified:
creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java?rev=1682561&r1=1682560&r2=1682561&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
(original)
+++
creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
Fri May 29 22:15:24 2015
@@ -18,6 +18,7 @@
*/
package org.apache.rat.anttasks;
+ import org.apache.commons.io.IOUtils;
import org.apache.rat.Defaults;
import org.apache.rat.ReportConfiguration;
import org.apache.rat.analysis.IHeaderMatcher;
@@ -205,9 +206,7 @@ public class Report extends Task {
} catch (RatException e) {
throw new BuildException(e);
} finally {
- if (reportFile != null) {
- FileUtils.close(out);
- }
+ IOUtils.closeQuietly(out);
}
}
Modified:
creadur/rat/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/AbstractRatAntTaskTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/AbstractRatAntTaskTest.java?rev=1682561&r1=1682560&r2=1682561&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/AbstractRatAntTaskTest.java
(original)
+++
creadur/rat/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/AbstractRatAntTaskTest.java
Fri May 29 22:15:24 2015
@@ -16,9 +16,9 @@
*/
package org.apache.rat.anttasks;
-import org.junit.Assert;
+import org.apache.commons.io.IOUtils;
import org.apache.tools.ant.BuildFileTest;
-import org.apache.tools.ant.util.FileUtils;
+import org.junit.Assert;
import java.io.File;
import java.io.FileReader;
@@ -39,7 +39,7 @@ public abstract class AbstractRatAntTask
configureProject(getAntFile().getPath());
}
- protected void assertLogDoesntMatch(String pPattern) {
+ protected void assertLogDoesNotMatch(String pPattern) {
final String log = super.getLog();
Assert.assertFalse("Log matches the pattern: " + pPattern + ", got " +
log,
isMatching(pPattern, log));
@@ -72,7 +72,7 @@ public abstract class AbstractRatAntTask
}
}
} finally {
- FileUtils.close(fr);
+ IOUtils.closeQuietly(fr);
}
}
Modified:
creadur/rat/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java?rev=1682561&r1=1682560&r2=1682561&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
(original)
+++
creadur/rat/trunk/apache-rat-tasks/src/test/java/org/apache/rat/anttasks/ReportTest.java
Fri May 29 22:15:24 2015
@@ -16,16 +16,16 @@
*/
package org.apache.rat.anttasks;
+import org.apache.commons.io.IOUtils;
+import org.apache.tools.ant.BuildException;
+import org.junit.Assert;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
-import org.apache.tools.ant.BuildException;
-
-import org.junit.Assert;
-
public class ReportTest extends AbstractRatAntTaskTest {
private static final File antFile = new
File("src/test/resources/antunit/report-junit.xml").getAbsoluteFile();
@@ -41,28 +41,28 @@ public class ReportTest extends Abstract
public void testWithReportSentToFile() throws Exception {
final File reportFile = new File(getTempDir(), "selftest.report");
- if(!getTempDir().mkdirs() && !getTempDir().isDirectory()) {
+ if (!getTempDir().mkdirs() && !getTempDir().isDirectory()) {
throw new IOException("Could not create temporary directory " +
getTempDir());
}
final String alLine = "AL +\\Q" + getAntFileName() + "\\E";
- if (reportFile.isFile() && !reportFile.delete()) {
+ if (reportFile.isFile() && !reportFile.delete()) {
throw new IOException("Unable to remove report file " +
reportFile);
}
executeTarget("testWithReportSentToFile");
- assertLogDoesntMatch(alLine);
+ assertLogDoesNotMatch(alLine);
Assert.assertTrue("Expected report file " + reportFile,
reportFile.isFile());
assertFileMatches(reportFile, alLine);
}
public void testWithALUnknown() throws Exception {
executeTarget("testWithALUnknown");
- assertLogDoesntMatch("AL +\\Q" + getAntFileName() + "\\E");
+ assertLogDoesNotMatch("AL +\\Q" + getAntFileName() + "\\E");
assertLogMatches("\\!\\?\\?\\?\\?\\? +\\Q" + getAntFileName() + "\\E");
}
public void testCustomMatcher() throws Exception {
executeTarget("testCustomMatcher");
- assertLogDoesntMatch("AL +\\Q" + getAntFileName() + "\\E");
+ assertLogDoesNotMatch("AL +\\Q" + getAntFileName() + "\\E");
assertLogMatches("EXMPL +\\Q" + getAntFileName() + "\\E");
}
@@ -73,7 +73,7 @@ public class ReportTest extends Abstract
} catch (BuildException e) {
final String expect = "You must specify at least one file";
assertTrue("Expected " + expect + ", got " + e.getMessage(),
- e.getMessage().indexOf(expect) != -1);
+ e.getMessage().contains(expect));
}
}
@@ -84,7 +84,7 @@ public class ReportTest extends Abstract
} catch (BuildException e) {
final String expect = "at least one license";
assertTrue("Expected " + expect + ", got " + e.getMessage(),
- e.getMessage().indexOf(expect) != -1);
+ e.getMessage().contains(expect));
}
}
@@ -93,12 +93,21 @@ public class ReportTest extends Abstract
}
private String getFirstLine(File pFile) throws IOException {
- final FileInputStream fis = new FileInputStream(pFile);
- final InputStreamReader reader = new InputStreamReader(fis, "UTF8");
- final BufferedReader breader = new BufferedReader(reader);
- final String result = breader.readLine();
- breader.close();
- return result;
+ FileInputStream fis = null;
+ InputStreamReader reader = null;
+ BufferedReader breader = null;
+ try {
+ fis = new FileInputStream(pFile);
+ reader = new InputStreamReader(fis, "UTF8");
+ breader = new BufferedReader(reader);
+ final String result = breader.readLine();
+ breader.close();
+ return result;
+ } finally {
+ IOUtils.closeQuietly(fis);
+ IOUtils.closeQuietly(reader);
+ IOUtils.closeQuietly(breader);
+ }
}
public void testAddLicenseHeaders() throws Exception {
@@ -106,11 +115,11 @@ public class ReportTest extends Abstract
final File origFile = new File("target/anttasks/it-sources/index.apt");
final String origFirstLine = getFirstLine(origFile);
- assertTrue(origFirstLine.indexOf("--") != -1);
- assertTrue(origFirstLine.indexOf("~~") == -1);
+ assertTrue(origFirstLine.contains("--"));
+ assertFalse(origFirstLine.contains("~~"));
final File modifiedFile = new
File("target/anttasks/it-sources/index.apt.new");
final String modifiedFirstLine = getFirstLine(modifiedFile);
- assertTrue(modifiedFirstLine.indexOf("--") == -1);
- assertTrue(modifiedFirstLine.indexOf("~~") != -1);
+ assertFalse(modifiedFirstLine.contains("--"));
+ assertTrue(modifiedFirstLine.contains("~~"));
}
}
