This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
The following commit(s) were added to refs/heads/master by this push:
new dbbfa75 Use varargs.
dbbfa75 is described below
commit dbbfa753e0e4e8345314901d63f3e2ea92437b69
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Sun Feb 28 16:54:09 2021 -0500
Use varargs.
---
.../org/apache/commons/io/FileUtilsTestCase.java | 2 +-
.../apache/commons/io/FilenameUtilsTestCase.java | 60 +++++++++++-----------
.../io/comparator/CompositeFileComparatorTest.java | 4 +-
.../commons/io/filefilter/FileFilterTestCase.java | 10 ++--
4 files changed, 37 insertions(+), 39 deletions(-)
diff --git a/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
b/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
index 752e587..59b6462 100644
--- a/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
@@ -732,7 +732,7 @@ public class FileUtilsTestCase {
final File childDir = new File(parentDir, "child");
createFilesForTestCopyDirectory(grandParentDir, parentDir, childDir);
- final NameFileFilter filter = new NameFileFilter(new
String[]{"parent", "child", "file3.txt"});
+ final NameFileFilter filter = new NameFileFilter("parent", "child",
"file3.txt");
final File destDir = new File(temporaryFolder, "copydest");
FileUtils.copyDirectory(grandParentDir, destDir, filter);
diff --git a/src/test/java/org/apache/commons/io/FilenameUtilsTestCase.java
b/src/test/java/org/apache/commons/io/FilenameUtilsTestCase.java
index 295046e..559c111 100644
--- a/src/test/java/org/apache/commons/io/FilenameUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/io/FilenameUtilsTestCase.java
@@ -1089,38 +1089,38 @@ public class FilenameUtilsTestCase {
assertFalse(FilenameUtils.isExtension(null, (String[]) null));
assertFalse(FilenameUtils.isExtension("file.txt", (String[]) null));
assertTrue(FilenameUtils.isExtension("file", (String[]) null));
- assertFalse(FilenameUtils.isExtension("file.txt", new String[0]));
+ assertFalse(FilenameUtils.isExtension("file.txt"));
assertTrue(FilenameUtils.isExtension("file.txt", new String[]{"txt"}));
assertFalse(FilenameUtils.isExtension("file.txt", new
String[]{"rtf"}));
- assertTrue(FilenameUtils.isExtension("file", new String[]{"rtf", ""}));
- assertTrue(FilenameUtils.isExtension("file.txt", new String[]{"rtf",
"txt"}));
+ assertTrue(FilenameUtils.isExtension("file", "rtf", ""));
+ assertTrue(FilenameUtils.isExtension("file.txt", "rtf", "txt"));
assertFalse(FilenameUtils.isExtension("a/b/file.txt", (String[])
null));
- assertFalse(FilenameUtils.isExtension("a/b/file.txt", new String[0]));
+ assertFalse(FilenameUtils.isExtension("a/b/file.txt"));
assertTrue(FilenameUtils.isExtension("a/b/file.txt", new
String[]{"txt"}));
assertFalse(FilenameUtils.isExtension("a/b/file.txt", new
String[]{"rtf"}));
- assertTrue(FilenameUtils.isExtension("a/b/file.txt", new
String[]{"rtf", "txt"}));
+ assertTrue(FilenameUtils.isExtension("a/b/file.txt", "rtf", "txt"));
assertFalse(FilenameUtils.isExtension("a.b/file.txt", (String[])
null));
- assertFalse(FilenameUtils.isExtension("a.b/file.txt", new String[0]));
+ assertFalse(FilenameUtils.isExtension("a.b/file.txt"));
assertTrue(FilenameUtils.isExtension("a.b/file.txt", new
String[]{"txt"}));
assertFalse(FilenameUtils.isExtension("a.b/file.txt", new
String[]{"rtf"}));
- assertTrue(FilenameUtils.isExtension("a.b/file.txt", new
String[]{"rtf", "txt"}));
+ assertTrue(FilenameUtils.isExtension("a.b/file.txt", "rtf", "txt"));
assertFalse(FilenameUtils.isExtension("a\\b\\file.txt", (String[])
null));
- assertFalse(FilenameUtils.isExtension("a\\b\\file.txt", new
String[0]));
+ assertFalse(FilenameUtils.isExtension("a\\b\\file.txt"));
assertTrue(FilenameUtils.isExtension("a\\b\\file.txt", new
String[]{"txt"}));
assertFalse(FilenameUtils.isExtension("a\\b\\file.txt", new
String[]{"rtf"}));
- assertTrue(FilenameUtils.isExtension("a\\b\\file.txt", new
String[]{"rtf", "txt"}));
+ assertTrue(FilenameUtils.isExtension("a\\b\\file.txt", "rtf", "txt"));
assertFalse(FilenameUtils.isExtension("a.b\\file.txt", (String[])
null));
- assertFalse(FilenameUtils.isExtension("a.b\\file.txt", new String[0]));
+ assertFalse(FilenameUtils.isExtension("a.b\\file.txt"));
assertTrue(FilenameUtils.isExtension("a.b\\file.txt", new
String[]{"txt"}));
assertFalse(FilenameUtils.isExtension("a.b\\file.txt", new
String[]{"rtf"}));
- assertTrue(FilenameUtils.isExtension("a.b\\file.txt", new
String[]{"rtf", "txt"}));
+ assertTrue(FilenameUtils.isExtension("a.b\\file.txt", "rtf", "txt"));
assertFalse(FilenameUtils.isExtension("a.b\\file.txt", new
String[]{"TXT"}));
- assertFalse(FilenameUtils.isExtension("a.b\\file.txt", new
String[]{"TXT", "RTF"}));
+ assertFalse(FilenameUtils.isExtension("a.b\\file.txt", "TXT", "RTF"));
}
@Test
@@ -1156,36 +1156,36 @@ public class FilenameUtilsTestCase {
assertFalse(FilenameUtils.isExtension("file.txt", (Collection<String>)
null));
assertTrue(FilenameUtils.isExtension("file", (Collection<String>)
null));
assertFalse(FilenameUtils.isExtension("file.txt", new
ArrayList<String>()));
- assertTrue(FilenameUtils.isExtension("file.txt", new
ArrayList<>(Arrays.asList(new String[]{"txt"}))));
- assertFalse(FilenameUtils.isExtension("file.txt", new
ArrayList<>(Arrays.asList(new String[]{"rtf"}))));
- assertTrue(FilenameUtils.isExtension("file", new
ArrayList<>(Arrays.asList(new String[]{"rtf", ""}))));
- assertTrue(FilenameUtils.isExtension("file.txt", new
ArrayList<>(Arrays.asList(new String[]{"rtf", "txt"}))));
+ assertTrue(FilenameUtils.isExtension("file.txt", new
ArrayList<>(Arrays.asList("txt"))));
+ assertFalse(FilenameUtils.isExtension("file.txt", new
ArrayList<>(Arrays.asList("rtf"))));
+ assertTrue(FilenameUtils.isExtension("file", new
ArrayList<>(Arrays.asList("rtf", ""))));
+ assertTrue(FilenameUtils.isExtension("file.txt", new
ArrayList<>(Arrays.asList("rtf", "txt"))));
assertFalse(FilenameUtils.isExtension("a/b/file.txt",
(Collection<String>) null));
assertFalse(FilenameUtils.isExtension("a/b/file.txt", new
ArrayList<String>()));
- assertTrue(FilenameUtils.isExtension("a/b/file.txt", new
ArrayList<>(Arrays.asList(new String[]{"txt"}))));
- assertFalse(FilenameUtils.isExtension("a/b/file.txt", new
ArrayList<>(Arrays.asList(new String[]{"rtf"}))));
- assertTrue(FilenameUtils.isExtension("a/b/file.txt", new
ArrayList<>(Arrays.asList(new String[]{"rtf", "txt"}))));
+ assertTrue(FilenameUtils.isExtension("a/b/file.txt", new
ArrayList<>(Arrays.asList("txt"))));
+ assertFalse(FilenameUtils.isExtension("a/b/file.txt", new
ArrayList<>(Arrays.asList("rtf"))));
+ assertTrue(FilenameUtils.isExtension("a/b/file.txt", new
ArrayList<>(Arrays.asList("rtf", "txt"))));
assertFalse(FilenameUtils.isExtension("a.b/file.txt",
(Collection<String>) null));
assertFalse(FilenameUtils.isExtension("a.b/file.txt", new
ArrayList<String>()));
- assertTrue(FilenameUtils.isExtension("a.b/file.txt", new
ArrayList<>(Arrays.asList(new String[]{"txt"}))));
- assertFalse(FilenameUtils.isExtension("a.b/file.txt", new
ArrayList<>(Arrays.asList(new String[]{"rtf"}))));
- assertTrue(FilenameUtils.isExtension("a.b/file.txt", new
ArrayList<>(Arrays.asList(new String[]{"rtf", "txt"}))));
+ assertTrue(FilenameUtils.isExtension("a.b/file.txt", new
ArrayList<>(Arrays.asList("txt"))));
+ assertFalse(FilenameUtils.isExtension("a.b/file.txt", new
ArrayList<>(Arrays.asList("rtf"))));
+ assertTrue(FilenameUtils.isExtension("a.b/file.txt", new
ArrayList<>(Arrays.asList("rtf", "txt"))));
assertFalse(FilenameUtils.isExtension("a\\b\\file.txt",
(Collection<String>) null));
assertFalse(FilenameUtils.isExtension("a\\b\\file.txt", new
ArrayList<String>()));
- assertTrue(FilenameUtils.isExtension("a\\b\\file.txt", new
ArrayList<>(Arrays.asList(new String[]{"txt"}))));
- assertFalse(FilenameUtils.isExtension("a\\b\\file.txt", new
ArrayList<>(Arrays.asList(new String[]{"rtf"}))));
- assertTrue(FilenameUtils.isExtension("a\\b\\file.txt", new
ArrayList<>(Arrays.asList(new String[]{"rtf", "txt"}))));
+ assertTrue(FilenameUtils.isExtension("a\\b\\file.txt", new
ArrayList<>(Arrays.asList("txt"))));
+ assertFalse(FilenameUtils.isExtension("a\\b\\file.txt", new
ArrayList<>(Arrays.asList("rtf"))));
+ assertTrue(FilenameUtils.isExtension("a\\b\\file.txt", new
ArrayList<>(Arrays.asList("rtf", "txt"))));
assertFalse(FilenameUtils.isExtension("a.b\\file.txt",
(Collection<String>) null));
assertFalse(FilenameUtils.isExtension("a.b\\file.txt", new
ArrayList<String>()));
- assertTrue(FilenameUtils.isExtension("a.b\\file.txt", new
ArrayList<>(Arrays.asList(new String[]{"txt"}))));
- assertFalse(FilenameUtils.isExtension("a.b\\file.txt", new
ArrayList<>(Arrays.asList(new String[]{"rtf"}))));
- assertTrue(FilenameUtils.isExtension("a.b\\file.txt", new
ArrayList<>(Arrays.asList(new String[]{"rtf", "txt"}))));
+ assertTrue(FilenameUtils.isExtension("a.b\\file.txt", new
ArrayList<>(Arrays.asList("txt"))));
+ assertFalse(FilenameUtils.isExtension("a.b\\file.txt", new
ArrayList<>(Arrays.asList("rtf"))));
+ assertTrue(FilenameUtils.isExtension("a.b\\file.txt", new
ArrayList<>(Arrays.asList("rtf", "txt"))));
- assertFalse(FilenameUtils.isExtension("a.b\\file.txt", new
ArrayList<>(Arrays.asList(new String[]{"TXT"}))));
- assertFalse(FilenameUtils.isExtension("a.b\\file.txt", new
ArrayList<>(Arrays.asList(new String[]{"TXT", "RTF"}))));
+ assertFalse(FilenameUtils.isExtension("a.b\\file.txt", new
ArrayList<>(Arrays.asList("TXT"))));
+ assertFalse(FilenameUtils.isExtension("a.b\\file.txt", new
ArrayList<>(Arrays.asList("TXT", "RTF"))));
}
}
diff --git
a/src/test/java/org/apache/commons/io/comparator/CompositeFileComparatorTest.java
b/src/test/java/org/apache/commons/io/comparator/CompositeFileComparatorTest.java
index 56325ef..83a718c 100644
---
a/src/test/java/org/apache/commons/io/comparator/CompositeFileComparatorTest.java
+++
b/src/test/java/org/apache/commons/io/comparator/CompositeFileComparatorTest.java
@@ -39,9 +39,7 @@ public class CompositeFileComparatorTest extends
ComparatorAbstractTestCase {
@BeforeEach
public void setUp() throws Exception {
comparator = new CompositeFileComparator(
- new AbstractFileComparator[] {
- (AbstractFileComparator)
SizeFileComparator.SIZE_COMPARATOR,
- (AbstractFileComparator)
ExtensionFileComparator.EXTENSION_COMPARATOR});
+ (AbstractFileComparator) SizeFileComparator.SIZE_COMPARATOR,
(AbstractFileComparator) ExtensionFileComparator.EXTENSION_COMPARATOR);
reverse = new ReverseFileComparator(comparator);
lessFile = new File(dir, "xyz.txt");
equalFile1 = new File(dir, "foo.txt");
diff --git
a/src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.java
b/src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.java
index dac3e8b..25aef86 100644
--- a/src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.java
+++ b/src/test/java/org/apache/commons/io/filefilter/FileFilterTestCase.java
@@ -460,7 +460,7 @@ public class FileFilterTestCase {
assertFiltering(filter, new File("openXY.123103").toPath(), false);
// assertFiltering(filter, new File("openAB.102504.old").toPath(),
false);
- filter = new WildcardFilter(new String[] {"*.java", "*.class"});
+ filter = new WildcardFilter("*.java", "*.class");
assertFiltering(filter, new File("Test.java"), true);
assertFiltering(filter, new File("Test.class"), true);
assertFiltering(filter, new File("Test.jsp"), false);
@@ -1258,7 +1258,7 @@ public class FileFilterTestCase {
@Test
public void testNameFilter() {
- assertFooBarFileFiltering(new NameFileFilter(new String[] {"foo",
"bar"}));
+ assertFooBarFileFiltering(new NameFileFilter("foo", "bar"));
}
@Test
@@ -1367,7 +1367,7 @@ public class FileFilterTestCase {
@Test
public void testPrefix() {
- IOFileFilter filter = new PrefixFileFilter(new String[] {"foo",
"bar"});
+ IOFileFilter filter = new PrefixFileFilter("foo", "bar");
final File testFile = new File("test");
final Path testPath = testFile.toPath();
final File fredFile = new File("fred");
@@ -1597,7 +1597,7 @@ public class FileFilterTestCase {
@Test
public void testSuffix() {
- IOFileFilter filter = new SuffixFileFilter(new String[] {"tes",
"est"});
+ IOFileFilter filter = new SuffixFileFilter("tes", "est");
final File testFile = new File("test");
final Path testPath = testFile.toPath();
final File fredFile = new File("fred");
@@ -1769,7 +1769,7 @@ public class FileFilterTestCase {
assertFiltering(filter, new File("log.txt").toPath(), true);
assertFiltering(filter, new File("log.TXT").toPath(), false);
- filter = new WildcardFileFilter(new String[] {"*.java", "*.class"});
+ filter = new WildcardFileFilter("*.java", "*.class");
assertFiltering(filter, new File("Test.java"), true);
assertFiltering(filter, new File("Test.class"), true);
assertFiltering(filter, new File("Test.jsp"), false);
