Skip to content

Commit d654978

Browse files
committed
Static imports come first.
1 parent 25f3713 commit d654978

5 files changed

Lines changed: 23 additions & 15 deletions

File tree

src/test/java/org/apache/commons/io/filefilter/AndFileFilterTestCase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
*/
1717
package org.apache.commons.io.filefilter;
1818

19-
import org.junit.Before;
20-
2119
import java.util.ArrayList;
2220
import java.util.List;
2321

22+
import org.junit.Before;
23+
2424
public class AndFileFilterTestCase extends ConditionalFileFilterAbstractTestCase {
2525

2626
private static final String DEFAULT_WORKING_PATH = "./AndFileFilterTestCase/";

src/test/java/org/apache/commons/io/filefilter/ConditionalFileFilterAbstractTestCase.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
*/
1717
package org.apache.commons.io.filefilter;
1818

19-
import org.junit.Before;
20-
import org.junit.Test;
19+
import static org.junit.Assert.assertEquals;
20+
import static org.junit.Assert.assertTrue;
2121

2222
import java.io.File;
2323
import java.util.ArrayList;
2424
import java.util.List;
2525

26-
import static org.junit.Assert.assertEquals;
27-
import static org.junit.Assert.assertTrue;
26+
import org.junit.Before;
27+
import org.junit.Test;
2828

2929
public abstract class ConditionalFileFilterAbstractTestCase extends IOFileFilterAbstractTestCase {
3030

src/test/java/org/apache/commons/io/filefilter/IOFileFilterAbstractTestCase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
*/
1717
package org.apache.commons.io.filefilter;
1818

19-
import java.io.File;
20-
2119
import static org.junit.Assert.assertEquals;
2220

21+
import java.io.File;
22+
2323
public abstract class IOFileFilterAbstractTestCase {
2424

2525
public static void assertFileFiltering(final int testNumber, final IOFileFilter filter, final File file, final boolean expected)

src/test/java/org/apache/commons/io/filefilter/OrFileFilterTestCase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
*/
1717
package org.apache.commons.io.filefilter;
1818

19-
import org.junit.Before;
20-
2119
import java.util.ArrayList;
2220
import java.util.List;
2321

22+
import org.junit.Before;
23+
2424
public class OrFileFilterTestCase extends ConditionalFileFilterAbstractTestCase {
2525

2626
private static final String DEFAULT_WORKING_PATH = "./OrFileFilterTestCase/";

src/test/java/org/apache/commons/io/filefilter/RegexFileFilterTestCase.java

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,31 @@
1616
*/
1717
package org.apache.commons.io.filefilter;
1818

19+
import static org.junit.Assert.assertEquals;
20+
import static org.junit.Assert.fail;
21+
1922
import java.io.File;
2023
import java.util.regex.Pattern;
2124

2225
import org.apache.commons.io.FileUtils;
2326
import org.apache.commons.io.IOCase;
24-
import org.apache.commons.io.testtools.FileBasedTestCase;
2527
import org.junit.After;
2628
import org.junit.Before;
29+
import org.junit.ClassRule;
2730
import org.junit.Test;
28-
29-
import static org.junit.Assert.assertEquals;
30-
import static org.junit.Assert.fail;
31+
import org.junit.rules.TemporaryFolder;
3132

3233
/**
3334
* Used to test RegexFileFilterUtils.
3435
*/
35-
public class RegexFileFilterTestCase extends FileBasedTestCase {
36+
public class RegexFileFilterTestCase {
37+
38+
@ClassRule
39+
public static TemporaryFolder temporaryFolder = new TemporaryFolder();
40+
41+
private static File getTestDirectory() {
42+
return temporaryFolder.getRoot();
43+
}
3644

3745
@Before
3846
public void setUp() {

0 commit comments

Comments
 (0)