NIFI-593 Providing Set semantics for those comparisons where ordering is neither guaranteed nor required to be correct.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/13819204 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/13819204 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/13819204 Branch: refs/heads/master Commit: 1381920479e4f1403646997c782304e3a8b36854 Parents: 3472bf3 Author: Aldrin Piri <ald...@apache.org> Authored: Wed May 6 09:01:19 2015 -0400 Committer: Aldrin Piri <ald...@apache.org> Committed: Wed May 6 09:04:03 2015 -0400 ---------------------------------------------------------------------- .../apache/nifi/util/NiFiPropertiesTest.java | 23 +++++++++++----- .../org/apache/nifi/nar/NarUnpackerTest.java | 29 ++++++++++++-------- 2 files changed, 34 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/13819204/nifi/nifi-commons/nifi-properties/src/test/java/org/apache/nifi/util/NiFiPropertiesTest.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-commons/nifi-properties/src/test/java/org/apache/nifi/util/NiFiPropertiesTest.java b/nifi/nifi-commons/nifi-properties/src/test/java/org/apache/nifi/util/NiFiPropertiesTest.java index 344c740..0751275 100644 --- a/nifi/nifi-commons/nifi-properties/src/test/java/org/apache/nifi/util/NiFiPropertiesTest.java +++ b/nifi/nifi-commons/nifi-properties/src/test/java/org/apache/nifi/util/NiFiPropertiesTest.java @@ -16,16 +16,19 @@ */ package org.apache.nifi.util; -import static org.junit.Assert.assertEquals; +import org.junit.Assert; +import org.junit.Test; import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; import java.io.InputStream; import java.nio.file.Path; +import java.util.HashSet; import java.util.List; +import java.util.Set; -import org.junit.Test; +import static org.junit.Assert.assertEquals; public class NiFiPropertiesTest { @@ -36,13 +39,19 @@ public class NiFiPropertiesTest { assertEquals("UI Banner Text", properties.getBannerText()); - List<Path> directories = properties.getNarLibraryDirectories(); + Set<File> expectedDirectories = new HashSet<>(); + expectedDirectories.add(new File("./target/resources/NiFiProperties/lib/")); + expectedDirectories.add(new File("./target/resources/NiFiProperties/lib2/")); - assertEquals(new File("./target/resources/NiFiProperties/lib/").getPath(), - directories.get(0).toString()); - assertEquals(new File("./target/resources/NiFiProperties/lib2/").getPath(), directories - .get(1).toString()); + Set<String> directories = new HashSet<>(); + for (Path narLibDir : properties.getNarLibraryDirectories()) { + directories.add(narLibDir.toString()); + } + Assert.assertEquals("Did not have the anticipated number of directories", expectedDirectories.size(), directories.size()); + for (File expectedDirectory : expectedDirectories) { + Assert.assertTrue("Listed directories did not contain expected directory", directories.contains(expectedDirectory.getPath())); + } } @Test http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/13819204/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/test/java/org/apache/nifi/nar/NarUnpackerTest.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/test/java/org/apache/nifi/nar/NarUnpackerTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/test/java/org/apache/nifi/nar/NarUnpackerTest.java index 33b988d..66e167e 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/test/java/org/apache/nifi/nar/NarUnpackerTest.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/test/java/org/apache/nifi/nar/NarUnpackerTest.java @@ -16,10 +16,10 @@ */ package org.apache.nifi.nar; -import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import org.apache.nifi.util.NiFiProperties; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; import java.io.BufferedInputStream; import java.io.File; @@ -32,10 +32,13 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.SimpleFileVisitor; import java.nio.file.attribute.BasicFileAttributes; +import java.util.HashSet; +import java.util.Set; -import org.apache.nifi.util.NiFiProperties; -import org.junit.BeforeClass; -import org.junit.Test; +import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; public class NarUnpackerTest { @@ -92,13 +95,17 @@ public class NarUnpackerTest { "org.apache.nifi.processors.dummy.one")); assertTrue(extensionMapping.getAllExtensionNames().contains( "org.apache.nifi.processors.dummy.two")); - final File extensionsWorkingDir = properties.getExtensionsWorkingDirectory(); File[] extensionFiles = extensionsWorkingDir.listFiles(); - assertEquals(2, extensionFiles.length); - assertEquals("dummy-one.nar-unpacked", extensionFiles[0].getName()); - assertEquals("dummy-two.nar-unpacked", extensionFiles[1].getName()); + Set<String> expectedNars = new HashSet<>(); + expectedNars.add("dummy-one.nar-unpacked"); + expectedNars.add("dummy-two.nar-unpacked"); + assertEquals(expectedNars.size(), extensionFiles.length); + + for (File extensionFile : extensionFiles) { + Assert.assertTrue(expectedNars.contains(extensionFile.getName())); + } } @Test
