Repository: commons-io Updated Branches: refs/heads/master cb66f2f8d -> 73202a1e3
Replace custom temporary folder management with JUnit's TemporaryFolder. This will allow Maven to run tests concurrently. Project: http://git-wip-us.apache.org/repos/asf/commons-io/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-io/commit/73202a1e Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/73202a1e Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/73202a1e Branch: refs/heads/master Commit: 73202a1e336eccbf9928bcfb5a780a0b97a49680 Parents: cb66f2f Author: Gary Gregory <ggreg...@apache.org> Authored: Wed Sep 27 13:04:27 2017 -0600 Committer: Gary Gregory <ggreg...@apache.org> Committed: Wed Sep 27 13:04:27 2017 -0600 ---------------------------------------------------------------------- .../io/output/FileWriterWithEncodingTest.java | 22 +++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-io/blob/73202a1e/src/test/java/org/apache/commons/io/output/FileWriterWithEncodingTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/output/FileWriterWithEncodingTest.java b/src/test/java/org/apache/commons/io/output/FileWriterWithEncodingTest.java index eba5144..cbb4b08 100644 --- a/src/test/java/org/apache/commons/io/output/FileWriterWithEncodingTest.java +++ b/src/test/java/org/apache/commons/io/output/FileWriterWithEncodingTest.java @@ -16,6 +16,11 @@ */ package org.apache.commons.io.output; +import static org.apache.commons.io.testtools.TestUtils.checkFile; +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.FileOutputStream; import java.io.FileWriter; @@ -27,21 +32,24 @@ import java.nio.charset.CharsetEncoder; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -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.apache.commons.io.testtools.TestUtils.checkFile; -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 the encoding is actually set and used. * */ -public class FileWriterWithEncodingTest extends FileBasedTestCase { +public class FileWriterWithEncodingTest { + + @Rule + public TemporaryFolder temporaryFolder = new TemporaryFolder(); + + private File getTestDirectory() { + return temporaryFolder.getRoot(); + } private String defaultEncoding; private File file1;
