Repository: commons-io Updated Branches: refs/heads/master 2a31bc5fc -> 4ed92759f
Static imports come first. Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/4ed92759 Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/4ed92759 Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/4ed92759 Branch: refs/heads/master Commit: 4ed92759f28026d813b59a5ee66384043e3fd513 Parents: 2a31bc5 Author: Gary Gregory <ggreg...@apache.org> Authored: Wed Sep 27 13:16:05 2017 -0600 Committer: Gary Gregory <ggreg...@apache.org> Committed: Wed Sep 27 13:16:05 2017 -0600 ---------------------------------------------------------------------- .../commons/io/ByteOrderMarkTestCase.java | 10 +-- .../org/apache/commons/io/CopyUtilsTest.java | 19 ++++-- .../commons/io/DirectoryWalkerTestCase.java | 5 +- .../io/DirectoryWalkerTestCaseJava4.java | 18 +++--- .../org/apache/commons/io/EndianUtilsTest.java | 6 +- .../commons/io/FileSystemUtilsTestCase.java | 28 ++++++--- .../io/FileUtilsCleanDirectoryTestCase.java | 21 +++++-- .../io/FileUtilsCleanSymlinksTestCase.java | 20 ++++-- .../io/FileUtilsDirectoryContainsTestCase.java | 20 ++++-- .../commons/io/FileUtilsFileNewerTestCase.java | 18 ++++-- .../commons/io/FileUtilsListFilesTestCase.java | 30 +++++---- .../apache/commons/io/FileUtilsTestCase.java | 58 ++++++++++++----- .../commons/io/FileUtilsWaitForTestCase.java | 4 +- .../io/FilenameUtilsWildcardTestCase.java | 10 +-- .../java/org/apache/commons/io/HexDumpTest.java | 8 +-- .../org/apache/commons/io/IOCaseTestCase.java | 24 +++++--- .../io/IOExceptionWithCauseTestCase.java | 6 +- .../apache/commons/io/IOUtilsCopyTestCase.java | 31 +++++++--- .../org/apache/commons/io/IOUtilsTestCase.java | 65 +++++++++++++++----- .../apache/commons/io/IOUtilsWriteTestCase.java | 28 ++++++--- .../apache/commons/io/LineIteratorTestCase.java | 24 +++++--- .../commons/io/TaggedIOExceptionTest.java | 8 +-- .../commons/io/ThreadMonitorTestCase.java | 6 +- .../io/monitor/AbstractMonitorTestCase.java | 8 +-- .../monitor/FileAlterationMonitorTestCase.java | 12 ++-- .../monitor/FileAlterationObserverTestCase.java | 8 +-- .../apache/commons/io/testtools/TestUtils.java | 24 ++++++-- .../io/testtools/YellOnCloseInputStream.java | 4 +- .../YellOnFlushAndCloseOutputStream.java | 4 +- 29 files changed, 353 insertions(+), 174 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/ByteOrderMarkTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/ByteOrderMarkTestCase.java b/src/test/java/org/apache/commons/io/ByteOrderMarkTestCase.java index 9fc6398..b5c455d 100644 --- a/src/test/java/org/apache/commons/io/ByteOrderMarkTestCase.java +++ b/src/test/java/org/apache/commons/io/ByteOrderMarkTestCase.java @@ -17,17 +17,17 @@ package org.apache.commons.io; -import java.nio.charset.Charset; -import java.util.Arrays; - -import org.junit.Test; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import java.nio.charset.Charset; +import java.util.Arrays; + +import org.junit.Test; + /** * Test for {@link ByteOrderMark}. http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/CopyUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/CopyUtilsTest.java b/src/test/java/org/apache/commons/io/CopyUtilsTest.java index fff221e..93e186c 100644 --- a/src/test/java/org/apache/commons/io/CopyUtilsTest.java +++ b/src/test/java/org/apache/commons/io/CopyUtilsTest.java @@ -16,7 +16,11 @@ */ package org.apache.commons.io; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + import java.io.ByteArrayInputStream; +import java.io.File; import java.io.InputStream; import java.io.OutputStream; import java.io.Reader; @@ -25,14 +29,12 @@ import java.io.Writer; import java.util.Arrays; import org.apache.commons.io.output.ByteArrayOutputStream; -import org.apache.commons.io.testtools.FileBasedTestCase; import org.apache.commons.io.testtools.TestUtils; import org.apache.commons.io.testtools.YellOnCloseInputStream; import org.apache.commons.io.testtools.YellOnFlushAndCloseOutputStream; +import org.junit.ClassRule; import org.junit.Test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.junit.rules.TemporaryFolder; @SuppressWarnings("deprecation") // these are test cases for the deprecated CopyUtils @@ -41,7 +43,14 @@ import static org.junit.Assert.assertTrue; * * @see CopyUtils */ -public class CopyUtilsTest extends FileBasedTestCase { +public class CopyUtilsTest { + + @ClassRule + public static TemporaryFolder temporaryFolder = new TemporaryFolder(); + + private static File getTestDirectory() { + return temporaryFolder.getRoot(); + } /* * NOTE this is not particularly beautiful code. A better way to check for http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/DirectoryWalkerTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/DirectoryWalkerTestCase.java b/src/test/java/org/apache/commons/io/DirectoryWalkerTestCase.java index 58e6abd..92065db 100644 --- a/src/test/java/org/apache/commons/io/DirectoryWalkerTestCase.java +++ b/src/test/java/org/apache/commons/io/DirectoryWalkerTestCase.java @@ -16,7 +16,10 @@ */ package org.apache.commons.io; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.File; import java.io.FileFilter; http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java b/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java index e9931be..3e69729 100644 --- a/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java +++ b/src/test/java/org/apache/commons/io/DirectoryWalkerTestCaseJava4.java @@ -16,11 +16,10 @@ */ package org.apache.commons.io; -import org.apache.commons.io.filefilter.FileFilterUtils; -import org.apache.commons.io.filefilter.IOFileFilter; -import org.apache.commons.io.filefilter.NameFileFilter; -import org.apache.commons.io.filefilter.OrFileFilter; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.File; import java.io.FileFilter; @@ -29,10 +28,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import org.apache.commons.io.filefilter.FileFilterUtils; +import org.apache.commons.io.filefilter.IOFileFilter; +import org.apache.commons.io.filefilter.NameFileFilter; +import org.apache.commons.io.filefilter.OrFileFilter; +import org.junit.Test; /** * This is used to test DirectoryWalker for correctness when using Java4 (i.e. no generics). http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/EndianUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/EndianUtilsTest.java b/src/test/java/org/apache/commons/io/EndianUtilsTest.java index d01f306..75e3d63 100644 --- a/src/test/java/org/apache/commons/io/EndianUtilsTest.java +++ b/src/test/java/org/apache/commons/io/EndianUtilsTest.java @@ -16,15 +16,15 @@ */ package org.apache.commons.io; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.EOFException; import java.io.IOException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import org.junit.Test; /** * @version $Id$ http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/FileSystemUtilsTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/FileSystemUtilsTestCase.java b/src/test/java/org/apache/commons/io/FileSystemUtilsTestCase.java index 5e279c8..96f0013 100644 --- a/src/test/java/org/apache/commons/io/FileSystemUtilsTestCase.java +++ b/src/test/java/org/apache/commons/io/FileSystemUtilsTestCase.java @@ -16,21 +16,35 @@ */ package org.apache.commons.io; -import org.apache.commons.io.testtools.FileBasedTestCase; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; -import java.io.*; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; import java.util.Locale; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import org.junit.Assert; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; /** * This is used to test FileSystemUtils. * */ -public class FileSystemUtilsTestCase extends FileBasedTestCase { +public class FileSystemUtilsTestCase { + + @ClassRule + public static TemporaryFolder temporaryFolder = new TemporaryFolder(); + + private static File getTestDirectory() { + return temporaryFolder.getRoot(); + } //----------------------------------------------------------------------- @Test http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/FileUtilsCleanDirectoryTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/FileUtilsCleanDirectoryTestCase.java b/src/test/java/org/apache/commons/io/FileUtilsCleanDirectoryTestCase.java index 3d2c42c..322fc5f 100644 --- a/src/test/java/org/apache/commons/io/FileUtilsCleanDirectoryTestCase.java +++ b/src/test/java/org/apache/commons/io/FileUtilsCleanDirectoryTestCase.java @@ -16,25 +16,34 @@ */ package org.apache.commons.io; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.commons.io.testtools.FileBasedTestCase; import org.junit.After; import org.junit.Before; +import org.junit.ClassRule; import org.junit.Test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import org.junit.rules.TemporaryFolder; /** * Test cases for FileUtils.cleanDirectory() method. * */ -public class FileUtilsCleanDirectoryTestCase extends FileBasedTestCase { +public class FileUtilsCleanDirectoryTestCase { + + @ClassRule + public static TemporaryFolder temporaryFolder = new TemporaryFolder(); + + private static File getTestDirectory() { + return temporaryFolder.getRoot(); + } + final File top = getLocalTestDirectory(); private File getLocalTestDirectory() { http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTestCase.java b/src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTestCase.java index ad748e9..660c3cd 100644 --- a/src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTestCase.java +++ b/src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTestCase.java @@ -16,24 +16,32 @@ */ package org.apache.commons.io; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.io.File; import java.util.ArrayList; import java.util.List; -import org.apache.commons.io.testtools.FileBasedTestCase; import org.junit.After; import org.junit.Before; +import org.junit.ClassRule; import org.junit.Test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import org.junit.rules.TemporaryFolder; /** * Test cases for FileUtils.cleanDirectory() method that involve symlinks. * & FileUtils.isSymlink(File file) */ -public class FileUtilsCleanSymlinksTestCase extends FileBasedTestCase { +public class FileUtilsCleanSymlinksTestCase { + + @ClassRule + public static TemporaryFolder temporaryFolder = new TemporaryFolder(); + + private static File getTestDirectory() { + return temporaryFolder.getRoot(); + } final File top = getTestDirectory(); http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/FileUtilsDirectoryContainsTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/FileUtilsDirectoryContainsTestCase.java b/src/test/java/org/apache/commons/io/FileUtilsDirectoryContainsTestCase.java index 6439f33..bbc9695 100644 --- a/src/test/java/org/apache/commons/io/FileUtilsDirectoryContainsTestCase.java +++ b/src/test/java/org/apache/commons/io/FileUtilsDirectoryContainsTestCase.java @@ -16,17 +16,18 @@ */ package org.apache.commons.io; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import java.io.File; import java.io.IOException; -import org.apache.commons.io.testtools.FileBasedTestCase; import org.junit.After; import org.junit.Before; +import org.junit.ClassRule; import org.junit.Test; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import org.junit.rules.TemporaryFolder; /** * This class ensure the correctness of {@link FileUtils#directoryContains(File,File)}. @@ -35,7 +36,14 @@ import static org.junit.Assert.fail; * @since 2.2 * @version $Id$ */ -public class FileUtilsDirectoryContainsTestCase extends FileBasedTestCase { +public class FileUtilsDirectoryContainsTestCase { + + @ClassRule + public static TemporaryFolder temporaryFolder = new TemporaryFolder(); + + private static File getTestDirectory() { + return temporaryFolder.getRoot(); + } private File directory1; private File directory2; http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/FileUtilsFileNewerTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/FileUtilsFileNewerTestCase.java b/src/test/java/org/apache/commons/io/FileUtilsFileNewerTestCase.java index 5e6d744..1f35b3d 100644 --- a/src/test/java/org/apache/commons/io/FileUtilsFileNewerTestCase.java +++ b/src/test/java/org/apache/commons/io/FileUtilsFileNewerTestCase.java @@ -16,25 +16,33 @@ */ package org.apache.commons.io; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.util.Date; -import org.apache.commons.io.testtools.FileBasedTestCase; import org.apache.commons.io.testtools.TestUtils; import org.junit.After; import org.junit.Before; +import org.junit.ClassRule; import org.junit.Test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import org.junit.rules.TemporaryFolder; /** * This is used to test FileUtils for correctness. */ -public class FileUtilsFileNewerTestCase extends FileBasedTestCase { +public class FileUtilsFileNewerTestCase { + + @ClassRule + public static TemporaryFolder temporaryFolder = new TemporaryFolder(); + + private static File getTestDirectory() { + return temporaryFolder.getRoot(); + } // Test data private static final int FILE1_SIZE = 1; http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/FileUtilsListFilesTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/FileUtilsListFilesTestCase.java b/src/test/java/org/apache/commons/io/FileUtilsListFilesTestCase.java index 411ce06..e3c216c 100644 --- a/src/test/java/org/apache/commons/io/FileUtilsListFilesTestCase.java +++ b/src/test/java/org/apache/commons/io/FileUtilsListFilesTestCase.java @@ -16,27 +16,35 @@ */ package org.apache.commons.io; -import org.apache.commons.io.filefilter.FileFilterUtils; -import org.apache.commons.io.filefilter.IOFileFilter; -import org.apache.commons.io.testtools.FileBasedTestCase; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.File; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import org.apache.commons.io.filefilter.FileFilterUtils; +import org.apache.commons.io.filefilter.IOFileFilter; +import org.junit.After; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; /** * Test cases for FileUtils.listFiles() methods. */ -public class FileUtilsListFilesTestCase extends FileBasedTestCase { +public class FileUtilsListFilesTestCase { + + @ClassRule + public static TemporaryFolder temporaryFolder = new TemporaryFolder(); + + private static File getTestDirectory() { + return temporaryFolder.getRoot(); + } private File getLocalTestDirectory() { return new File(getTestDirectory(), "list-files"); http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/FileUtilsTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/FileUtilsTestCase.java b/src/test/java/org/apache/commons/io/FileUtilsTestCase.java index 303b7c9..3d10a76 100644 --- a/src/test/java/org/apache/commons/io/FileUtilsTestCase.java +++ b/src/test/java/org/apache/commons/io/FileUtilsTestCase.java @@ -16,20 +16,6 @@ */ package org.apache.commons.io; -import org.apache.commons.io.filefilter.NameFileFilter; -import org.apache.commons.io.filefilter.WildcardFileFilter; -import org.apache.commons.io.testtools.FileBasedTestCase; -import org.apache.commons.io.testtools.TestUtils; -import org.junit.*; - -import java.io.*; -import java.math.BigInteger; -import java.net.URL; -import java.nio.charset.Charset; -import java.util.*; -import java.util.zip.CRC32; -import java.util.zip.Checksum; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -38,13 +24,55 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import java.io.BufferedOutputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; +import java.math.BigInteger; +import java.net.URL; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.GregorianCalendar; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.zip.CRC32; +import java.util.zip.Checksum; + +import org.apache.commons.io.filefilter.NameFileFilter; +import org.apache.commons.io.filefilter.WildcardFileFilter; +import org.apache.commons.io.testtools.TestUtils; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Ignore; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; + /** * This is used to test FileUtils for correctness. * * @see FileUtils */ @SuppressWarnings({"deprecation", "ResultOfMethodCallIgnored"}) // unit tests include tests of many deprecated methods -public class FileUtilsTestCase extends FileBasedTestCase { +public class FileUtilsTestCase { + + @ClassRule + public static TemporaryFolder temporaryFolder = new TemporaryFolder(); + + private static File getTestDirectory() { + return temporaryFolder.getRoot(); + } // Test data http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/FileUtilsWaitForTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/FileUtilsWaitForTestCase.java b/src/test/java/org/apache/commons/io/FileUtilsWaitForTestCase.java index 705718a..3acab89 100644 --- a/src/test/java/org/apache/commons/io/FileUtilsWaitForTestCase.java +++ b/src/test/java/org/apache/commons/io/FileUtilsWaitForTestCase.java @@ -16,13 +16,13 @@ */ package org.apache.commons.io; -import org.junit.Test; +import static org.junit.Assert.assertTrue; import java.io.File; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; -import static org.junit.Assert.assertTrue; +import org.junit.Test; /** * This is used to test FileUtils.waitFor() method for correctness. http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/FilenameUtilsWildcardTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/FilenameUtilsWildcardTestCase.java b/src/test/java/org/apache/commons/io/FilenameUtilsWildcardTestCase.java index 0675b87..35191d9 100644 --- a/src/test/java/org/apache/commons/io/FilenameUtilsWildcardTestCase.java +++ b/src/test/java/org/apache/commons/io/FilenameUtilsWildcardTestCase.java @@ -16,16 +16,16 @@ */ package org.apache.commons.io; -import org.junit.Test; - -import java.io.File; -import java.util.Locale; - import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import java.io.File; +import java.util.Locale; + +import org.junit.Test; + public class FilenameUtilsWildcardTestCase { private static final boolean WINDOWS = File.separatorChar == '\\'; http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/HexDumpTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/HexDumpTest.java b/src/test/java/org/apache/commons/io/HexDumpTest.java index 82f0c3e..e3fb048 100644 --- a/src/test/java/org/apache/commons/io/HexDumpTest.java +++ b/src/test/java/org/apache/commons/io/HexDumpTest.java @@ -16,13 +16,13 @@ */ package org.apache.commons.io; -import org.apache.commons.io.output.ByteArrayOutputStream; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; import java.io.IOException; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import org.apache.commons.io.output.ByteArrayOutputStream; +import org.junit.Test; /** http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/IOCaseTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/IOCaseTestCase.java b/src/test/java/org/apache/commons/io/IOCaseTestCase.java index 2d83938..18eac3c 100644 --- a/src/test/java/org/apache/commons/io/IOCaseTestCase.java +++ b/src/test/java/org/apache/commons/io/IOCaseTestCase.java @@ -16,26 +16,34 @@ */ package org.apache.commons.io; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -import org.apache.commons.io.testtools.FileBasedTestCase; +import org.junit.ClassRule; import org.junit.Test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import org.junit.rules.TemporaryFolder; /** * This is used to test IOCase for correctness. * */ -public class IOCaseTestCase extends FileBasedTestCase { +public class IOCaseTestCase { + + @ClassRule + public static TemporaryFolder temporaryFolder = new TemporaryFolder(); + + private static File getTestDirectory() { + return temporaryFolder.getRoot(); + } private static final boolean WINDOWS = File.separatorChar == '\\'; http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/IOExceptionWithCauseTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/IOExceptionWithCauseTestCase.java b/src/test/java/org/apache/commons/io/IOExceptionWithCauseTestCase.java index 72cbba7..cd2eabf 100644 --- a/src/test/java/org/apache/commons/io/IOExceptionWithCauseTestCase.java +++ b/src/test/java/org/apache/commons/io/IOExceptionWithCauseTestCase.java @@ -17,13 +17,13 @@ package org.apache.commons.io; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + import java.io.IOException; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; - /** * Tests IOExceptionWithCause * http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/IOUtilsCopyTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/IOUtilsCopyTestCase.java b/src/test/java/org/apache/commons/io/IOUtilsCopyTestCase.java index cb2dce7..c6d08e8 100644 --- a/src/test/java/org/apache/commons/io/IOUtilsCopyTestCase.java +++ b/src/test/java/org/apache/commons/io/IOUtilsCopyTestCase.java @@ -16,29 +16,44 @@ */ package org.apache.commons.io; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.Reader; +import java.io.Writer; +import java.util.Arrays; + import org.apache.commons.io.input.NullInputStream; import org.apache.commons.io.input.NullReader; import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.commons.io.output.NullOutputStream; import org.apache.commons.io.output.NullWriter; -import org.apache.commons.io.testtools.FileBasedTestCase; import org.apache.commons.io.testtools.TestUtils; import org.apache.commons.io.testtools.YellOnCloseInputStream; import org.apache.commons.io.testtools.YellOnFlushAndCloseOutputStream; +import org.junit.ClassRule; import org.junit.Test; - -import java.io.*; -import java.util.Arrays; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.junit.rules.TemporaryFolder; /** * JUnit tests for IOUtils copy methods. * * @see IOUtils */ -public class IOUtilsCopyTestCase extends FileBasedTestCase { +public class IOUtilsCopyTestCase { + + @ClassRule + public static TemporaryFolder temporaryFolder = new TemporaryFolder(); + + private static File getTestDirectory() { + return temporaryFolder.getRoot(); + } /* * NOTE this is not particularly beautiful code. A better way to check for http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/IOUtilsTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/IOUtilsTestCase.java b/src/test/java/org/apache/commons/io/IOUtilsTestCase.java index e62450a..e261f72 100644 --- a/src/test/java/org/apache/commons/io/IOUtilsTestCase.java +++ b/src/test/java/org/apache/commons/io/IOUtilsTestCase.java @@ -16,15 +16,41 @@ */ package org.apache.commons.io; -import org.apache.commons.io.testtools.FileBasedTestCase; -import org.apache.commons.io.testtools.TestUtils; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; -import java.io.*; -import java.net.*; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.CharArrayReader; +import java.io.CharArrayWriter; +import java.io.Closeable; +import java.io.EOFException; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStream; +import java.io.Reader; +import java.io.StringReader; +import java.io.Writer; +import java.net.ServerSocket; +import java.net.Socket; +import java.net.URI; +import java.net.URL; +import java.net.URLConnection; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; import java.nio.channels.Selector; @@ -32,13 +58,13 @@ import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import org.apache.commons.io.testtools.TestUtils; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; /** * This is used to test IOUtils for correctness. The following checks are performed: @@ -51,7 +77,14 @@ import static org.junit.Assert.fail; * Due to interdependencies in IOUtils and IOUtilsTestlet, one bug may cause multiple tests to fail. */ @SuppressWarnings("deprecation") // deliberately testing deprecated code -public class IOUtilsTestCase extends FileBasedTestCase { +public class IOUtilsTestCase { + + @ClassRule + public static TemporaryFolder temporaryFolder = new TemporaryFolder(); + + private static File getTestDirectory() { + return temporaryFolder.getRoot(); + } private static final int FILE_SIZE = 1024 * 4 + 1; http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java b/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java index d4a8d89..5f00a88 100644 --- a/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java +++ b/src/test/java/org/apache/commons/io/IOUtilsWriteTestCase.java @@ -16,21 +16,23 @@ */ package org.apache.commons.io; -import org.apache.commons.io.output.ByteArrayOutputStream; -import org.apache.commons.io.testtools.FileBasedTestCase; -import org.apache.commons.io.testtools.TestUtils; -import org.apache.commons.io.testtools.YellOnFlushAndCloseOutputStream; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import java.io.File; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import org.apache.commons.io.output.ByteArrayOutputStream; +import org.apache.commons.io.testtools.TestUtils; +import org.apache.commons.io.testtools.YellOnFlushAndCloseOutputStream; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; /** * JUnit tests for IOUtils write methods. @@ -38,10 +40,16 @@ import static org.junit.Assert.fail; * @see IOUtils */ @SuppressWarnings("deprecation") // includes tests for deprecated methods -public class IOUtilsWriteTestCase extends FileBasedTestCase { +public class IOUtilsWriteTestCase { - private static final int FILE_SIZE = 1024 * 4 + 1; + @ClassRule + public static TemporaryFolder temporaryFolder = new TemporaryFolder(); + + private static File getTestDirectory() { + return temporaryFolder.getRoot(); + } + private static final int FILE_SIZE = 1024 * 4 + 1; private final byte[] inData = TestUtils.generateTestData((long) FILE_SIZE); http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/LineIteratorTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/LineIteratorTestCase.java b/src/test/java/org/apache/commons/io/LineIteratorTestCase.java index 55f3269..7243fbd 100644 --- a/src/test/java/org/apache/commons/io/LineIteratorTestCase.java +++ b/src/test/java/org/apache/commons/io/LineIteratorTestCase.java @@ -16,6 +16,12 @@ */ package org.apache.commons.io; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + import java.io.BufferedReader; import java.io.File; import java.io.FileNotFoundException; @@ -28,22 +34,24 @@ import java.util.ArrayList; import java.util.List; import java.util.NoSuchElementException; -import org.apache.commons.io.testtools.FileBasedTestCase; import org.junit.After; import org.junit.Before; +import org.junit.ClassRule; import org.junit.Test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import org.junit.rules.TemporaryFolder; /** * This is used to test LineIterator for correctness. * */ -public class LineIteratorTestCase extends FileBasedTestCase { +public class LineIteratorTestCase { + + @ClassRule + public static TemporaryFolder temporaryFolder = new TemporaryFolder(); + + private static File getTestDirectory() { + return temporaryFolder.getRoot(); + } private void assertLines(final List<String> lines, final LineIterator iterator) { try { http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/TaggedIOExceptionTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/TaggedIOExceptionTest.java b/src/test/java/org/apache/commons/io/TaggedIOExceptionTest.java index cfd571e..8b7c6a0 100644 --- a/src/test/java/org/apache/commons/io/TaggedIOExceptionTest.java +++ b/src/test/java/org/apache/commons/io/TaggedIOExceptionTest.java @@ -16,16 +16,16 @@ */ package org.apache.commons.io; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.io.IOException; import java.io.Serializable; import java.util.UUID; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - /** * JUnit Test Case for {@link TaggedIOException}. */ http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/ThreadMonitorTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/ThreadMonitorTestCase.java b/src/test/java/org/apache/commons/io/ThreadMonitorTestCase.java index 8e1b85c..6718639 100644 --- a/src/test/java/org/apache/commons/io/ThreadMonitorTestCase.java +++ b/src/test/java/org/apache/commons/io/ThreadMonitorTestCase.java @@ -16,12 +16,12 @@ */ package org.apache.commons.io; -import org.apache.commons.io.testtools.TestUtils; -import org.junit.Test; - import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; +import org.apache.commons.io.testtools.TestUtils; +import org.junit.Test; + /** * Tests for {@link ThreadMonitor}. */ http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java b/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java index d7ec41c..c28f856 100644 --- a/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java +++ b/src/test/java/org/apache/commons/io/monitor/AbstractMonitorTestCase.java @@ -16,6 +16,10 @@ */ package org.apache.commons.io.monitor; +import static org.apache.commons.io.testtools.TestUtils.sleepQuietly; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + import java.io.File; import java.io.FileFilter; @@ -26,10 +30,6 @@ import org.apache.commons.io.filefilter.IOFileFilter; import org.junit.After; import org.junit.Before; -import static org.apache.commons.io.testtools.TestUtils.sleepQuietly; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - /** * {@link FileAlterationObserver} Test Case. */ http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java b/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java index 2faedf1..6cfabe4 100644 --- a/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java +++ b/src/test/java/org/apache/commons/io/monitor/FileAlterationMonitorTestCase.java @@ -16,18 +16,18 @@ */ package org.apache.commons.io.monitor; -import org.apache.commons.io.testtools.TestUtils; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import java.io.File; import java.util.Collection; import java.util.Iterator; import java.util.concurrent.Executors; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import org.apache.commons.io.testtools.TestUtils; +import org.junit.Test; /** * {@link FileAlterationMonitor} Test Case. http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/monitor/FileAlterationObserverTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/monitor/FileAlterationObserverTestCase.java b/src/test/java/org/apache/commons/io/monitor/FileAlterationObserverTestCase.java index 6840a6e..cef9c18 100644 --- a/src/test/java/org/apache/commons/io/monitor/FileAlterationObserverTestCase.java +++ b/src/test/java/org/apache/commons/io/monitor/FileAlterationObserverTestCase.java @@ -16,6 +16,10 @@ */ package org.apache.commons.io.monitor; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.io.File; import java.io.FileFilter; import java.util.Iterator; @@ -25,10 +29,6 @@ import org.apache.commons.io.filefilter.CanReadFileFilter; import org.apache.commons.io.filefilter.FileFilterUtils; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - /** * {@link FileAlterationObserver} Test Case. */ http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/testtools/TestUtils.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/testtools/TestUtils.java b/src/test/java/org/apache/commons/io/testtools/TestUtils.java index 8a73cac..c97d951 100644 --- a/src/test/java/org/apache/commons/io/testtools/TestUtils.java +++ b/src/test/java/org/apache/commons/io/testtools/TestUtils.java @@ -16,15 +16,27 @@ */ package org.apache.commons.io.testtools; -import junit.framework.AssertionFailedError; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.output.ByteArrayOutputStream; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; -import java.io.*; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.io.Reader; +import java.io.Writer; import java.util.Arrays; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.output.ByteArrayOutputStream; + +import junit.framework.AssertionFailedError; /** * Base class for testcases doing tests with files. http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/testtools/YellOnCloseInputStream.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/testtools/YellOnCloseInputStream.java b/src/test/java/org/apache/commons/io/testtools/YellOnCloseInputStream.java index 4e3a6ce..0e6073a 100644 --- a/src/test/java/org/apache/commons/io/testtools/YellOnCloseInputStream.java +++ b/src/test/java/org/apache/commons/io/testtools/YellOnCloseInputStream.java @@ -19,10 +19,10 @@ package org.apache.commons.io.testtools; import java.io.IOException; import java.io.InputStream; -import junit.framework.AssertionFailedError; - import org.apache.commons.io.input.ProxyInputStream; +import junit.framework.AssertionFailedError; + /** * Helper class for checking behaviour of IO classes. */ http://git-wip-us.apache.org/repos/asf/commons-io/blob/4ed92759/src/test/java/org/apache/commons/io/testtools/YellOnFlushAndCloseOutputStream.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/testtools/YellOnFlushAndCloseOutputStream.java b/src/test/java/org/apache/commons/io/testtools/YellOnFlushAndCloseOutputStream.java index 0fa5c32..5addec4 100644 --- a/src/test/java/org/apache/commons/io/testtools/YellOnFlushAndCloseOutputStream.java +++ b/src/test/java/org/apache/commons/io/testtools/YellOnFlushAndCloseOutputStream.java @@ -19,10 +19,10 @@ package org.apache.commons.io.testtools; import java.io.IOException; import java.io.OutputStream; -import junit.framework.AssertionFailedError; - import org.apache.commons.io.output.ProxyOutputStream; +import junit.framework.AssertionFailedError; + /** * Helper class for checking behaviour of IO classes. */
