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
The following commit(s) were added to refs/heads/master by this push:
new 29b70e1 Use the scale in the var name.
29b70e1 is described below
commit 29b70e156f9241b0c3e25896c931d1ef8725ad66
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Tue Feb 2 17:37:30 2021 -0500
Use the scale in the var name.
---
src/main/java/org/apache/commons/io/FileUtils.java | 8 ++---
.../java/org/apache/commons/io/ThreadMonitor.java | 14 ++++-----
.../org/apache/commons/io/FileUtilsTestCase.java | 35 ++++++++++++----------
.../commons/io/filefilter/AgeFileFilterTest.java | 13 ++++----
.../java/org/apache/commons/io/test/TestUtils.java | 18 +++++------
5 files changed, 47 insertions(+), 41 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/FileUtils.java
b/src/main/java/org/apache/commons/io/FileUtils.java
index c0eb833..d3ccf31 100644
--- a/src/main/java/org/apache/commons/io/FileUtils.java
+++ b/src/main/java/org/apache/commons/io/FileUtils.java
@@ -3139,16 +3139,16 @@ public class FileUtils {
*/
public static boolean waitFor(final File file, final int seconds) {
Objects.requireNonNull(file, "file");
- final long finishAt = System.currentTimeMillis() + (seconds * 1000L);
+ final long finishAtMillis = System.currentTimeMillis() + (seconds *
1000L);
boolean wasInterrupted = false;
try {
while (!file.exists()) {
- final long remaining = finishAt - System.currentTimeMillis();
- if (remaining < 0){
+ final long remainingMillis = finishAtMillis -
System.currentTimeMillis();
+ if (remainingMillis < 0){
return false;
}
try {
- Thread.sleep(Math.min(100, remaining));
+ Thread.sleep(Math.min(100, remainingMillis));
} catch (final InterruptedException ignore) {
wasInterrupted = true;
} catch (final Exception ex) {
diff --git a/src/main/java/org/apache/commons/io/ThreadMonitor.java
b/src/main/java/org/apache/commons/io/ThreadMonitor.java
index 944da76..dc7386e 100644
--- a/src/main/java/org/apache/commons/io/ThreadMonitor.java
+++ b/src/main/java/org/apache/commons/io/ThreadMonitor.java
@@ -118,16 +118,16 @@ class ThreadMonitor implements Runnable {
* This method exists because Thread.sleep(100) can sleep for 0, 70, 100
or 200ms or anything else
* it deems appropriate. Read the docs on Thread.sleep for further
interesting details.
*
- * @param ms the number of milliseconds to sleep for
+ * @param millis the number of milliseconds to sleep for
* @throws InterruptedException if interrupted
*/
- private static void sleep(final long ms) throws InterruptedException {
- final long finishAt = System.currentTimeMillis() + ms;
- long remaining = ms;
+ private static void sleep(final long millis) throws InterruptedException {
+ final long finishAtMillis = System.currentTimeMillis() + millis;
+ long remainingMillis = millis;
do {
- Thread.sleep(remaining);
- remaining = finishAt - System.currentTimeMillis();
- } while (remaining > 0);
+ Thread.sleep(remainingMillis);
+ remainingMillis = finishAtMillis - System.currentTimeMillis();
+ } while (remainingMillis > 0);
}
diff --git a/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
b/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
index 63c21db..752e587 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
@@ -1065,17 +1065,19 @@ public class FileUtilsTestCase {
backDateFile10Minutes(testFile1); // set test file back 10 minutes
// destination file time should not be less than this (allowing for
granularity)
- final long now = System.currentTimeMillis() - 1000L;
+ final long nowMillis = System.currentTimeMillis() - 1000L;
// On Windows, the last modified time is copied by default.
FileUtils.copyFile(testFile1, destFile, false);
assertTrue(destFile.exists(), "Check Exist");
assertEquals(testFile1Size, destFile.length(), "Check Full copy");
- final long destLastMod = getLastModifiedMillis(destFile);
- final long unexpected = getLastModifiedMillis(testFile1);
+ final long destLastModMillis = getLastModifiedMillis(destFile);
+ final long unexpectedMillis = getLastModifiedMillis(testFile1);
if (!SystemUtils.IS_OS_WINDOWS) {
- final long delta = destLastMod - unexpected;
- assertNotEquals(unexpected, destLastMod, "Check last modified date
not same as input, delta " + delta);
- assertTrue(destLastMod > now, destLastMod + " > " + now + " (delta
" + delta + ")");
+ final long deltaMillis = destLastModMillis - unexpectedMillis;
+ assertNotEquals(unexpectedMillis, destLastModMillis,
+ "Check last modified date not same as input, delta " +
deltaMillis);
+ assertTrue(destLastModMillis > nowMillis,
+ destLastModMillis + " > " + nowMillis + " (delta " +
deltaMillis + ")");
}
}
@@ -2265,7 +2267,7 @@ public class FileUtilsTestCase {
backDateFile10Minutes(testFile1); // set test file back 10 minutes
// destination file time should not be less than this (allowing for
granularity)
- final long now = System.currentTimeMillis() - 1000L;
+ final long nowMillis = System.currentTimeMillis() - 1000L;
final File src = new File(testFile1.getAbsolutePath()) {
private static final long serialVersionUID = 1L;
@@ -2277,7 +2279,7 @@ public class FileUtilsTestCase {
return false;
}
};
- final long unexpected = getLastModifiedMillis(testFile1);
+ final long unexpectedMillis = getLastModifiedMillis(testFile1);
FileUtils.moveFile(src, destination, PathUtils.EMPTY_COPY_OPTIONS);
assertTrue(destination.exists(), "Check Exist");
@@ -2285,10 +2287,12 @@ public class FileUtilsTestCase {
// On Windows, the last modified time is copied by default.
if (!SystemUtils.IS_OS_WINDOWS) {
- final long destLastMod = getLastModifiedMillis(destination);
- final long delta = destLastMod - unexpected;
- assertNotEquals(unexpected, destLastMod, "Check last modified date
not same as input, delta " + delta);
- assertTrue(destLastMod > now, destLastMod + " > " + now + " (delta
" + delta + ")");
+ final long destLastModMillis = getLastModifiedMillis(destination);
+ final long deltaMillis = destLastModMillis - unexpectedMillis;
+ assertNotEquals(unexpectedMillis, destLastModMillis,
+ "Check last modified date not same as input, delta " +
deltaMillis);
+ assertTrue(destLastModMillis > nowMillis,
+ destLastModMillis + " > " + nowMillis + " (delta " +
deltaMillis + ")");
}
}
@@ -2778,12 +2782,13 @@ public class FileUtilsTestCase {
final boolean res = setLastModifiedMillis(file, y2k); // 0L fails on
Win98
assertEquals(true, res, "Bad test: set lastModified failed");
assertEquals(y2k, getLastModifiedMillis(file), "Bad test: set
lastModified set incorrect value");
- final long now = System.currentTimeMillis();
+ final long nowMillis = System.currentTimeMillis();
FileUtils.touch(file);
assertEquals(1, file.length(), "FileUtils.touch() didn't empty the
file.");
assertEquals(false, y2k == getLastModifiedMillis(file),
"FileUtils.touch() changed lastModified");
- assertEquals(true, getLastModifiedMillis(file) >= now - 3000,
"FileUtils.touch() changed lastModified to more than now-3s");
- assertEquals(true, getLastModifiedMillis(file) <= now + 3000,
"FileUtils.touch() changed lastModified to less than now+3s");
+ final int delta = 3000;
+ assertEquals(true, getLastModifiedMillis(file) >= nowMillis - delta,
"FileUtils.touch() changed lastModified to more than now-3s");
+ assertEquals(true, getLastModifiedMillis(file) <= nowMillis + delta,
"FileUtils.touch() changed lastModified to less than now+3s");
}
@Test
diff --git
a/src/test/java/org/apache/commons/io/filefilter/AgeFileFilterTest.java
b/src/test/java/org/apache/commons/io/filefilter/AgeFileFilterTest.java
index 3f941fe..571d25b 100644
--- a/src/test/java/org/apache/commons/io/filefilter/AgeFileFilterTest.java
+++ b/src/test/java/org/apache/commons/io/filefilter/AgeFileFilterTest.java
@@ -46,8 +46,8 @@ public class AgeFileFilterTest {
public void testJavadocExampleUsingIo() {
final File dir = new File(".");
// We are interested in files older than one day
- final long cutoff = System.currentTimeMillis();
- final String[] files = dir.list(new AgeFileFilter(cutoff));
+ final long cutoffMillis = System.currentTimeMillis();
+ final String[] files = dir.list(new AgeFileFilter(cutoffMillis));
for (final String file : files) {
// System.out.println(files[i]);
}
@@ -64,8 +64,9 @@ public class AgeFileFilterTest {
public void testJavadocExampleUsingNio() throws IOException {
final Path dir = Paths.get("");
// We are interested in files older than one day
- final long cutoff = System.currentTimeMillis();
- final AccumulatorPathVisitor visitor =
AccumulatorPathVisitor.withLongCounters(new AgeFileFilter(cutoff),
TrueFileFilter.INSTANCE);
+ final long cutoffMillis = System.currentTimeMillis();
+ final AccumulatorPathVisitor visitor =
AccumulatorPathVisitor.withLongCounters(new AgeFileFilter(cutoffMillis),
+ TrueFileFilter.INSTANCE);
//
// Walk one dir
Files.walkFileTree(dir, Collections.emptySet(), 1, visitor);
@@ -96,9 +97,9 @@ public class AgeFileFilterTest {
@Test
public void testNoCounting() throws IOException {
final Path dir = Paths.get("");
- final long cutoff = System.currentTimeMillis();
+ final long cutoffMillis = System.currentTimeMillis();
final AccumulatorPathVisitor visitor = new
AccumulatorPathVisitor(Counters.noopPathCounters(),
- new AgeFileFilter(cutoff), TrueFileFilter.INSTANCE);
+ new AgeFileFilter(cutoffMillis), TrueFileFilter.INSTANCE);
Files.walkFileTree(dir, Collections.emptySet(), 1, visitor);
//
CounterAssertions.assertZeroCounters(visitor.getPathCounters());
diff --git a/src/test/java/org/apache/commons/io/test/TestUtils.java
b/src/test/java/org/apache/commons/io/test/TestUtils.java
index a17fb92..1f0cfff 100644
--- a/src/test/java/org/apache/commons/io/test/TestUtils.java
+++ b/src/test/java/org/apache/commons/io/test/TestUtils.java
@@ -215,21 +215,21 @@ public abstract class TestUtils {
* This method exists because Thread.sleep(100) can sleep for 0, 70, 100
or 200ms or anything else
* it deems appropriate. Read the docs on Thread.sleep for further details.
*
- * @param ms the number of milliseconds to sleep for
+ * @param millis the number of milliseconds to sleep for
* @throws InterruptedException if interrupted
*/
- public static void sleep(final long ms) throws InterruptedException {
- final long finishAt = System.currentTimeMillis() + ms;
- long remaining = ms;
+ public static void sleep(final long millis) throws InterruptedException {
+ final long finishAtMillis = System.currentTimeMillis() + millis;
+ long remainingMillis = millis;
do {
- Thread.sleep(remaining);
- remaining = finishAt - System.currentTimeMillis();
- } while (remaining > 0);
+ Thread.sleep(remainingMillis);
+ remainingMillis = finishAtMillis - System.currentTimeMillis();
+ } while (remainingMillis > 0);
}
- public static void sleepQuietly(final long ms) {
+ public static void sleepQuietly(final long millis) {
try {
- sleep(ms);
+ sleep(millis);
} catch (final InterruptedException ignored){
// ignore InterruptedException.
}
