Author: britter
Date: Thu May 21 06:36:51 2015
New Revision: 1680740
URL: http://svn.apache.org/r1680740
Log:
Utility methods can be static
Modified:
commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/ConditionalFileFilterAbstractTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/IOFileFilterAbstractTestCase.java
Modified:
commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/ConditionalFileFilterAbstractTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/ConditionalFileFilterAbstractTestCase.java?rev=1680740&r1=1680739&r2=1680740&view=diff
==============================================================================
---
commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/ConditionalFileFilterAbstractTestCase.java
(original)
+++
commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/ConditionalFileFilterAbstractTestCase.java
Thu May 21 06:36:51 2015
@@ -38,7 +38,7 @@ public abstract class ConditionalFileFil
@Override
public void setUp() throws Exception {
- this.workingPath =
this.determineWorkingDirectoryPath(this.getWorkingPathNamePropertyKey(),
this.getDefaultWorkingPath());
+ this.workingPath =
determineWorkingDirectoryPath(this.getWorkingPathNamePropertyKey(),
this.getDefaultWorkingPath());
this.file = new File(this.workingPath, TEST_FILE_NAME_PREFIX + 1 +
TEST_FILE_TYPE);
this.trueFilters = new TesterTrueFileFilter[4];
this.falseFilters = new TesterFalseFileFilter[4];
@@ -107,18 +107,18 @@ public abstract class ConditionalFileFil
final IOFileFilter filter = this.buildFilterUsingConstructor(filters);
// Test as a file filter
- this.resetTrueFilters(this.trueFilters);
- this.resetFalseFilters(this.falseFilters);
- this.assertFileFiltering(i, filter, this.file, fileResults);
- this.assertTrueFiltersInvoked(i, trueFilters, trueResults);
- this.assertFalseFiltersInvoked(i, falseFilters, falseResults);
+ resetTrueFilters(this.trueFilters);
+ resetFalseFilters(this.falseFilters);
+ assertFileFiltering(i, filter, this.file, fileResults);
+ assertTrueFiltersInvoked(i, trueFilters, trueResults);
+ assertFalseFiltersInvoked(i, falseFilters, falseResults);
// Test as a filename filter
- this.resetTrueFilters(this.trueFilters);
- this.resetFalseFilters(this.falseFilters);
- this.assertFilenameFiltering(i, filter, this.file, filenameResults);
- this.assertTrueFiltersInvoked(i, trueFilters, trueResults);
- this.assertFalseFiltersInvoked(i, falseFilters, falseResults);
+ resetTrueFilters(this.trueFilters);
+ resetFalseFilters(this.falseFilters);
+ assertFilenameFiltering(i, filter, this.file, filenameResults);
+ assertTrueFiltersInvoked(i, trueFilters, trueResults);
+ assertFalseFiltersInvoked(i, falseFilters, falseResults);
}
}
@@ -140,18 +140,18 @@ public abstract class ConditionalFileFil
final IOFileFilter filter = this.buildFilterUsingAdd(filters);
// Test as a file filter
- this.resetTrueFilters(this.trueFilters);
- this.resetFalseFilters(this.falseFilters);
- this.assertFileFiltering(i, filter, this.file, fileResults);
- this.assertTrueFiltersInvoked(i, trueFilters, trueResults);
- this.assertFalseFiltersInvoked(i, falseFilters, falseResults);
+ resetTrueFilters(this.trueFilters);
+ resetFalseFilters(this.falseFilters);
+ assertFileFiltering(i, filter, this.file, fileResults);
+ assertTrueFiltersInvoked(i, trueFilters, trueResults);
+ assertFalseFiltersInvoked(i, falseFilters, falseResults);
// Test as a filename filter
- this.resetTrueFilters(this.trueFilters);
- this.resetFalseFilters(this.falseFilters);
- this.assertFilenameFiltering(i, filter, this.file, filenameResults);
- this.assertTrueFiltersInvoked(i, trueFilters, trueResults);
- this.assertFalseFiltersInvoked(i, falseFilters, falseResults);
+ resetTrueFilters(this.trueFilters);
+ resetFalseFilters(this.falseFilters);
+ assertFilenameFiltering(i, filter, this.file, filenameResults);
+ assertTrueFiltersInvoked(i, trueFilters, trueResults);
+ assertFalseFiltersInvoked(i, falseFilters, falseResults);
}
}
Modified:
commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/IOFileFilterAbstractTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/IOFileFilterAbstractTestCase.java?rev=1680740&r1=1680739&r2=1680740&view=diff
==============================================================================
---
commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/IOFileFilterAbstractTestCase.java
(original)
+++
commons/proper/io/trunk/src/test/java/org/apache/commons/io/filefilter/IOFileFilterAbstractTestCase.java
Thu May 21 06:36:51 2015
@@ -26,14 +26,14 @@ public abstract class IOFileFilterAbstra
super(name);
}
- public void assertFileFiltering(final int testNumber, final IOFileFilter
filter, final File file, final boolean expected)
+ public static void assertFileFiltering(final int testNumber, final
IOFileFilter filter, final File file, final boolean expected)
throws Exception {
assertEquals(
"test " + testNumber + " Filter(File) " +
filter.getClass().getName() + " not " + expected + " for " + file,
expected, filter.accept(file));
}
- public void assertFilenameFiltering(final int testNumber, final
IOFileFilter filter, final File file, final boolean expected)
+ public static void assertFilenameFiltering(final int testNumber, final
IOFileFilter filter, final File file, final boolean expected)
throws Exception {
// Assumes file has parent and is not passed as null
assertEquals(
@@ -41,7 +41,7 @@ public abstract class IOFileFilterAbstra
expected, filter.accept(file.getParentFile(), file.getName()));
}
- public void assertFiltering(final int testNumber, final IOFileFilter
filter, final File file, final boolean expected)
+ public static void assertFiltering(final int testNumber, final
IOFileFilter filter, final File file, final boolean expected)
throws Exception {
// Note. This only tests the (File, String) version if the parent of
// the File passed in is not null
@@ -60,25 +60,25 @@ public abstract class IOFileFilterAbstra
}
}
- public void assertTrueFiltersInvoked(final int testNumber, final
TesterTrueFileFilter[] filters, final boolean[] invoked) {
+ public static void assertTrueFiltersInvoked(final int testNumber, final
TesterTrueFileFilter[] filters, final boolean[] invoked) {
for (int i = 1; i < filters.length; i++) {
assertEquals("test " + testNumber + " filter " + i + " invoked",
invoked[i - 1], filters[i].isInvoked());
}
}
- public void assertFalseFiltersInvoked(final int testNumber, final
TesterFalseFileFilter[] filters, final boolean[] invoked) {
+ public static void assertFalseFiltersInvoked(final int testNumber, final
TesterFalseFileFilter[] filters, final boolean[] invoked) {
for (int i = 1; i < filters.length; i++) {
assertEquals("test " + testNumber + " filter " + i + " invoked",
invoked[i - 1], filters[i].isInvoked());
}
}
- public File determineWorkingDirectoryPath(final String key, final String
defaultPath) {
+ public static File determineWorkingDirectoryPath(final String key, final
String defaultPath) {
// Look for a system property to specify the working directory
final String workingPathName = System.getProperty(key, defaultPath);
return new File(workingPathName);
}
- public void resetFalseFilters(final TesterFalseFileFilter[] filters) {
+ public static void resetFalseFilters(final TesterFalseFileFilter[]
filters) {
for (final TesterFalseFileFilter filter : filters) {
if (filter != null) {
filter.reset();
@@ -86,7 +86,7 @@ public abstract class IOFileFilterAbstra
}
}
- public void resetTrueFilters(final TesterTrueFileFilter[] filters) {
+ public static void resetTrueFilters(final TesterTrueFileFilter[] filters) {
for (final TesterTrueFileFilter filter : filters) {
if (filter != null) {
filter.reset();
