Skip to content

FileFilterTest minor fixes #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
garydgregory merged 4 commits into from
Mar 28, 2022
Merged

FileFilterTest minor fixes #340

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ee80a2
use assertThrows for cleaner test
otter606 Mar 28, 2022
8d4a51b
cleaner assertions for testFilterListNullParameters
otter606 Mar 28, 2022
cdd5b12
add missing boolan combination in testAnd
otter606 Mar 28, 2022
f157b99
use assertThrows for cleaner test: testNameFilterNullArgument
otter606 Mar 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 13 additions & 29 deletions src/test/java/org/apache/commons/io/filefilter/FileFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public void testAnd() {
assertFiltering(trueFilter.and(trueFilter), new File("foo.test"), true);
assertFiltering(trueFilter.and(falseFilter), new File("foo.test"), false);
assertFiltering(falseFilter.and(trueFilter), new File("foo.test"), false);
assertFiltering(falseFilter.and(trueFilter), new File("foo.test"), false);
assertFiltering(falseFilter.and(falseFilter), new File("foo.test"), false);
}

@Test
Expand Down Expand Up @@ -622,13 +622,11 @@ public void testFilterListNullParameters() {
assertThrows(IllegalArgumentException.class, () -> FileFilterUtils.filterList(null, Collections.emptyList()));

final IOFileFilter filter = FileFilterUtils.trueFileFilter();
try {
FileFilterUtils.filterList(filter, Collections.singletonList(null));
} catch (final IllegalArgumentException iae) {
// Test passes, exception thrown for list containing null
}
List<File> filteredList = FileFilterUtils.filterList(filter, Collections.singletonList(null));
assertEquals(1, filteredList.size());
assertEquals(null, filteredList.get(0));

final List<File> filteredList = FileFilterUtils.filterList(filter, (List<File>) null);
filteredList = FileFilterUtils.filterList(filter, (List<File>) null);
assertEquals(0, filteredList.size());
}

Expand Down Expand Up @@ -1043,17 +1041,13 @@ public void testNameFilter() {
@Test
public void testNameFilterNullArgument() {
final String test = null;
try {
new NameFileFilter(test);
fail("constructing a NameFileFilter with a null String argument should fail.");
} catch (final IllegalArgumentException ignore) {
}
final String failMessage = "constructing a NameFileFilter with a null String argument should fail.";
assertThrows(IllegalArgumentException.class, ()->new NameFileFilter(test),
failMessage );

try {
FileFilterUtils.nameFileFilter(test, IOCase.INSENSITIVE);
fail("constructing a NameFileFilter with a null String argument should fail.");
} catch (final IllegalArgumentException ignore) {
}
assertThrows(IllegalArgumentException.class,
()-> FileFilterUtils.nameFileFilter(test, IOCase.INSENSITIVE),
failMessage);
}

@Test
Expand All @@ -1079,18 +1073,8 @@ public void testNegate() {

@Test
public void testNullFilters() {
try {
FileFilterUtils.toList((IOFileFilter) null);
fail("Expected IllegalArgumentException");
} catch (final IllegalArgumentException ignore) {
// expected
}
try {
FileFilterUtils.toList(new IOFileFilter[] {null});
fail("Expected IllegalArgumentException");
} catch (final IllegalArgumentException ignore) {
// expected
}
assertThrows(IllegalArgumentException.class, ()-> FileFilterUtils.toList((IOFileFilter) null));
assertThrows(IllegalArgumentException.class, ()-> FileFilterUtils.toList(new IOFileFilter[] {null}));
}

@Test
Expand Down