diff options
Diffstat (limited to 'src/test/java')
3 files changed, 12 insertions, 6 deletions
diff --git a/src/test/java/org/apache/commons/io/file/AccumulatorPathVisitorTest.java b/src/test/java/org/apache/commons/io/file/AccumulatorPathVisitorTest.java index 6d24b947..a3a9ece6 100644 --- a/src/test/java/org/apache/commons/io/file/AccumulatorPathVisitorTest.java +++ b/src/test/java/org/apache/commons/io/file/AccumulatorPathVisitorTest.java @@ -27,6 +27,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.attribute.BasicFileAttributes; +import java.time.Duration; import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; @@ -39,6 +40,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; import java.util.stream.Stream; +import org.apache.commons.io.ThreadUtils; import org.apache.commons.io.filefilter.AndFileFilter; import org.apache.commons.io.filefilter.DirectoryFileFilter; import org.apache.commons.io.filefilter.EmptyFileFilter; @@ -185,7 +187,7 @@ public class AccumulatorPathVisitorTest { public FileVisitResult visitFile(final Path path, final BasicFileAttributes attributes) throws IOException { // Slow down the walking a bit to try and cause conflicts with the deletion thread try { - Thread.sleep(10); + ThreadUtils.sleep(Duration.ofMillis(10)); } catch (final InterruptedException ignore) { // e.printStackTrace(); } @@ -209,7 +211,7 @@ public class AccumulatorPathVisitorTest { Files.walkFileTree(tempDirPath, countingFileFilter); } finally { if (!deleted.get()) { - Thread.sleep(1000); + ThreadUtils.sleep(Duration.ofMillis(1000)); } if (!deleted.get()) { executor.awaitTermination(5, TimeUnit.SECONDS); diff --git a/src/test/java/org/apache/commons/io/input/TimestampedObserverTest.java b/src/test/java/org/apache/commons/io/input/TimestampedObserverTest.java index 51507366..54922005 100644 --- a/src/test/java/org/apache/commons/io/input/TimestampedObserverTest.java +++ b/src/test/java/org/apache/commons/io/input/TimestampedObserverTest.java @@ -17,16 +17,18 @@ package org.apache.commons.io.input; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.assertFalse; import java.io.ByteArrayInputStream; import java.io.IOException; +import java.time.Duration; import java.time.Instant; import org.apache.commons.io.IOUtils; +import org.apache.commons.io.ThreadUtils; import org.junit.jupiter.api.Test; /** @@ -38,11 +40,11 @@ public class TimestampedObserverTest { public void test() throws IOException, InterruptedException { final Instant before = Instant.now(); // Some OS' clock granularity may be high. - Thread.sleep(20); + ThreadUtils.sleep(Duration.ofMillis(20)); final TimestampedObserver timestampedObserver = new TimestampedObserver(); assertFalse(timestampedObserver.isClosed()); // Java 8 instant resolution is not great. - Thread.sleep(20); + ThreadUtils.sleep(Duration.ofMillis(20)); // toString() should not blow up before close(). assertNotNull(timestampedObserver.toString()); assertTrue(timestampedObserver.getOpenInstant().isAfter(before)); diff --git a/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTest.java b/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTest.java index b7bc3e28..9399bf17 100644 --- a/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTest.java +++ b/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTest.java @@ -23,6 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; import java.io.File; +import java.time.Duration; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -30,6 +31,7 @@ import java.util.Iterator; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; +import org.apache.commons.io.ThreadUtils; import org.apache.commons.io.test.TestUtils; import org.junit.jupiter.api.Test; @@ -192,7 +194,7 @@ public class FileAlterationMonitorTest extends AbstractMonitorTest { monitor.start(); assertFalse(createdThreads.isEmpty()); - Thread.sleep(10); // wait until the watcher thread enters Thread.sleep() + ThreadUtils.sleep(Duration.ofMillis(10)); // wait until the watcher thread enters Thread.sleep() monitor.stop(100); createdThreads.forEach(thread -> assertFalse(thread.isAlive(), "The FileAlterationMonitor did not stop the threads it created.")); |