Repository: commons-io Updated Branches: refs/heads/master 25f3713d9 -> d654978ff
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/d654978f Tree: http://git-wip-us.apache.org/repos/asf/commons-io/tree/d654978f Diff: http://git-wip-us.apache.org/repos/asf/commons-io/diff/d654978f Branch: refs/heads/master Commit: d654978ff5a8980c0efe10632f55218f4de4e6b3 Parents: 25f3713 Author: Gary Gregory <ggreg...@apache.org> Authored: Wed Sep 27 13:11:51 2017 -0600 Committer: Gary Gregory <ggreg...@apache.org> Committed: Wed Sep 27 13:11:51 2017 -0600 ---------------------------------------------------------------------- .../io/filefilter/AndFileFilterTestCase.java | 4 ++-- .../ConditionalFileFilterAbstractTestCase.java | 8 ++++---- .../filefilter/IOFileFilterAbstractTestCase.java | 4 ++-- .../io/filefilter/OrFileFilterTestCase.java | 4 ++-- .../io/filefilter/RegexFileFilterTestCase.java | 18 +++++++++++++----- 5 files changed, 23 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-io/blob/d654978f/src/test/java/org/apache/commons/io/filefilter/AndFileFilterTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/filefilter/AndFileFilterTestCase.java b/src/test/java/org/apache/commons/io/filefilter/AndFileFilterTestCase.java index f5baca3..17d4bbc 100644 --- a/src/test/java/org/apache/commons/io/filefilter/AndFileFilterTestCase.java +++ b/src/test/java/org/apache/commons/io/filefilter/AndFileFilterTestCase.java @@ -16,11 +16,11 @@ */ package org.apache.commons.io.filefilter; -import org.junit.Before; - import java.util.ArrayList; import java.util.List; +import org.junit.Before; + public class AndFileFilterTestCase extends ConditionalFileFilterAbstractTestCase { private static final String DEFAULT_WORKING_PATH = "./AndFileFilterTestCase/"; http://git-wip-us.apache.org/repos/asf/commons-io/blob/d654978f/src/test/java/org/apache/commons/io/filefilter/ConditionalFileFilterAbstractTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/filefilter/ConditionalFileFilterAbstractTestCase.java b/src/test/java/org/apache/commons/io/filefilter/ConditionalFileFilterAbstractTestCase.java index e62540f..0a8e07f 100644 --- a/src/test/java/org/apache/commons/io/filefilter/ConditionalFileFilterAbstractTestCase.java +++ b/src/test/java/org/apache/commons/io/filefilter/ConditionalFileFilterAbstractTestCase.java @@ -16,15 +16,15 @@ */ package org.apache.commons.io.filefilter; -import org.junit.Before; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.io.File; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.junit.Before; +import org.junit.Test; public abstract class ConditionalFileFilterAbstractTestCase extends IOFileFilterAbstractTestCase { http://git-wip-us.apache.org/repos/asf/commons-io/blob/d654978f/src/test/java/org/apache/commons/io/filefilter/IOFileFilterAbstractTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/filefilter/IOFileFilterAbstractTestCase.java b/src/test/java/org/apache/commons/io/filefilter/IOFileFilterAbstractTestCase.java index a08b26d..a2bec0f 100644 --- a/src/test/java/org/apache/commons/io/filefilter/IOFileFilterAbstractTestCase.java +++ b/src/test/java/org/apache/commons/io/filefilter/IOFileFilterAbstractTestCase.java @@ -16,10 +16,10 @@ */ package org.apache.commons.io.filefilter; -import java.io.File; - import static org.junit.Assert.assertEquals; +import java.io.File; + public abstract class IOFileFilterAbstractTestCase { public static void assertFileFiltering(final int testNumber, final IOFileFilter filter, final File file, final boolean expected) http://git-wip-us.apache.org/repos/asf/commons-io/blob/d654978f/src/test/java/org/apache/commons/io/filefilter/OrFileFilterTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/filefilter/OrFileFilterTestCase.java b/src/test/java/org/apache/commons/io/filefilter/OrFileFilterTestCase.java index f4a0044..15414aa 100644 --- a/src/test/java/org/apache/commons/io/filefilter/OrFileFilterTestCase.java +++ b/src/test/java/org/apache/commons/io/filefilter/OrFileFilterTestCase.java @@ -16,11 +16,11 @@ */ package org.apache.commons.io.filefilter; -import org.junit.Before; - import java.util.ArrayList; import java.util.List; +import org.junit.Before; + public class OrFileFilterTestCase extends ConditionalFileFilterAbstractTestCase { private static final String DEFAULT_WORKING_PATH = "./OrFileFilterTestCase/"; http://git-wip-us.apache.org/repos/asf/commons-io/blob/d654978f/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTestCase.java b/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTestCase.java index 25381dc..1cce1b1 100644 --- a/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTestCase.java +++ b/src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTestCase.java @@ -16,23 +16,31 @@ */ package org.apache.commons.io.filefilter; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + import java.io.File; import java.util.regex.Pattern; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOCase; -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.fail; +import org.junit.rules.TemporaryFolder; /** * Used to test RegexFileFilterUtils. */ -public class RegexFileFilterTestCase extends FileBasedTestCase { +public class RegexFileFilterTestCase { + + @ClassRule + public static TemporaryFolder temporaryFolder = new TemporaryFolder(); + + private static File getTestDirectory() { + return temporaryFolder.getRoot(); + } @Before public void setUp() {
