Repository: nifi Updated Branches: refs/heads/master e4b74b3d7 -> 5cfba6ace
NIFI-3454: Use FileNameFilter to make test consistent use the FileNameFilter when not passing down explit jar paths Filter out ^. files when reading lists of files from directories Signed-off-by: Koji Kawamura <ijokaruma...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/5cfba6ac Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/5cfba6ac Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/5cfba6ac Branch: refs/heads/master Commit: 5cfba6ace324d3537bf70f5c76f883f380503a10 Parents: e4b74b3 Author: Otto Fowler <ofow...@industrialdefender.com> Authored: Thu Feb 9 17:12:35 2017 -0500 Committer: Koji Kawamura <ijokaruma...@apache.org> Committed: Sat Feb 11 08:54:06 2017 +0900 ---------------------------------------------------------------------- .../apache/nifi/util/file/classloader/TestClassLoaderUtils.java | 2 +- .../org/apache/nifi/processors/standard/TestIdentifyMimeType.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/5cfba6ac/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/file/classloader/TestClassLoaderUtils.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/file/classloader/TestClassLoaderUtils.java b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/file/classloader/TestClassLoaderUtils.java index ba85e07..6ad3e89 100644 --- a/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/file/classloader/TestClassLoaderUtils.java +++ b/nifi-commons/nifi-utils/src/test/java/org/apache/nifi/util/file/classloader/TestClassLoaderUtils.java @@ -86,7 +86,7 @@ public class TestClassLoaderUtils { @Test public void testGetURLsForClasspathWithDirectory() throws MalformedURLException { final String jarFilePath = "src/test/resources/TestClassLoaderUtils"; - URL[] urls = ClassLoaderUtils.getURLsForClasspath(jarFilePath, null, false); + URL[] urls = ClassLoaderUtils.getURLsForClasspath(jarFilePath, getJarFilenameFilter(), false); assertEquals(2, urls.length); } http://git-wip-us.apache.org/repos/asf/nifi/blob/5cfba6ac/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestIdentifyMimeType.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestIdentifyMimeType.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestIdentifyMimeType.java index 871d0f6..3465b89 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestIdentifyMimeType.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestIdentifyMimeType.java @@ -38,7 +38,7 @@ public class TestIdentifyMimeType { final TestRunner runner = TestRunners.newTestRunner(new IdentifyMimeType()); final File dir = new File("src/test/resources/TestIdentifyMimeType"); - final File[] files = dir.listFiles(); + final File[] files = dir.listFiles((ldir,name)-> name != null && !name.startsWith(".")); int fileCount = 0; for (final File file : files) { if (file.isDirectory()) {
