Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/commons-io

Author: stain

src/test/java/org/apache/commons/io/CopyUtilsTest.java

@@ -20,7 +20,6 @@
 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;
@@ -32,9 +31,7 @@
 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 org.junit.rules.TemporaryFolder;
 
 @SuppressWarnings("deprecation") // these are test cases for the deprecated CopyUtils
 
@@ -45,13 +42,6 @@
  */
 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
      * flush and close status would be to implement "trojan horse" wrapper
@@ -61,7 +51,6 @@ private static File getTestDirectory() {
 
     private static final int FILE_SIZE = 1024 * 4 + 1;
 
-
     private final byte[] inData = TestUtils.generateTestData(FILE_SIZE);
 
     // ----------------------------------------------------------------

src/test/java/org/apache/commons/io/FileDeleteStrategyTestCase.java

@@ -27,7 +27,6 @@
 import java.io.IOException;
 
 import org.apache.commons.io.testtools.TestUtils;
-import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -160,10 +159,4 @@ public void testToString() {
         assertEquals("FileDeleteStrategy[Normal]", FileDeleteStrategy.NORMAL.toString());
         assertEquals("FileDeleteStrategy[Force]", FileDeleteStrategy.FORCE.toString());
     }
-
-    @After
-    public void tearDown() throws Exception {
-        FileUtils.deleteDirectory(getTestDirectory());
-    }
-
 }

src/test/java/org/apache/commons/io/FileSystemUtilsTestCase.java

@@ -29,23 +29,14 @@
 import java.util.Locale;
 
 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 {
 
-    @ClassRule
-    public static TemporaryFolder temporaryFolder = new TemporaryFolder();
-
-    private static File getTestDirectory() {
-        return temporaryFolder.getRoot();
-    }
-
     //-----------------------------------------------------------------------
     @Test
     @SuppressWarnings("deprecation") // testing decrecated code

src/test/java/org/apache/commons/io/FileUtilsCleanDirectoryTestCase.java

@@ -25,9 +25,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.After;
 import org.junit.Before;
-import org.junit.ClassRule;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
@@ -37,35 +36,14 @@
  */
 public class FileUtilsCleanDirectoryTestCase {
 
-    @ClassRule
-    public static TemporaryFolder temporaryFolder = new TemporaryFolder();
+    @Rule
+    public TemporaryFolder temporaryFolder = new TemporaryFolder();
 
-    private static File getTestDirectory() {
-        return temporaryFolder.getRoot();
-    }
-
-    final File top = getLocalTestDirectory();
-
-    private File getLocalTestDirectory() {
-        return new File(getTestDirectory(), "list-files");
-    }
+    private File top;
 
-    /**
-     * @see junit.framework.TestCase#setUp()
-     */
     @Before
     public void setUp() throws Exception {
-        top.mkdirs();
-    }
-
-    /**
-     * @see junit.framework.TestCase#tearDown()
-     */
-    @After
-    public void tearDown() throws Exception {
-        chmod(top, 775, true);
-        FileUtils.deleteDirectory(top);
-        FileUtils.deleteDirectory(getTestDirectory());
+        top = temporaryFolder.getRoot();
     }
 
     //-----------------------------------------------------------------------

src/test/java/org/apache/commons/io/FileUtilsCleanSymlinksTestCase.java

@@ -24,9 +24,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.After;
 import org.junit.Before;
-import org.junit.ClassRule;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
@@ -36,23 +35,14 @@
  */
 public class FileUtilsCleanSymlinksTestCase {
 
-    @ClassRule
-    public static TemporaryFolder temporaryFolder = new TemporaryFolder();
+    @Rule
+    public TemporaryFolder temporaryFolder = new TemporaryFolder();
 
-    private static File getTestDirectory() {
-        return temporaryFolder.getRoot();
-    }
-
-    final File top = getTestDirectory();
+    private File top;
 
     @Before
     public void setUp() throws Exception {
-        top.mkdirs();
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        FileUtils.deleteDirectory(top);
+        top = temporaryFolder.getRoot();
     }
 
     @Test

src/test/java/org/apache/commons/io/FileUtilsDirectoryContainsTestCase.java

@@ -23,9 +23,8 @@
 import java.io.File;
 import java.io.IOException;
 
-import org.junit.After;
 import org.junit.Before;
-import org.junit.ClassRule;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
@@ -34,16 +33,11 @@
  *
  * @see FileUtils#directoryContains(File, File)
  * @since 2.2
- * @version $Id$
  */
 public class FileUtilsDirectoryContainsTestCase {
 
-    @ClassRule
-    public static TemporaryFolder temporaryFolder = new TemporaryFolder();
-
-    private static File getTestDirectory() {
-        return temporaryFolder.getRoot();
-    }
+    @Rule
+    public TemporaryFolder temporaryFolder = new TemporaryFolder();
 
     private File directory1;
     private File directory2;
@@ -53,12 +47,12 @@ private static File getTestDirectory() {
     private File file2;
     private File file2ByRelativeDirectory1;
     private File file3;
-    final File top = getTestDirectory();
+    private File top;
 
     @SuppressWarnings("ResultOfMethodCallIgnored")
     @Before
     public void setUp() throws Exception {
-        top.mkdirs();
+        top = temporaryFolder.getRoot();
 
         directory1 = new File(top, "directory1");
         directory2 = new File(top, "directory2");
@@ -73,19 +67,14 @@ public void setUp() throws Exception {
         file3 = new File(top, "file3");
 
         // Tests case with relative path
-        file1ByRelativeDirectory2 = new File(getTestDirectory(), "directory2/../directory1/file1");
-        file2ByRelativeDirectory1 = new File(getTestDirectory(), "directory1/../directory2/file2");
+        file1ByRelativeDirectory2 = new File(top, "directory2/../directory1/file1");
+        file2ByRelativeDirectory1 = new File(top, "directory1/../directory2/file2");
 
         FileUtils.touch(file1);
         FileUtils.touch(file2);
         FileUtils.touch(file3);
     }
 
-    @After
-    public void tearDown() throws Exception {
-        FileUtils.deleteDirectory(top);
-    }
-
     @Test
     public void testCanonicalPath() throws IOException {
         assertTrue(FileUtils.directoryContains(directory1, file1ByRelativeDirectory2));

src/test/java/org/apache/commons/io/FileUtilsFileNewerTestCase.java

@@ -26,9 +26,8 @@
 import java.util.Date;
 
 import org.apache.commons.io.testtools.TestUtils;
-import org.junit.After;
 import org.junit.Before;
-import org.junit.ClassRule;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
@@ -37,29 +36,24 @@
  */
 public class FileUtilsFileNewerTestCase {
 
-    @ClassRule
-    public static TemporaryFolder temporaryFolder = new TemporaryFolder();
+    @Rule
+    public TemporaryFolder temporaryFolder = new TemporaryFolder();
 
-    private static File getTestDirectory() {
+    private File getTestDirectory() {
         return temporaryFolder.getRoot();
     }
 
     // Test data
     private static final int FILE1_SIZE = 1;
     private static final int FILE2_SIZE = 1024 * 4 + 1;
 
-    private final File m_testFile1;
-    private final File m_testFile2;
+    private File m_testFile1;
+    private File m_testFile2;
 
-    public FileUtilsFileNewerTestCase() {
-        m_testFile1 = new File(getTestDirectory(), "file1-test.txt");
-        m_testFile2 = new File(getTestDirectory(), "file2-test.txt");
-    }
-
-    /** @see junit.framework.TestCase#setUp() */
     @Before
     public void setUp() throws Exception {
-        getTestDirectory().mkdirs();
+        m_testFile1 = new File(getTestDirectory(), "file1-test.txt");
+        m_testFile2 = new File(getTestDirectory(), "file2-test.txt");
         if (!m_testFile1.getParentFile().exists()) {
             throw new IOException("Cannot create file " + m_testFile1
                     + " as the parent directory does not exist");
@@ -78,14 +72,6 @@ public void setUp() throws Exception {
         }
     }
 
-    /** @see junit.framework.TestCase#tearDown() */
-    @After
-    public void tearDown() throws Exception {
-        m_testFile1.delete();
-        m_testFile2.delete();
-        FileUtils.deleteDirectory(getTestDirectory());
-    }
-
     /**
      * Tests the <code>isFileNewer(File, *)</code> methods which a "normal" file.
      *

src/test/java/org/apache/commons/io/FileUtilsListFilesTestCase.java

@@ -28,9 +28,8 @@
 
 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.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
@@ -39,15 +38,11 @@
  */
 public class FileUtilsListFilesTestCase {
 
-    @ClassRule
-    public static TemporaryFolder temporaryFolder = new TemporaryFolder();
-
-    private static File getTestDirectory() {
-        return temporaryFolder.getRoot();
-    }
+    @Rule
+    public TemporaryFolder temporaryFolder = new TemporaryFolder();
 
     private File getLocalTestDirectory() {
-        return new File(getTestDirectory(), "list-files");
+        return temporaryFolder.getRoot();
     }
 
     /**
@@ -57,10 +52,6 @@ private File getLocalTestDirectory() {
     @Before
     public void setUp() throws Exception {
         File dir = getLocalTestDirectory();
-        if (dir.exists()) {
-            FileUtils.deleteDirectory(dir);
-        }
-        dir.mkdirs();
         File file = new File(dir, "dummy-build.xml");
         FileUtils.touch(file);
         file = new File(dir, "README");
@@ -89,16 +80,6 @@ public void setUp() throws Exception {
         FileUtils.touch(file);
     }
 
-    /**
-     * @see junit.framework.TestCase#tearDown()
-     */
-    @After
-    public void tearDown() throws Exception {
-        final File dir = getLocalTestDirectory();
-        FileUtils.deleteDirectory(dir);
-        FileUtils.deleteDirectory(getTestDirectory());
-    }
-
     private Collection<String> filesToFilenames(final Collection<File> files) {
         final Collection<String> filenames = new ArrayList<>(files.size());
         for (final File file : files) {