Repository: nifi Updated Branches: refs/heads/master 769e87467 -> 1c9ea249f
NIFI-3666 - TlsToolkit using .equals() comparison for parent and root This closes #1641. Signed-off-by: Koji Kawamura <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/1c9ea249 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/1c9ea249 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/1c9ea249 Branch: refs/heads/master Commit: 1c9ea249f77f5cc7675510a143a8f6c15ddeaa85 Parents: 769e874 Author: Bryan Rosander <[email protected]> Authored: Fri Mar 31 13:16:57 2017 -0400 Committer: Koji Kawamura <[email protected]> Committed: Fri Apr 21 16:24:13 2017 +0900 ---------------------------------------------------------------------- .../tls/standalone/TlsToolkitStandaloneCommandLine.java | 2 +- .../tls/standalone/TlsToolkitStandaloneCommandLineTest.java | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/1c9ea249/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/standalone/TlsToolkitStandaloneCommandLine.java ---------------------------------------------------------------------- diff --git a/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/standalone/TlsToolkitStandaloneCommandLine.java b/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/standalone/TlsToolkitStandaloneCommandLine.java index 159b1d3..2fcce7c 100644 --- a/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/standalone/TlsToolkitStandaloneCommandLine.java +++ b/nifi-toolkit/nifi-toolkit-tls/src/main/java/org/apache/nifi/toolkit/tls/standalone/TlsToolkitStandaloneCommandLine.java @@ -66,7 +66,7 @@ public class TlsToolkitStandaloneCommandLine extends BaseCommandLine { protected static String calculateDefaultOutputDirectory(Path currentPath) { Path currentAbsolutePath = currentPath.toAbsolutePath(); Path parent = currentAbsolutePath.getParent(); - if (parent == currentAbsolutePath.getRoot()) { + if (currentAbsolutePath.getRoot().equals(parent)) { return parent.toString(); } else { Path currentNormalizedPath = currentAbsolutePath.normalize(); http://git-wip-us.apache.org/repos/asf/nifi/blob/1c9ea249/nifi-toolkit/nifi-toolkit-tls/src/test/java/org/apache/nifi/toolkit/tls/standalone/TlsToolkitStandaloneCommandLineTest.java ---------------------------------------------------------------------- diff --git a/nifi-toolkit/nifi-toolkit-tls/src/test/java/org/apache/nifi/toolkit/tls/standalone/TlsToolkitStandaloneCommandLineTest.java b/nifi-toolkit/nifi-toolkit-tls/src/test/java/org/apache/nifi/toolkit/tls/standalone/TlsToolkitStandaloneCommandLineTest.java index 38b89dc..0fe004a 100644 --- a/nifi-toolkit/nifi-toolkit-tls/src/test/java/org/apache/nifi/toolkit/tls/standalone/TlsToolkitStandaloneCommandLineTest.java +++ b/nifi-toolkit/nifi-toolkit-tls/src/test/java/org/apache/nifi/toolkit/tls/standalone/TlsToolkitStandaloneCommandLineTest.java @@ -50,7 +50,6 @@ import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; -import static org.junit.Assume.assumeFalse; import static org.mockito.Matchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; @@ -424,13 +423,8 @@ public class TlsToolkitStandaloneCommandLineTest { tlsToolkitStandaloneCommandLine.parse("-n", "notInGlobalOrder", "-G", "nifi[1-3]"); } - private boolean isWindowsEnvironment() { - return System.getProperty("os.name").toLowerCase().startsWith("windows"); - } - @Test public void testDefaultOutputPathRoot() { - assumeFalse(isWindowsEnvironment()); Path root = Paths.get(".").toAbsolutePath().getRoot().resolve("."); String calculateDefaultOutputDirectory = TlsToolkitStandaloneCommandLine.calculateDefaultOutputDirectory(root); assertEquals(root.toAbsolutePath().getRoot().toString(), calculateDefaultOutputDirectory);
