Replace custom temporary folder management with JUnit's TemporaryFolder.

This will allow Maven to run tests concurrently. Clean up imports.

Author: garydgregory

src/test/java/org/apache/commons/io/output/BrokenOutputStreamTest.java

@@ -16,14 +16,14 @@
  */
 package org.apache.commons.io.output;
 
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * JUnit Test Case for {@link BrokenOutputStream}.

src/test/java/org/apache/commons/io/output/ByteArrayOutputStreamTestCase.java

@@ -16,16 +16,16 @@
  */
 package org.apache.commons.io.output;
 
-import org.apache.commons.io.IOUtils;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
+import org.apache.commons.io.IOUtils;
+import org.junit.Test;
 
 /**
  * Basic unit tests for the alternative ByteArrayOutputStream implementation.

src/test/java/org/apache/commons/io/output/CloseShieldOutputStreamTest.java

@@ -16,15 +16,15 @@
  */
 package org.apache.commons.io.output;
 
-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.fail;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.fail;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * JUnit Test Case for {@link CloseShieldOutputStream}.

src/test/java/org/apache/commons/io/output/ClosedOutputStreamTest.java

@@ -16,12 +16,12 @@
  */
 package org.apache.commons.io.output;
 
+import static org.junit.Assert.fail;
+
 import java.io.IOException;
 
 import org.junit.Test;
 
-import static org.junit.Assert.fail;
-
 /**
  * JUnit Test Case for {@link ClosedOutputStream}.
  */

src/test/java/org/apache/commons/io/output/CountingOutputStreamTest.java

@@ -17,6 +17,9 @@
 package org.apache.commons.io.output;
 
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -25,9 +28,6 @@
 import org.apache.commons.io.input.NullInputStream;
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
 
 /**
  * @version $Id$

src/test/java/org/apache/commons/io/output/LockableFileWriterTest.java

@@ -16,28 +16,36 @@
  */
 package org.apache.commons.io.output;
 
+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 java.io.Writer;
 import java.nio.charset.StandardCharsets;
 import java.nio.charset.UnsupportedCharsetException;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.testtools.FileBasedTestCase;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 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;
 
 /**
  * Tests that files really lock, although no writing is done as
  * the locking is tested only on construction.
  *
  */
-public class LockableFileWriterTest extends FileBasedTestCase {
+public class LockableFileWriterTest {
+
+    @Rule
+    public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+    private File getTestDirectory() {
+        return temporaryFolder.getRoot();
+    }
 
     private File file;
     private File lockDir;

src/test/java/org/apache/commons/io/output/NullOutputStreamTest.java

@@ -17,10 +17,10 @@
 package org.apache.commons.io.output;
 
 
-import org.junit.Test;
-
 import java.io.IOException;
 
+import org.junit.Test;
+
 
 /**
  * Really not a lot to do here, but checking that no

src/test/java/org/apache/commons/io/output/ProxyOutputStreamTest.java

@@ -16,13 +16,13 @@
  */
 package org.apache.commons.io.output;
 
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
-import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * JUnit Test Case for {@link CloseShieldOutputStream}.

src/test/java/org/apache/commons/io/output/ProxyWriterTest.java

@@ -17,6 +17,7 @@
 package org.apache.commons.io.output;
 
 import static org.junit.Assert.assertEquals;
+
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;

src/test/java/org/apache/commons/io/output/StringBuilderWriterTest.java

@@ -16,14 +16,14 @@
  */
 package org.apache.commons.io.output;
 
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
 
 import java.io.IOException;
 import java.io.Writer;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
+import org.junit.Test;
 
 /**
  * Test case for {@link StringBuilderWriter}.