Repository: commons-io Updated Branches: refs/heads/master 27de9894f -> ca286ab3f
Replace custom temporary folder management with JUnit's TemporaryFolder. This will allow Maven to run tests concurrently. Clean up imports. Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/ca286ab3 Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/ca286ab3 Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/ca286ab3 Branch: refs/heads/master Commit: ca286ab3fba24ff27294bba50497b81978b27bad Parents: 27de989 Author: Gary Gregory <ggreg...@apache.org> Authored: Wed Sep 27 13:08:23 2017 -0600 Committer: Gary Gregory <ggreg...@apache.org> Committed: Wed Sep 27 13:08:23 2017 -0600 ---------------------------------------------------------------------- .../io/output/BrokenOutputStreamTest.java | 8 ++++---- .../output/ByteArrayOutputStreamTestCase.java | 10 +++++----- .../io/output/CloseShieldOutputStreamTest.java | 10 +++++----- .../io/output/ClosedOutputStreamTest.java | 4 ++-- .../io/output/CountingOutputStreamTest.java | 6 +++--- .../io/output/LockableFileWriterTest.java | 20 ++++++++++++++------ .../commons/io/output/NullOutputStreamTest.java | 4 ++-- .../io/output/ProxyOutputStreamTest.java | 6 +++--- .../commons/io/output/ProxyWriterTest.java | 1 + .../io/output/StringBuilderWriterTest.java | 8 ++++---- .../io/output/TaggedOutputStreamTest.java | 10 +++++----- .../commons/io/output/TeeOutputStreamTest.java | 6 +++--- .../io/output/ThresholdingOutputStreamTest.java | 3 ++- .../io/output/WriterOutputStreamTest.java | 6 +++--- .../commons/io/output/XmlStreamWriterTest.java | 6 +++--- 15 files changed, 59 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-io/blob/ca286ab3/src/test/java/org/apache/commons/io/output/BrokenOutputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/output/BrokenOutputStreamTest.java b/src/test/java/org/apache/commons/io/output/BrokenOutputStreamTest.java index 12b0188..af3573c 100644 --- a/src/test/java/org/apache/commons/io/output/BrokenOutputStreamTest.java +++ b/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}. http://git-wip-us.apache.org/repos/asf/commons-io/blob/ca286ab3/src/test/java/org/apache/commons/io/output/ByteArrayOutputStreamTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/output/ByteArrayOutputStreamTestCase.java b/src/test/java/org/apache/commons/io/output/ByteArrayOutputStreamTestCase.java index 794b564..b2772d7 100644 --- a/src/test/java/org/apache/commons/io/output/ByteArrayOutputStreamTestCase.java +++ b/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. http://git-wip-us.apache.org/repos/asf/commons-io/blob/ca286ab3/src/test/java/org/apache/commons/io/output/CloseShieldOutputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/output/CloseShieldOutputStreamTest.java b/src/test/java/org/apache/commons/io/output/CloseShieldOutputStreamTest.java index 8b6a547..dcba41f 100644 --- a/src/test/java/org/apache/commons/io/output/CloseShieldOutputStreamTest.java +++ b/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}. http://git-wip-us.apache.org/repos/asf/commons-io/blob/ca286ab3/src/test/java/org/apache/commons/io/output/ClosedOutputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/output/ClosedOutputStreamTest.java b/src/test/java/org/apache/commons/io/output/ClosedOutputStreamTest.java index fe4af3d..1735461 100644 --- a/src/test/java/org/apache/commons/io/output/ClosedOutputStreamTest.java +++ b/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}. */ http://git-wip-us.apache.org/repos/asf/commons-io/blob/ca286ab3/src/test/java/org/apache/commons/io/output/CountingOutputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/output/CountingOutputStreamTest.java b/src/test/java/org/apache/commons/io/output/CountingOutputStreamTest.java index 8804efe..89ab9d8 100644 --- a/src/test/java/org/apache/commons/io/output/CountingOutputStreamTest.java +++ b/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.IOUtils; 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$ http://git-wip-us.apache.org/repos/asf/commons-io/blob/ca286ab3/src/test/java/org/apache/commons/io/output/LockableFileWriterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/output/LockableFileWriterTest.java b/src/test/java/org/apache/commons/io/output/LockableFileWriterTest.java index 5b32428..369a934 100644 --- a/src/test/java/org/apache/commons/io/output/LockableFileWriterTest.java +++ b/src/test/java/org/apache/commons/io/output/LockableFileWriterTest.java @@ -16,6 +16,10 @@ */ 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; @@ -23,21 +27,25 @@ 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; http://git-wip-us.apache.org/repos/asf/commons-io/blob/ca286ab3/src/test/java/org/apache/commons/io/output/NullOutputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/output/NullOutputStreamTest.java b/src/test/java/org/apache/commons/io/output/NullOutputStreamTest.java index d792302..c12b272 100644 --- a/src/test/java/org/apache/commons/io/output/NullOutputStreamTest.java +++ b/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 http://git-wip-us.apache.org/repos/asf/commons-io/blob/ca286ab3/src/test/java/org/apache/commons/io/output/ProxyOutputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/output/ProxyOutputStreamTest.java b/src/test/java/org/apache/commons/io/output/ProxyOutputStreamTest.java index 9e44532..a62da65 100644 --- a/src/test/java/org/apache/commons/io/output/ProxyOutputStreamTest.java +++ b/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}. http://git-wip-us.apache.org/repos/asf/commons-io/blob/ca286ab3/src/test/java/org/apache/commons/io/output/ProxyWriterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/output/ProxyWriterTest.java b/src/test/java/org/apache/commons/io/output/ProxyWriterTest.java index 40bf88f..c9e1c28 100644 --- a/src/test/java/org/apache/commons/io/output/ProxyWriterTest.java +++ b/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; http://git-wip-us.apache.org/repos/asf/commons-io/blob/ca286ab3/src/test/java/org/apache/commons/io/output/StringBuilderWriterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/output/StringBuilderWriterTest.java b/src/test/java/org/apache/commons/io/output/StringBuilderWriterTest.java index 405b151..03d61f6 100644 --- a/src/test/java/org/apache/commons/io/output/StringBuilderWriterTest.java +++ b/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}. http://git-wip-us.apache.org/repos/asf/commons-io/blob/ca286ab3/src/test/java/org/apache/commons/io/output/TaggedOutputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/output/TaggedOutputStreamTest.java b/src/test/java/org/apache/commons/io/output/TaggedOutputStreamTest.java index 47b44e2..9357bb6 100644 --- a/src/test/java/org/apache/commons/io/output/TaggedOutputStreamTest.java +++ b/src/test/java/org/apache/commons/io/output/TaggedOutputStreamTest.java @@ -16,6 +16,11 @@ */ package org.apache.commons.io.output; +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.IOException; import java.io.OutputStream; import java.util.UUID; @@ -23,11 +28,6 @@ import java.util.UUID; import org.apache.commons.io.TaggedIOException; 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; - /** * JUnit Test Case for {@link TaggedOutputStream}. */ http://git-wip-us.apache.org/repos/asf/commons-io/blob/ca286ab3/src/test/java/org/apache/commons/io/output/TeeOutputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/output/TeeOutputStreamTest.java b/src/test/java/org/apache/commons/io/output/TeeOutputStreamTest.java index 89a57d7..97f65d0 100644 --- a/src/test/java/org/apache/commons/io/output/TeeOutputStreamTest.java +++ b/src/test/java/org/apache/commons/io/output/TeeOutputStreamTest.java @@ -16,13 +16,13 @@ */ package org.apache.commons.io.output; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.Assert.assertEquals; import java.io.ByteArrayOutputStream; import java.io.IOException; -import static org.junit.Assert.assertEquals; +import org.junit.Assert; +import org.junit.Test; /** * @version $Id$ http://git-wip-us.apache.org/repos/asf/commons-io/blob/ca286ab3/src/test/java/org/apache/commons/io/output/ThresholdingOutputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/output/ThresholdingOutputStreamTest.java b/src/test/java/org/apache/commons/io/output/ThresholdingOutputStreamTest.java index 695e31c..76a8d28 100644 --- a/src/test/java/org/apache/commons/io/output/ThresholdingOutputStreamTest.java +++ b/src/test/java/org/apache/commons/io/output/ThresholdingOutputStreamTest.java @@ -15,7 +15,8 @@ package org.apache.commons.io.output; * See the License for the specific language governing permissions and * limitations under the License. */ -import static org.junit.Assert.*; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.io.IOException; import java.io.OutputStream; http://git-wip-us.apache.org/repos/asf/commons-io/blob/ca286ab3/src/test/java/org/apache/commons/io/output/WriterOutputStreamTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/output/WriterOutputStreamTest.java b/src/test/java/org/apache/commons/io/output/WriterOutputStreamTest.java index c0b39f7..0a689fc 100644 --- a/src/test/java/org/apache/commons/io/output/WriterOutputStreamTest.java +++ b/src/test/java/org/apache/commons/io/output/WriterOutputStreamTest.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.fail; import java.io.IOException; import java.io.StringWriter; import java.util.Random; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import org.junit.Test; public class WriterOutputStreamTest { private static final String TEST_STRING = "\u00e0 peine arriv\u00e9s nous entr\u00e2mes dans sa chambre"; http://git-wip-us.apache.org/repos/asf/commons-io/blob/ca286ab3/src/test/java/org/apache/commons/io/output/XmlStreamWriterTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/output/XmlStreamWriterTest.java b/src/test/java/org/apache/commons/io/output/XmlStreamWriterTest.java index f12462f..0ee2507 100644 --- a/src/test/java/org/apache/commons/io/output/XmlStreamWriterTest.java +++ b/src/test/java/org/apache/commons/io/output/XmlStreamWriterTest.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.assertTrue; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.Arrays; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.junit.Test; /** * @version $Id$
