Repository: zookeeper Updated Branches: refs/heads/branch-3.5 f10879167 -> b4a2e87c5
ZOOKEEPER-2656: Fix ServerConfigTest#testValidArguments test case. ServerConfig.getDataDir returns type String in branch-3.4 but return type File in branch-3.5 and master. So we need to deal with this difference accordingly in our test. This PR is intended to be merged in master, branch-3.5, and branch-3.4. rakeshadr PTAL Author: Michael Han <[email protected]> Reviewers: Edward Ribeiro <[email protected]>, Rakesh Radhakrishnan <[email protected]> Closes #140 from hanm/ZOOKEEPER-2565 (cherry picked from commit 1d38d30cfd1aa47f22451f4df53ae2363ea20a82) Signed-off-by: Rakesh Radhakrishnan <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/b4a2e87c Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/b4a2e87c Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/b4a2e87c Branch: refs/heads/branch-3.5 Commit: b4a2e87c5e96b462163ad86271a6d646087a005c Parents: f108791 Author: Michael Han <[email protected]> Authored: Fri Jan 6 17:41:31 2017 +0530 Committer: Rakesh Radhakrishnan <[email protected]> Committed: Fri Jan 6 17:46:26 2017 +0530 ---------------------------------------------------------------------- .../org/apache/zookeeper/ServerConfigTest.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zookeeper/blob/b4a2e87c/src/java/test/org/apache/zookeeper/ServerConfigTest.java ---------------------------------------------------------------------- diff --git a/src/java/test/org/apache/zookeeper/ServerConfigTest.java b/src/java/test/org/apache/zookeeper/ServerConfigTest.java index e2d0da8..27faa74 100644 --- a/src/java/test/org/apache/zookeeper/ServerConfigTest.java +++ b/src/java/test/org/apache/zookeeper/ServerConfigTest.java @@ -23,6 +23,8 @@ import org.junit.Before; import org.junit.Test; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.io.File; @@ -47,7 +49,7 @@ public class ServerConfigTest { serverConfig.parse(args); assertEquals(2181, serverConfig.getClientPortAddress().getPort()); - assertEquals(new File("/data/dir"), serverConfig.getDataDir()); + assertTrue(checkEquality("/data/dir", serverConfig.getDataDir())); assertEquals(60000, serverConfig.getTickTime()); assertEquals(10000, serverConfig.getMaxClientCnxns()); } @@ -57,4 +59,16 @@ public class ServerConfigTest { String[] args = {"2181", "/data/dir", "60000", "10000", "9999"}; serverConfig.parse(args); } -} + + boolean checkEquality(String a, String b) { + assertNotNull(a); + assertNotNull(b); + return a.equals(b); + } + + boolean checkEquality(String a, File b) { + assertNotNull(a); + assertNotNull(b); + return new File(a).equals(b); + } +} \ No newline at end of file
