From 35364cf70e3570b2cc874bee537166f91455bfc5 Mon Sep 17 00:00:00 2001 From: Ben Fortuna Date: Sun, 30 Dec 2018 15:01:37 +1100 Subject: [PATCH] Use lambda file filters --- build.gradle | 1 - .../net/fortuna/ical4j/data/CalendarBuilderTest.java | 11 ++++++----- .../net/fortuna/ical4j/data/CalendarEqualsTest.java | 5 +---- .../fortuna/ical4j/data/CalendarOutputterTest.java | 6 ++---- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index b2bb7ab67..e03a96e40 100644 --- a/build.gradle +++ b/build.gradle @@ -84,7 +84,6 @@ dependencies { testImplementation "org.codehaus.groovy:groovy-all:$groovyVersion", 'org.spockframework:spock-core:1.1-groovy-2.4', - 'commons-io:commons-io:2.4', 'org.ccil.cowan.tagsoup:tagsoup:1.2.1', "org.slf4j:slf4j-log4j12:$slf4jVersion", 'org.ehcache:ehcache:3.4.0' diff --git a/src/test/java/net/fortuna/ical4j/data/CalendarBuilderTest.java b/src/test/java/net/fortuna/ical4j/data/CalendarBuilderTest.java index cd02f6d90..1c628a564 100644 --- a/src/test/java/net/fortuna/ical4j/data/CalendarBuilderTest.java +++ b/src/test/java/net/fortuna/ical4j/data/CalendarBuilderTest.java @@ -37,12 +37,13 @@ import net.fortuna.ical4j.model.Calendar; import net.fortuna.ical4j.util.CompatibilityHints; import net.fortuna.ical4j.validate.ValidationException; -import org.apache.commons.io.filefilter.DirectoryFileFilter; -import org.apache.commons.io.filefilter.NotFileFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; /** * $Id: CalendarBuilderTest.java [Apr 5, 2004] @@ -147,14 +148,14 @@ public static Test suite() throws FileNotFoundException { File[] testFiles = null; // valid tests.. - testFiles = new File("src/test/resources/samples/valid").listFiles((FileFilter) new NotFileFilter(DirectoryFileFilter.INSTANCE)); + testFiles = new File("src/test/resources/samples/valid").listFiles(f -> !f.isDirectory() && f.getName().endsWith(".ics")); for (int i = 0; i < testFiles.length; i++) { log.info("Sample [" + testFiles[i] + "]"); suite.addTest(new CalendarBuilderTest("testBuildValid", testFiles[i].getPath())); } // invalid tests.. - testFiles = new File("src/test/resources/samples/invalid").listFiles((FileFilter) new NotFileFilter(DirectoryFileFilter.INSTANCE)); + testFiles = new File("src/test/resources/samples/invalid").listFiles(f -> !f.isDirectory() && f.getName().endsWith(".ics")); for (int i = 0; i < testFiles.length; i++) { log.info("Sample [" + testFiles[i] + "]"); suite.addTest(new CalendarBuilderTest("testBuildInvalid", testFiles[i].getPath())); diff --git a/src/test/java/net/fortuna/ical4j/data/CalendarEqualsTest.java b/src/test/java/net/fortuna/ical4j/data/CalendarEqualsTest.java index 015fb01ba..b70e89f74 100644 --- a/src/test/java/net/fortuna/ical4j/data/CalendarEqualsTest.java +++ b/src/test/java/net/fortuna/ical4j/data/CalendarEqualsTest.java @@ -37,11 +37,8 @@ import net.fortuna.ical4j.model.Calendar; import net.fortuna.ical4j.util.CompatibilityHints; import net.fortuna.ical4j.validate.ValidationException; -import org.apache.commons.io.filefilter.DirectoryFileFilter; -import org.apache.commons.io.filefilter.NotFileFilter; import java.io.File; -import java.io.FileFilter; import java.io.FileInputStream; import java.io.IOException; @@ -170,7 +167,7 @@ public final String getName() { public static TestSuite suite() { TestSuite suite = new TestSuite(); - File[] testFiles = new File("src/test/resources/samples/valid").listFiles((FileFilter) new NotFileFilter(DirectoryFileFilter.INSTANCE)); + File[] testFiles = new File("src/test/resources/samples/valid").listFiles(f -> !f.isDirectory() && f.getName().endsWith(".ics")); for (int i = 0; i < testFiles.length; i++) { suite.addTest(new CalendarEqualsTest((File) testFiles[i], true)); } diff --git a/src/test/java/net/fortuna/ical4j/data/CalendarOutputterTest.java b/src/test/java/net/fortuna/ical4j/data/CalendarOutputterTest.java index c5157e36c..50635c85f 100644 --- a/src/test/java/net/fortuna/ical4j/data/CalendarOutputterTest.java +++ b/src/test/java/net/fortuna/ical4j/data/CalendarOutputterTest.java @@ -37,8 +37,6 @@ import net.fortuna.ical4j.model.Calendar; import net.fortuna.ical4j.util.CompatibilityHints; import net.fortuna.ical4j.validate.ValidationException; -import org.apache.commons.io.filefilter.DirectoryFileFilter; -import org.apache.commons.io.filefilter.NotFileFilter; import org.junit.Ignore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -156,14 +154,14 @@ public static Test suite() { File[] testFiles = null; // valid tests.. - testFiles = new File("src/test/resources/samples/valid").listFiles((FileFilter) new NotFileFilter(DirectoryFileFilter.INSTANCE)); + testFiles = new File("src/test/resources/samples/valid").listFiles(f -> !f.isDirectory() && f.getName().endsWith(".ics")); for (int i = 0; i < testFiles.length; i++) { log.info("Sample [" + testFiles[i] + "]"); suite.addTest(new CalendarOutputterTest(testFiles[i].getPath())); } // invalid tests.. - testFiles = new File("src/test/resources/samples/invalid").listFiles((FileFilter) new NotFileFilter(DirectoryFileFilter.INSTANCE)); + testFiles = new File("src/test/resources/samples/invalid").listFiles(f -> !f.isDirectory() && f.getName().endsWith(".ics")); for (int i = 0; i < testFiles.length; i++) { log.info("Sample [" + testFiles[i] + "]"); suite.addTest(new CalendarOutputterTest(testFiles[i].getPath()));