You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/05/23 15:10:57 UTC
(commons-io) 02/03: 'this' not needed for these method calls
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
commit a61015c944ffa27891b7b0d653280cfef1dd7963
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Thu May 23 10:46:11 2024 -0400
'this' not needed for these method calls
---
.../java/org/apache/commons/io/FileUtilsTest.java | 2 +-
.../commons/io/IOExceptionWithCauseTest.java | 4 +--
.../org/apache/commons/io/LineIteratorTest.java | 4 +--
.../AbstractConditionalFileFilterTest.java | 32 +++++++++++-----------
.../commons/io/input/BOMInputStreamTest.java | 8 +++---
.../commons/io/input/BrokenInputStreamTest.java | 6 ++--
.../io/input/buffer/CircularByteBufferTest.java | 2 +-
7 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/src/test/java/org/apache/commons/io/FileUtilsTest.java b/src/test/java/org/apache/commons/io/FileUtilsTest.java
index 774646381..94d076412 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsTest.java
@@ -2873,7 +2873,7 @@ public class FileUtilsTest extends AbstractTempDirTest {
file.mkdir();
// Create a cyclic symlink
- this.createCircularSymLink(file);
+ createCircularSymLink(file);
assertEquals(TEST_DIRECTORY_SIZE, FileUtils.sizeOfDirectory(file), "Unexpected directory size");
}
diff --git a/src/test/java/org/apache/commons/io/IOExceptionWithCauseTest.java b/src/test/java/org/apache/commons/io/IOExceptionWithCauseTest.java
index 6f5d7bdbd..b01bc04a3 100644
--- a/src/test/java/org/apache/commons/io/IOExceptionWithCauseTest.java
+++ b/src/test/java/org/apache/commons/io/IOExceptionWithCauseTest.java
@@ -36,7 +36,7 @@ public class IOExceptionWithCauseTest {
public void testIOExceptionStringThrowable() {
final Throwable cause = new IllegalArgumentException("cause");
final IOException exception = new IOException("message", cause);
- this.validate(exception, cause, "message");
+ validate(exception, cause, "message");
}
/**
@@ -47,7 +47,7 @@ public class IOExceptionWithCauseTest {
public void testIOExceptionThrowable() {
final Throwable cause = new IllegalArgumentException("cause");
final IOException exception = new IOException(cause);
- this.validate(exception, cause, "java.lang.IllegalArgumentException: cause");
+ validate(exception, cause, "java.lang.IllegalArgumentException: cause");
}
void validate(final Throwable throwable, final Throwable expectedCause, final String expectedMessage) {
diff --git a/src/test/java/org/apache/commons/io/LineIteratorTest.java b/src/test/java/org/apache/commons/io/LineIteratorTest.java
index 70fd90e5a..9b02cf591 100644
--- a/src/test/java/org/apache/commons/io/LineIteratorTest.java
+++ b/src/test/java/org/apache/commons/io/LineIteratorTest.java
@@ -205,7 +205,7 @@ public class LineIteratorTest {
final List<String> lines = createLinesFile(testFile, encoding, 9);
final Reader reader = new BufferedReader(Files.newBufferedReader(testFile.toPath()));
- this.testFiltering(lines, reader);
+ testFiltering(lines, reader);
}
@Test
@@ -217,7 +217,7 @@ public class LineIteratorTest {
final List<String> lines = createLinesFile(testFile, encoding, 9);
final Reader reader = Files.newBufferedReader(testFile.toPath());
- this.testFiltering(lines, reader);
+ testFiltering(lines, reader);
}
@Test
diff --git a/src/test/java/org/apache/commons/io/filefilter/AbstractConditionalFileFilterTest.java b/src/test/java/org/apache/commons/io/filefilter/AbstractConditionalFileFilterTest.java
index a663e5f69..3a0dbe35a 100644
--- a/src/test/java/org/apache/commons/io/filefilter/AbstractConditionalFileFilterTest.java
+++ b/src/test/java/org/apache/commons/io/filefilter/AbstractConditionalFileFilterTest.java
@@ -60,7 +60,7 @@ public abstract class AbstractConditionalFileFilterTest extends AbstractIOFileFi
@BeforeEach
public void setUp() {
- this.workingPath = determineWorkingDirectoryPath(this.getWorkingPathNamePropertyKey(), this.getDefaultWorkingPath());
+ this.workingPath = determineWorkingDirectoryPath(getWorkingPathNamePropertyKey(), 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];
@@ -75,7 +75,7 @@ public abstract class AbstractConditionalFileFilterTest extends AbstractIOFileFi
@Test
public void testAdd() {
final List<TesterTrueFileFilter> filters = new ArrayList<>();
- final ConditionalFileFilter fileFilter = this.getConditionalFileFilter();
+ final ConditionalFileFilter fileFilter = getConditionalFileFilter();
filters.add(new TesterTrueFileFilter());
filters.add(new TesterTrueFileFilter());
filters.add(new TesterTrueFileFilter());
@@ -93,11 +93,11 @@ public abstract class AbstractConditionalFileFilterTest extends AbstractIOFileFi
@Test
public void testFilterBuiltUsingAdd() {
- final List<List<IOFileFilter>> testFilters = this.getTestFilters();
- final List<boolean[]> testTrueResults = this.getTrueResults();
- final List<boolean[]> testFalseResults = this.getFalseResults();
- final List<Boolean> testFileResults = this.getFileResults();
- final List<Boolean> testFilenameResults = this.getFilenameResults();
+ final List<List<IOFileFilter>> testFilters = getTestFilters();
+ final List<boolean[]> testTrueResults = getTrueResults();
+ final List<boolean[]> testFalseResults = getFalseResults();
+ final List<Boolean> testFileResults = getFileResults();
+ final List<Boolean> testFilenameResults = getFilenameResults();
for (int i = 1; i < testFilters.size(); i++) {
final List<IOFileFilter> filters = testFilters.get(i);
@@ -107,7 +107,7 @@ public abstract class AbstractConditionalFileFilterTest extends AbstractIOFileFi
final boolean fileNameResults = testFilenameResults.get(i);
// Test conditional AND filter created by passing filters to the constructor
- final IOFileFilter filter = this.buildFilterUsingAdd(filters);
+ final IOFileFilter filter = buildFilterUsingAdd(filters);
// Test as a file filter
resetTrueFilters(this.trueFilters);
@@ -127,11 +127,11 @@ public abstract class AbstractConditionalFileFilterTest extends AbstractIOFileFi
@Test
public void testFilterBuiltUsingConstructor() {
- final List<List<IOFileFilter>> testFilters = this.getTestFilters();
- final List<boolean[]> testTrueResults = this.getTrueResults();
- final List<boolean[]> testFalseResults = this.getFalseResults();
- final List<Boolean> testFileResults = this.getFileResults();
- final List<Boolean> testFilenameResults = this.getFilenameResults();
+ final List<List<IOFileFilter>> testFilters = getTestFilters();
+ final List<boolean[]> testTrueResults = getTrueResults();
+ final List<boolean[]> testFalseResults = getFalseResults();
+ final List<Boolean> testFileResults = getFileResults();
+ final List<Boolean> testFilenameResults = getFilenameResults();
for (int i = 1; i < testFilters.size(); i++) {
final List<IOFileFilter> filters = testFilters.get(i);
@@ -141,7 +141,7 @@ public abstract class AbstractConditionalFileFilterTest extends AbstractIOFileFi
final boolean fileNameResults = testFilenameResults.get(i);
// Test conditional AND filter created by passing filters to the constructor
- final IOFileFilter filter = this.buildFilterUsingConstructor(filters);
+ final IOFileFilter filter = buildFilterUsingConstructor(filters);
// Test as a file filter
resetTrueFilters(this.trueFilters);
@@ -161,7 +161,7 @@ public abstract class AbstractConditionalFileFilterTest extends AbstractIOFileFi
@Test
public void testNoFilters() {
- final ConditionalFileFilter fileFilter = this.getConditionalFileFilter();
+ final ConditionalFileFilter fileFilter = getConditionalFileFilter();
final File file = new File(this.workingPath, TEST_FILE_NAME_PREFIX + 1 + TEST_FILE_TYPE);
assertFileFiltering(1, (IOFileFilter) fileFilter, file, false);
assertFilenameFiltering(1, (IOFileFilter) fileFilter, file, false);
@@ -170,7 +170,7 @@ public abstract class AbstractConditionalFileFilterTest extends AbstractIOFileFi
@Test
public void testRemove() {
final List<TesterTrueFileFilter> filters = new ArrayList<>();
- final ConditionalFileFilter fileFilter = this.getConditionalFileFilter();
+ final ConditionalFileFilter fileFilter = getConditionalFileFilter();
filters.add(new TesterTrueFileFilter());
filters.add(new TesterTrueFileFilter());
filters.add(new TesterTrueFileFilter());
diff --git a/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java b/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java
index 54dbde987..6bd9f5426 100644
--- a/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java
@@ -190,9 +190,9 @@ public class BOMInputStreamTest {
try (BOMInputStream bomInputStream = BOMInputStream.builder().setInputStream(inputStream).get()) {
bomInputStream.mark(1_000_000);
- this.readFile(bomInputStream);
+ readFile(bomInputStream);
bomInputStream.reset();
- this.readFile(bomInputStream);
+ readFile(bomInputStream);
inputStream.close();
}
}
@@ -435,12 +435,12 @@ public class BOMInputStreamTest {
@Test
public void testReadTwiceWithBOM() throws Exception {
- this.readBOMInputStreamTwice("/org/apache/commons/io/testfileBOM.xml");
+ readBOMInputStreamTwice("/org/apache/commons/io/testfileBOM.xml");
}
@Test
public void testReadTwiceWithoutBOM() throws Exception {
- this.readBOMInputStreamTwice("/org/apache/commons/io/testfileNoBOM.xml");
+ readBOMInputStreamTwice("/org/apache/commons/io/testfileNoBOM.xml");
}
@Test
diff --git a/src/test/java/org/apache/commons/io/input/BrokenInputStreamTest.java b/src/test/java/org/apache/commons/io/input/BrokenInputStreamTest.java
index 04df8e5f4..b1ca5a028 100644
--- a/src/test/java/org/apache/commons/io/input/BrokenInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/input/BrokenInputStreamTest.java
@@ -74,17 +74,17 @@ public class BrokenInputStreamTest {
try {
try {
in.read();
- } catch (Throwable localThrowable1) {
+ } catch (final Throwable localThrowable1) {
localThrowable2 = localThrowable1;
throw localThrowable1;
} finally {
try {
in.close();
- } catch (Throwable x2) {
+ } catch (final Throwable x2) {
localThrowable2.addSuppressed(x2);
}
}
- } catch (IOException expected) {
+ } catch (final IOException expected) {
final Throwable[] suppressed = expected.getSuppressed();
assertEquals(1, suppressed.length);
}
diff --git a/src/test/java/org/apache/commons/io/input/buffer/CircularByteBufferTest.java b/src/test/java/org/apache/commons/io/input/buffer/CircularByteBufferTest.java
index 1b2816c46..d596f3395 100644
--- a/src/test/java/org/apache/commons/io/input/buffer/CircularByteBufferTest.java
+++ b/src/test/java/org/apache/commons/io/input/buffer/CircularByteBufferTest.java
@@ -60,7 +60,7 @@ public class CircularByteBufferTest {
@Test
public void testClear() {
- final byte[] data = new byte[] { 1, 2, 3 };
+ final byte[] data = { 1, 2, 3 };
final CircularByteBuffer buffer = new CircularByteBuffer(10);
assertEquals(0, buffer.getCurrentNumberOfBytes());
assertFalse(buffer.hasBytes());