Author: pottlinger
Date: Thu May 28 21:38:52 2015
New Revision: 1682341
URL: http://svn.apache.org/r1682341
Log:
RAT-204: Unify resource handling.
* Module: apache-rat-core
** Use IOUtils.closeQuietly() instead of manual try/finally/if !null - Java7
tryWithResources would ease that even more!
** ClaimAggregator: remove unnecessary (un)boxing of integers.
** DirectoryWalker: Avoid possible null access during comparison if files array
is null.
** Inline variables that are initialized just before being returned.
** Refactor test class members to be private
** Remove redundant javadoc elements that are IntelliJ-autogenerated.
Modified:
creadur/rat/trunk/RELEASE_NOTES.txt
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/Report.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/AddLicenseHeaders.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/ReportFormat.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ClaimAggregator.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequiredTest.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequiredTest.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20Test.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20Test.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrightHeaderTest.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/config/AddLicenseHeadersTest.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/config/ReportFormatTest.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/ToNameTransformerTest.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/BinaryGuesserTest.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexerTest.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/header/ArrayCharFilterTest.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/header/FilteringSequenceFactoryTest.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/header/HeaderMatcherTest.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/header/HeaderMatcherWithBeansTest.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/MockXmlWriter.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/writer/XmlWriterUtilsTest.java
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/writer/impl/base/XmlWriterTest.java
Modified: creadur/rat/trunk/RELEASE_NOTES.txt
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/RELEASE_NOTES.txt?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
--- creadur/rat/trunk/RELEASE_NOTES.txt (original)
+++ creadur/rat/trunk/RELEASE_NOTES.txt Thu May 28 21:38:52 2015
@@ -53,6 +53,7 @@ Rat 0.12 (SNAPSHOT)
Furthermore BinaryGuesser falls back to UTF-8 encoding in
case the encoding given via system property (-Dfile.encoding) was not found.
* [RAT-202] - Report layout differs between successful RAT checks and
existence of unapproved files.
* [RAT-203] - Using 'license' in README, source code, javadoc, comments
and site instead of 'licence'; improve terminology to not confuse RAT consumers.
+ * [RAT-204] - Unify resource handling in code and tests, make sure the
resources are properly closed. Apply minor refactorings.
Rat 0.11
========
@@ -265,4 +266,4 @@ Rat 0.3 Notes
* This is the last release with the original hacked together plain test
report.
The new XML reporting code is present but is not yet the default.
* Rat 0.3 is the first release with release notes. All previous releases are
- now consigned to Ancient History. No record of them will be found here.
\ No newline at end of file
+ now consigned to Ancient History. No record of them will be found here.
Modified:
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/Defaults.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/Defaults.java
Thu May 28 21:38:52 2015
@@ -91,18 +91,15 @@ public class Defaults {
public static final String UNAPPROVED_LICENSES_STYLESHEET =
"org/apache/rat/unapproved-licenses.xsl";
public static InputStream getPlainStyleSheet() {
- InputStream result =
Defaults.class.getClassLoader().getResourceAsStream(Defaults.PLAIN_STYLESHEET);
- return result;
+ return
Defaults.class.getClassLoader().getResourceAsStream(Defaults.PLAIN_STYLESHEET);
}
public static InputStream getUnapprovedLicensesStyleSheet() {
- InputStream result =
Defaults.class.getClassLoader().getResourceAsStream(Defaults.UNAPPROVED_LICENSES_STYLESHEET);
- return result;
+ return
Defaults.class.getClassLoader().getResourceAsStream(Defaults.UNAPPROVED_LICENSES_STYLESHEET);
}
public static InputStream getDefaultStyleSheet() {
- InputStream result = getPlainStyleSheet();
- return result;
+ return getPlainStyleSheet();
}
public static IHeaderMatcher createDefaultMatcher() {
Modified:
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/Report.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/Report.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
--- creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/Report.java
(original)
+++ creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/Report.java
Thu May 28 21:38:52 2015
@@ -231,8 +231,7 @@ public class Report {
HelpFormatter f = new HelpFormatter();
String header = "Options";
- StringBuilder footer = new StringBuilder("\n");
- footer.append("NOTE:\n");
+ StringBuilder footer = new StringBuilder("\nNOTE:\n");
footer.append("Rat is really little more than a grep ATM\n");
footer.append("Rat is also rather memory hungry ATM\n");
footer.append("Rat is very basic ATM\n");
Modified:
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/DocumentHeaderAnalyser.java
Thu May 28 21:38:52 2015
@@ -18,13 +18,14 @@
*/
package org.apache.rat.analysis;
-import java.io.IOException;
-import java.io.Reader;
-
+import org.apache.commons.io.IOUtils;
import org.apache.rat.api.Document;
import org.apache.rat.document.IDocumentAnalyser;
import org.apache.rat.document.RatDocumentAnalysisException;
+import java.io.IOException;
+import java.io.Reader;
+
public class DocumentHeaderAnalyser implements IDocumentAnalyser {
private final IHeaderMatcher matcher;
@@ -46,13 +47,7 @@ public class DocumentHeaderAnalyser impl
} catch (RatHeaderAnalysisException e) {
throw new RatDocumentAnalysisException("Cannot analyse header", e);
} finally {
- if (reader != null) {
- try {
- reader.close();
- } catch (IOException e) {
- // SWALLOW
- }
- }
+ IOUtils.closeQuietly(reader);
}
}
Modified:
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/analysis/HeaderCheckWorker.java
Thu May 28 21:38:52 2015
@@ -18,13 +18,14 @@ package org.apache.rat.analysis;
* under the License. *
*/
+import org.apache.commons.io.IOUtils;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.MetaData;
+
import java.io.BufferedReader;
import java.io.IOException;
import java.io.Reader;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
-
/**
* <p>Reads from a stream to check license.</p>
* <p><strong>Note</strong> that this class is not thread safe.</p>
@@ -94,11 +95,7 @@ class HeaderCheckWorker {
} catch (IOException e) {
throw new RatHeaderAnalysisException("Cannot read header for "
+ subject, e);
}
- try {
- reader.close();
- } catch (IOException e) {
- // swallow
- }
+ IOUtils.closeQuietly(reader);
matcher.reset();
}
finished = true;
Modified:
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/annotation/AbstractLicenseAppender.java
Thu May 28 21:38:52 2015
@@ -18,6 +18,8 @@
*/
package org.apache.rat.annotation;
+import org.apache.commons.io.IOUtils;
+
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
@@ -227,11 +229,14 @@ public abstract class AbstractLicenseApp
}
}
} finally {
- writer.close();
+ IOUtils.closeQuietly(writer);
}
if (isForced) {
- document.delete();
+ boolean deleted = document.delete();
+ if (!deleted) {
+ System.err.println("Could not delete original file to prepare
renaming.");
+ }
boolean renamed = newDocument.renameTo(document.getAbsoluteFile());
if (!renamed) {
System.err.println("Failed to rename new file, original file
remains unchanged.");
@@ -254,73 +259,69 @@ public abstract class AbstractLicenseApp
boolean expectsMSVSSF)
throws IOException {
boolean written = false;
+ FileInputStream fis = null;
+ BufferedReader br = null;
try {
- FileInputStream fis = new FileInputStream(document);
- BufferedReader br = null;
- try {
- br = new BufferedReader(new InputStreamReader(new
BOMInputStream(fis)));
-
- if (!expectsHashPling
- && !expectsAtEcho
- && !expectsPackage
- && !expectsXMLDecl
- && !expectsPhpPI
- && !expectsMSVSSF) {
- written = true;
- writer.write(getLicenseHeader(document));
- writer.write(LINE_SEP);
- }
+ fis = new FileInputStream(document);
+ br = new BufferedReader(new InputStreamReader(new
BOMInputStream(fis)));
- String line;
- boolean first = true;
- while ((line = br.readLine()) != null) {
- if (first && expectsHashPling) {
- written = true;
- doFirstLine(document, writer, line, "#!");
- } else if (first && expectsAtEcho) {
- written = true;
- doFirstLine(document, writer, line, "@echo");
- } else if (first && expectsMSVSSF) {
- written = true;
- if ("".equals(line)) {
- line = passThroughReadNext(writer, line, br);
- }
- if (line.startsWith("Microsoft Visual Studio Solution"
- + " File")) {
- line = passThroughReadNext(writer, line, br);
- }
- doFirstLine(document, writer, line, "# Visual ");
- } else {
- writer.write(line);
- writer.write(LINE_SEP);
- }
+ if (!expectsHashPling
+ && !expectsAtEcho
+ && !expectsPackage
+ && !expectsXMLDecl
+ && !expectsPhpPI
+ && !expectsMSVSSF) {
+ written = true;
+ writer.write(getLicenseHeader(document));
+ writer.write(LINE_SEP);
+ }
- if (expectsPackage && line.startsWith("package ")) {
- written = true;
- writer.write(LINE_SEP);
- writer.write(getLicenseHeader(document));
- writer.write(LINE_SEP);
- } else if (expectsXMLDecl && line.startsWith("<?xml ")) {
- written = true;
- writer.write(LINE_SEP);
- writer.write(getLicenseHeader(document));
- writer.write(LINE_SEP);
- } else if (expectsPhpPI && line.startsWith("<?php")) {
- written = true;
- writer.write(LINE_SEP);
- writer.write(getLicenseHeader(document));
- writer.write(LINE_SEP);
+ String line;
+ boolean first = true;
+ while ((line = br.readLine()) != null) {
+ if (first && expectsHashPling) {
+ written = true;
+ doFirstLine(document, writer, line, "#!");
+ } else if (first && expectsAtEcho) {
+ written = true;
+ doFirstLine(document, writer, line, "@echo");
+ } else if (first && expectsMSVSSF) {
+ written = true;
+ if ("".equals(line)) {
+ line = passThroughReadNext(writer, line, br);
+ }
+ if (line.startsWith("Microsoft Visual Studio Solution"
+ + " File")) {
+ line = passThroughReadNext(writer, line, br);
}
- first = false;
+ doFirstLine(document, writer, line, "# Visual ");
+ } else {
+ writer.write(line);
+ writer.write(LINE_SEP);
}
- } finally {
- if (br != null) {
- br.close();
+
+ if (expectsPackage && line.startsWith("package ")) {
+ written = true;
+ writer.write(LINE_SEP);
+ writer.write(getLicenseHeader(document));
+ writer.write(LINE_SEP);
+ } else if (expectsXMLDecl && line.startsWith("<?xml ")) {
+ written = true;
+ writer.write(LINE_SEP);
+ writer.write(getLicenseHeader(document));
+ writer.write(LINE_SEP);
+ } else if (expectsPhpPI && line.startsWith("<?php")) {
+ written = true;
+ writer.write(LINE_SEP);
+ writer.write(getLicenseHeader(document));
+ writer.write(LINE_SEP);
}
- fis.close();
+ first = false;
}
} finally {
- writer.close();
+ IOUtils.closeQuietly(br);
+ IOUtils.closeQuietly(fis);
+ IOUtils.closeQuietly(writer);
}
return written;
}
Modified:
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/AddLicenseHeaders.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/AddLicenseHeaders.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/AddLicenseHeaders.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/AddLicenseHeaders.java
Thu May 28 21:38:52 2015
@@ -21,9 +21,6 @@ package org.apache.rat.config;
/**
* Value of addLicenseHeaders configuration option.
- *
- * @author pottlinger
- * @version 2015-05-11
*/
public enum AddLicenseHeaders {
TRUE, //
Modified:
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/ReportFormat.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/ReportFormat.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/ReportFormat.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/ReportFormat.java
Thu May 28 21:38:52 2015
@@ -19,10 +19,6 @@ package org.apache.rat.config;
* under the License.
*/
-/**
- * @author pottlinger
- * @version 2015-05-18, 19:49
- */
public enum ReportFormat {
PLAIN,
Modified:
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/guesser/BinaryGuesser.java
Thu May 28 21:38:52 2015
@@ -18,6 +18,7 @@
*/
package org.apache.rat.document.impl.guesser;
+import org.apache.commons.io.IOUtils;
import org.apache.rat.api.Document;
import java.io.IOException;
@@ -51,13 +52,7 @@ public class BinaryGuesser {
} catch (IOException e) {
result = false;
} finally {
- try {
- if (stream != null) {
- stream.close();
- }
- } catch (IOException e) {
- // SWALLOW
- }
+ IOUtils.closeQuietly(stream);
}
return result;
}
@@ -182,7 +177,7 @@ public class BinaryGuesser {
public static boolean containsExtension(final String name,
final String[] exts) {
for (int i = 0; i < exts.length; i++) {
- if (name.indexOf(DOT + exts[i] + DOT) >= 0) {
+ if (name.contains(DOT + exts[i] + DOT)) {
return true;
}
}
Modified:
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ClaimAggregator.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ClaimAggregator.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ClaimAggregator.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/claim/impl/ClaimAggregator.java
Thu May 28 21:38:52 2015
@@ -19,13 +19,13 @@
package org.apache.rat.report.claim.impl;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.rat.api.RatException;
import org.apache.rat.api.MetaData;
+import org.apache.rat.api.RatException;
import org.apache.rat.report.claim.ClaimStatistic;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* The aggregator is used to create a numerical statistic
@@ -48,9 +48,9 @@ public class ClaimAggregator extends Abs
if (num == null) {
newNum = 1;
} else {
- newNum = num.intValue() + 1;
+ newNum = num + 1;
}
- pMap.put(pKey, new Integer(newNum));
+ pMap.put(pKey, newNum);
}
@Override
Modified:
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/writer/impl/base/XmlWriter.java
Thu May 28 21:38:52 2015
@@ -557,8 +557,7 @@ public final class XmlWriter implements
}
private boolean isOutOfRange(final char character) {
- final boolean result = !ALLOWED_CHARACTERS[character];
- return result;
+ return !ALLOWED_CHARACTERS[character];
}
/**
@@ -641,13 +640,11 @@ public final class XmlWriter implements
private boolean isValidNameStart(final char character) {
final byte code = CHARACTER_CODES[character];
- final boolean result = (code & NAME_START_MASK) > 0;
- return result;
+ return (code & NAME_START_MASK) > 0;
}
private boolean isValidNameBody(final char character) {
final byte code = CHARACTER_CODES[character];
- final boolean result = (code & NAME_MASK) > 0;
- return result;
+ return (code & NAME_MASK) > 0;
}
}
Modified:
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/DirectoryWalker.java
Thu May 28 21:38:52 2015
@@ -92,8 +92,8 @@ public class DirectoryWalker extends Wal
*/
private void process(final RatReport report, final File file) throws
RatException {
final File[] files = file.listFiles();
- Arrays.sort(files, COMPARATOR);
if (files != null) {
+ Arrays.sort(files, COMPARATOR);
// breadth first traversal
processNonDirectories(report, files);
processDirectories(report, files);
Modified:
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/walker/Walker.java
Thu May 28 21:38:52 2015
@@ -19,12 +19,12 @@
package org.apache.rat.walker;
+import org.apache.rat.report.IReportable;
+
import java.io.File;
import java.io.FilenameFilter;
import java.util.regex.Pattern;
-import org.apache.rat.report.IReportable;
-
/**
* Abstract walker.
*/
@@ -50,9 +50,7 @@ public abstract class Walker implements
}
protected boolean isRestricted(File file) {
- String name = file.getName();
- boolean result = name.startsWith(".");
- return result;
+ return file.getName().startsWith(".");
}
protected final boolean ignored(final File file) {
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequiredTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequiredTest.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequiredTest.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/GeneratedLicenseNotRequiredTest.java
Thu May 28 21:38:52 2015
@@ -31,8 +31,8 @@ import static org.junit.Assert.assertTru
public class GeneratedLicenseNotRequiredTest {
- GeneratedLicenseNotRequired license;
- MockClaimReporter reporter;
+ private GeneratedLicenseNotRequired license;
+ private MockClaimReporter reporter;
@Before
public void setUp() throws Exception {
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequiredTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequiredTest.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequiredTest.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/generation/JavaDocLicenseNotRequiredTest.java
Thu May 28 21:38:52 2015
@@ -15,9 +15,10 @@
* KIND, either express or implied. See the License for the *
* specific language governing permissions and limitations *
* under the License. *
- */
+ */
package org.apache.rat.analysis.generation;
+import org.apache.commons.io.IOUtils;
import org.apache.rat.api.Document;
import org.apache.rat.document.MockLocation;
import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
@@ -34,9 +35,9 @@ import static org.junit.Assert.assertTru
public class JavaDocLicenseNotRequiredTest {
- MockClaimReporter reporter;
- JavaDocLicenseNotRequired license;
-
+ private MockClaimReporter reporter;
+ private JavaDocLicenseNotRequired license;
+
@Before
public void setUp() throws Exception {
license = new JavaDocLicenseNotRequired();
@@ -60,18 +61,22 @@ public class JavaDocLicenseNotRequiredTe
boolean result = readAndMatch("notjavadoc.html");
assertFalse("Not javadocs and so should return null", result);
}
-
+
boolean readAndMatch(String name) throws Exception {
File file = Resources.getResourceFile("javadocs/" + name);
boolean result = false;
- BufferedReader in = new BufferedReader(new FileReader(file));
- String line = in.readLine();
- final Document subject = new MockLocation("subject");
- while (line != null && !result) {
- result = license.match(subject, line);
- line = in.readLine();
+ BufferedReader in = null;
+ try {
+ in = new BufferedReader(new FileReader(file));
+ String line = in.readLine();
+ final Document subject = new MockLocation("subject");
+ while (line != null && !result) {
+ result = license.match(subject, line);
+ line = in.readLine();
+ }
+ } finally {
+ IOUtils.closeQuietly(in);
+ }
+ return result;
}
- in.close();
- return result;
}
-}
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20Test.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20Test.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20Test.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20Test.java
Thu May 28 21:38:52 2015
@@ -29,7 +29,7 @@ import static org.junit.Assert.assertTru
public class ApacheSoftwareLicense20Test {
- MockClaimReporter reporter;
+ private MockClaimReporter reporter;
@Before
public void setUp() throws Exception {
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20Test.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20Test.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20Test.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20Test.java
Thu May 28 21:38:52 2015
@@ -15,12 +15,10 @@
* KIND, either express or implied. See the License for the *
* specific language governing permissions and limitations *
* under the License. *
- */
+ */
package org.apache.rat.analysis.license;
-import java.io.BufferedReader;
-import java.io.StringReader;
-
+import org.apache.commons.io.IOUtils;
import org.apache.rat.api.Document;
import org.apache.rat.document.MockLocation;
import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
@@ -28,6 +26,9 @@ import org.apache.rat.test.utils.Resourc
import org.junit.Before;
import org.junit.Test;
+import java.io.BufferedReader;
+import java.io.StringReader;
+
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -50,9 +51,9 @@ public class AppliedApacheSoftwareLicens
+ " * limitations under the License.\n"
+ " */\n";
- AppliedApacheSoftwareLicense20 license;
-
- MockClaimReporter reporter;
+ private AppliedApacheSoftwareLicense20 license;
+
+ private MockClaimReporter reporter;
@Before
public void setUp() throws Exception {
@@ -78,25 +79,31 @@ public class AppliedApacheSoftwareLicens
@Test
public void noMatch() throws Exception {
- BufferedReader in =
Resources.getBufferedResourceReader("elements/Source.java");
- String line = in.readLine();
- boolean result = false;
- final Document subject = new MockLocation("subject");
- while (line != null) {
- result = license.match(subject, line);
- line = in.readLine();
+ BufferedReader in = null;
+ try {
+ in = Resources.getBufferedResourceReader("elements/Source.java");
+ String line = in.readLine();
+ boolean result = false;
+ final Document subject = new MockLocation("subject");
+ while (line != null) {
+ result = license.match(subject, line);
+ line = in.readLine();
+ }
+ assertFalse("Applied AL2.0 license should not be matched", result);
+ license.reset();
+ } finally {
+ IOUtils.closeQuietly(in);
}
- assertFalse("Applied AL2.0 license should not be matched", result);
- license.reset();
}
- @Test(timeout=2000) // may need to be adjusted if many more files are added
+
+ @Test(timeout = 2000) // may need to be adjusted if many more files are
added
public void goodFiles() throws Exception {
DirectoryScanner.testFilesInDir("appliedAL20/good", license, true);
}
-
- @Test(timeout=2000) // may need to be adjusted if many more files are added
+
+ @Test(timeout = 2000) // may need to be adjusted if many more files are
added
public void baddFiles() throws Exception {
DirectoryScanner.testFilesInDir("appliedAL20/bad", license, false);
}
-
+
}
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrightHeaderTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrightHeaderTest.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrightHeaderTest.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrightHeaderTest.java
Thu May 28 21:38:52 2015
@@ -43,9 +43,9 @@ public class CopyrightHeaderTest {
, "/* Copyright 2013FooBar*/"
, "/* Copyright 2012 2013 FooBar.*/" };
- CopyrightHeader header;
- MockClaimReporter reporter;
- Document subject = new MockLocation("subject");
+ private CopyrightHeader header;
+ private MockClaimReporter reporter;
+ private Document subject = new MockLocation("subject");
@Before
public void setUp() throws Exception {
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/OASISLicenseTest.java
Thu May 28 21:38:52 2015
@@ -15,9 +15,10 @@
* KIND, either express or implied. See the License for the *
* specific language governing permissions and limitations *
* under the License. *
- */
+ */
package org.apache.rat.analysis.license;
+import org.apache.commons.io.IOUtils;
import org.apache.rat.api.Document;
import org.apache.rat.document.MockLocation;
import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
@@ -32,7 +33,7 @@ import static org.junit.Assert.assertFal
import static org.junit.Assert.assertTrue;
public class OASISLicenseTest {
-
+
private static final String LICENSE = "<?xml version=\"1.0\"
encoding=\"UTF-8\"?>\n" +
"<!--\n" +
"\n" +
@@ -52,10 +53,10 @@ public class OASISLicenseTest {
"\n" +
"This document and the information contained herein is provided on
an \"AS IS\" basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED,
INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.\n" +
"-->\n";
-
- OASISLicense license;
-
- MockClaimReporter reporter;
+
+ private OASISLicense license;
+
+ private MockClaimReporter reporter;
@Before
public void setUp() throws Exception {
@@ -65,42 +66,52 @@ public class OASISLicenseTest {
@Test
public void match() throws Exception {
- BufferedReader in = new BufferedReader(new StringReader(LICENSE));
- String line = in.readLine();
- boolean result = false;
- final Document subject = new MockLocation("subject");
- while (line != null) {
- result = license.match(subject, line);
- line = in.readLine();
+ BufferedReader in = null;
+ try {
+ in = new BufferedReader(new StringReader(LICENSE));
+ String line = in.readLine();
+ boolean result = false;
+ final Document subject = new MockLocation("subject");
+ while (line != null) {
+ result = license.match(subject, line);
+ line = in.readLine();
+ }
+ assertTrue("OASIS license should be matched", result);
+ license.reset();
+ result = license.match(subject, "New line");
+ assertFalse("After reset, content should build up again", result);
+ } finally {
+ IOUtils.closeQuietly(in);
}
- assertTrue("OASIS license should be matched", result);
- license.reset();
- result = license.match(subject, "New line");
- assertFalse("After reset, content should build up again", result);
}
@Test
public void noMatch() throws Exception {
- BufferedReader in =
Resources.getBufferedResourceReader("elements/Source.java");
- String line = in.readLine();
- boolean result = false;
- final Document subject = new MockLocation("subject");
- while (line != null) {
- result = license.match(subject, line);
- line = in.readLine();
+ BufferedReader in = null;
+ try {
+ in = Resources.getBufferedResourceReader("elements/Source.java");
+ String line = in.readLine();
+ boolean result = false;
+ final Document subject = new MockLocation("subject");
+ while (line != null) {
+ result = license.match(subject, line);
+ line = in.readLine();
+ }
+ assertFalse("OASIS license should not be matched", result);
+ license.reset();
+ } finally {
+ IOUtils.closeQuietly(in);
}
- assertFalse("OASIS license should not be matched", result);
- license.reset();
}
-
- @Test(timeout=2000) // may need to be adjusted if many more files are added
+
+ @Test(timeout = 2000) // may need to be adjusted if many more files are
added
public void goodFiles() throws Exception {
DirectoryScanner.testFilesInDir("oasis/good", license, true);
}
-
- @Test(timeout=2000) // may need to be adjusted if many more files are added
+
+ @Test(timeout = 2000) // may need to be adjusted if many more files are
added
public void baddFiles() throws Exception {
DirectoryScanner.testFilesInDir("oasis/bad", license, false);
}
-
+
}
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/analysis/license/W3CLicenseTest.java
Thu May 28 21:38:52 2015
@@ -38,8 +38,8 @@ public class W3CLicenseTest {
public static final String COPYRIGHT_URL_XML
= "<!--
http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231 -->";
- W3CLicense license;
- MockClaimReporter reporter;
+ private W3CLicense license;
+ private MockClaimReporter reporter;
@Before
public void setUp() throws Exception {
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/annotation/TestLicenseAppender.java
Thu May 28 21:38:52 2015
@@ -18,6 +18,7 @@
*/
package org.apache.rat.annotation;
+import org.apache.commons.io.IOUtils;
import org.apache.rat.test.utils.Resources;
import org.junit.ClassRule;
import org.junit.Test;
@@ -62,9 +63,7 @@ public class TestLicenseAppender {
try {
creator.createFile(w = new FileWriter(fileName));
} finally {
- if (w != null) {
- w.close();
- }
+ IOUtils.closeQuietly(w);
}
}
@@ -91,9 +90,7 @@ public class TestLicenseAppender {
r = new BufferedReader(new FileReader(name + ".new"));
reader.readFile(r);
} finally {
- if (r != null) {
- r.close();
- }
+ IOUtils.closeQuietly(r);
}
} finally {
tryToDelete(new File(name));
@@ -142,28 +139,23 @@ public class TestLicenseAppender {
@Test
public void addLicenseToUnknownFile() throws IOException {
String filename = getTemporaryFileWithName(null);
- File file = null;
- File newFile = null;
- try {
- createTestFile(filename, new FileCreator() {
- public void createFile(Writer writer)
- throws IOException {
- writer.write("Unknown file type\n");
- }
- });
-
- file = new File(filename);
- ApacheV2LicenseAppender appender =
- new ApacheV2LicenseAppender();
- appender.append(file);
+ createTestFile(filename, new FileCreator() {
+ public void createFile(Writer writer)
+ throws IOException {
+ writer.write("Unknown file type\n");
+ }
+ });
- newFile = new File(filename + ".new");
- assertFalse("No new file should have been written",
- newFile.exists());
- } finally {
- tryToDelete(file);
- tryToDelete(newFile);
- }
+ File file = new File(filename);
+ file.deleteOnExit();
+ ApacheV2LicenseAppender appender =
+ new ApacheV2LicenseAppender();
+ appender.append(file);
+
+ File newFile = new File(filename + ".new");
+ newFile.deleteOnExit();
+ assertFalse("No new file should have been written",
+ newFile.exists());
}
@Test
@@ -530,9 +522,7 @@ public class TestLicenseAppender {
}
assertEquals("#if NET_2_0", r.readLine());
} finally {
- if (r != null) {
- r.close();
- }
+ IOUtils.closeQuietly(r);
}
} finally {
tryToDelete(new File(f.getAbsolutePath() + ".new"));
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/config/AddLicenseHeadersTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/config/AddLicenseHeadersTest.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/config/AddLicenseHeadersTest.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/config/AddLicenseHeadersTest.java
Thu May 28 21:38:52 2015
@@ -21,10 +21,6 @@ import org.junit.Test;
import static org.junit.Assert.assertFalse;
-/**
- * @author pottlinger
- * @version 2015-05-17, 21:14
- */
public class AddLicenseHeadersTest {
@Test
public void verifyHelpOptions() {
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/config/ReportFormatTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/config/ReportFormatTest.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/config/ReportFormatTest.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/config/ReportFormatTest.java
Thu May 28 21:38:52 2015
@@ -26,10 +26,6 @@ import java.util.Arrays;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-/**
- * @author pottlinger
- * @version 2015-05-18, 19:52
- */
public class ReportFormatTest {
@Test
public void isANullSafe() {
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java
Thu May 28 21:38:52 2015
@@ -18,17 +18,17 @@
*/
package org.apache.rat.document;
+import org.apache.rat.api.Document;
+import org.apache.rat.api.MetaData;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
-import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
-
public class MockDocument implements Document {
- public Reader reader;
- public String name;
+ private final Reader reader;
+ private final String name;
private final MetaData metaData = new MetaData();
public MockDocument() {
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/ToNameTransformerTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/ToNameTransformerTest.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/ToNameTransformerTest.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/ToNameTransformerTest.java
Thu May 28 21:38:52 2015
@@ -26,7 +26,7 @@ import static org.junit.Assert.assertNul
public class ToNameTransformerTest {
- ToNameTransformer transformer = new ToNameTransformer();
+ private ToNameTransformer transformer = new ToNameTransformer();
@Test
public void transformLocation() {
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/BinaryGuesserTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/BinaryGuesserTest.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/BinaryGuesserTest.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/guesser/BinaryGuesserTest.java
Thu May 28 21:38:52 2015
@@ -18,6 +18,7 @@
*/
package org.apache.rat.document.impl.guesser;
+import org.apache.commons.io.IOUtils;
import org.apache.rat.document.MockDocument;
import org.apache.rat.document.impl.FileDocument;
import org.apache.rat.test.utils.Resources;
@@ -52,7 +53,6 @@ public class BinaryGuesserTest {
"deprecatedtechnology.swf"
);
-
@Test
public void testMatches() {
for (String name : BINARY_FILES) {
@@ -94,16 +94,14 @@ public class BinaryGuesserTest {
System.err.println("Skipping testBinaryWithMalformedInput");
} catch (IOException e) {
if (r != null) {
- r.close();
+ IOUtils.closeQuietly(r);
} else {
throw e; // could not open the second file
}
r = null;
assertTrue("Expected binary for " + doc.getName(),
BinaryGuesser.isBinary(doc));
} finally {
- if (r != null) {
- r.close();
- }
+ IOUtils.closeQuietly(r);
}
}
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexerTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexerTest.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexerTest.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/document/impl/util/DocumentAnalyserMultiplexerTest.java
Thu May 28 21:38:52 2015
@@ -25,9 +25,9 @@ import junit.framework.TestCase;
public class DocumentAnalyserMultiplexerTest extends TestCase {
- DocumentAnalyserMultiplexer multiplexer;
- IDocumentAnalyser[] analysers;
- MockDocument document;
+ private DocumentAnalyserMultiplexer multiplexer;
+ private IDocumentAnalyser[] analysers;
+ private MockDocument document;
@Override
protected void setUp() throws Exception {
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/header/ArrayCharFilterTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/header/ArrayCharFilterTest.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/header/ArrayCharFilterTest.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/header/ArrayCharFilterTest.java
Thu May 28 21:38:52 2015
@@ -27,7 +27,7 @@ import static org.junit.Assert.assertTru
public class ArrayCharFilterTest {
private static final char[] filtered = {'d', 'o', 'a'};
- ArrayCharFilter filter;
+ private ArrayCharFilter filter;
@Before
public void setUp() throws Exception {
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/header/FilteringSequenceFactoryTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/header/FilteringSequenceFactoryTest.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/header/FilteringSequenceFactoryTest.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/header/FilteringSequenceFactoryTest.java
Thu May 28 21:38:52 2015
@@ -28,9 +28,9 @@ import static org.junit.Assert.assertNot
public class FilteringSequenceFactoryTest {
- int capacity;
- FilteringSequenceFactory factory;
- SimpleCharFilter filter;
+ private int capacity;
+ private FilteringSequenceFactory factory;
+ private SimpleCharFilter filter;
@Before
public void setUp() throws Exception {
@@ -75,7 +75,7 @@ public class FilteringSequenceFactoryTes
StringReader reader = new StringReader(INPUT);
CharSequence result = factory.filter(reader);
assertNotNull(result);
- String output = new StringBuffer().append(result).toString();
+ String output = result.toString();
assertEquals("No filtering so input equals output.",
INPUT.substring(0, capacity), output);
}
}
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/header/HeaderMatcherTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/header/HeaderMatcherTest.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/header/HeaderMatcherTest.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/header/HeaderMatcherTest.java
Thu May 28 21:38:52 2015
@@ -30,9 +30,9 @@ import static org.junit.Assert.assertTru
public class HeaderMatcherTest {
- int capacity;
- HeaderMatcher matcher;
- SimpleCharFilter filter;
+ private int capacity;
+ private HeaderMatcher matcher;
+ private SimpleCharFilter filter;
@Before
public void setUp() throws Exception {
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/header/HeaderMatcherWithBeansTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/header/HeaderMatcherWithBeansTest.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/header/HeaderMatcherWithBeansTest.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/header/HeaderMatcherWithBeansTest.java
Thu May 28 21:38:52 2015
@@ -30,10 +30,10 @@ import static org.junit.Assert.assertTru
public class HeaderMatcherWithBeansTest {
- int capacity;
- HeaderMatcher matcher;
- SimpleCharFilter filter;
- HeaderBean[] beans;
+ private int capacity;
+ private HeaderMatcher matcher;
+ private SimpleCharFilter filter;
+ private HeaderBean[] beans;
@Before
public void setUp() throws Exception {
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/MockXmlWriter.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/MockXmlWriter.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/MockXmlWriter.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/MockXmlWriter.java
Thu May 28 21:38:52 2015
@@ -18,19 +18,15 @@
*/
package org.apache.rat.report.xml;
+import org.apache.rat.report.xml.writer.IXmlWriter;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.rat.report.xml.writer.IXmlWriter;
-
public class MockXmlWriter implements IXmlWriter {
- public final List<Object> calls;
-
- public MockXmlWriter() {
- calls = new ArrayList<Object>();
- }
+ public final List<Object> calls = new ArrayList<Object>();
public IXmlWriter attribute(CharSequence name, CharSequence value)
throws IOException {
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportFactoryTest.java
Thu May 28 21:38:52 2015
@@ -41,8 +41,8 @@ public class XmlReportFactoryTest {
private static final Pattern IGNORE_EMPTY =
Pattern.compile(".svn|Empty.txt");
- StringWriter out;
- IXmlWriter writer;
+ private StringWriter out;
+ private IXmlWriter writer;
@Before
public void setUp() throws Exception {
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/XmlReportTest.java
Thu May 28 21:38:52 2015
@@ -45,9 +45,9 @@ import static org.junit.Assert.assertTru
public class XmlReportTest {
private static final Pattern IGNORE = Pattern.compile(".svn");
- StringWriter out;
- IXmlWriter writer;
- RatReport report;
+ private StringWriter out;
+ private IXmlWriter writer;
+ private RatReport report;
@Before
public void setUp() throws Exception {
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/writer/XmlWriterUtilsTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/writer/XmlWriterUtilsTest.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/writer/XmlWriterUtilsTest.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/writer/XmlWriterUtilsTest.java
Thu May 28 21:38:52 2015
@@ -28,8 +28,8 @@ import static org.junit.Assert.assertEqu
public class XmlWriterUtilsTest {
- StringWriter out;
- IXmlWriter writer;
+ private StringWriter out;
+ private IXmlWriter writer;
@Before
public void setUp() throws Exception {
Modified:
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/writer/impl/base/XmlWriterTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/writer/impl/base/XmlWriterTest.java?rev=1682341&r1=1682340&r2=1682341&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/writer/impl/base/XmlWriterTest.java
(original)
+++
creadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/report/xml/writer/impl/base/XmlWriterTest.java
Thu May 28 21:38:52 2015
@@ -34,8 +34,8 @@ public class XmlWriterTest {
private static final char[] ZERO_CHAR = {(char)0};
- XmlWriter writer;
- StringWriter out;
+ private XmlWriter writer;
+ private StringWriter out;
@Before
public void setUp() throws Exception {
