You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2018/05/09 22:20:42 UTC

zookeeper git commit: ZOOKEEPER-3012: Fix unit test: testDataDirAndDataLogDir should not use hardcode test folders (3.4)

Repository: zookeeper
Updated Branches:
  refs/heads/branch-3.4 a6efddca2 -> 6ce1a6cc3


ZOOKEEPER-3012: Fix unit test: testDataDirAndDataLogDir should not use hardcode test folders (3.4)

Replaced by creating random folders.

https://issues.apache.org/jira/browse/ZOOKEEPER-3012

Author: Andor Molnar <an...@cloudera.com>

Reviewers: phunt@apache.org

Closes #515 from anmolnar/ZOOKEEPER-3012_34

Change-Id: I8fa39289868c897f453cade7832c87fa914dd2b1


Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/6ce1a6cc
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/6ce1a6cc
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/6ce1a6cc

Branch: refs/heads/branch-3.4
Commit: 6ce1a6cc3824e052f99361620169c42de01a99ab
Parents: a6efddc
Author: Andor Molnar <an...@cloudera.com>
Authored: Wed May 9 15:20:08 2018 -0700
Committer: Patrick Hunt <ph...@apache.org>
Committed: Wed May 9 15:20:08 2018 -0700

----------------------------------------------------------------------
 .../server/quorum/QuorumPeerMainTest.java       | 35 ++++++++++++--------
 1 file changed, 22 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zookeeper/blob/6ce1a6cc/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java
----------------------------------------------------------------------
diff --git a/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java b/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java
index 258ec89..0099c93 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java
+++ b/src/java/test/org/apache/zookeeper/server/quorum/QuorumPeerMainTest.java
@@ -19,6 +19,7 @@
 package org.apache.zookeeper.server.quorum;
 
 import static org.apache.zookeeper.test.ClientBase.CONNECTION_TIMEOUT;
+import static org.apache.zookeeper.test.ClientBase.createEmptyTestDir;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doCallRealMethod;
@@ -43,6 +44,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.regex.Pattern;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PatternLayout;
@@ -1101,23 +1103,30 @@ public class QuorumPeerMainTest extends QuorumPeerTestBase {
     @Test
     public void testDataDirAndDataLogDir() throws Exception {
         // Arrange
-        QuorumPeerConfig configMock = mock(QuorumPeerConfig.class);
-        when(configMock.getDataDir()).thenReturn("/tmp/zookeeper");
-        when(configMock.getDataLogDir()).thenReturn("/tmp/zookeeperLog");
+        File dataDir = createEmptyTestDir();
+        File dataLogDir = createEmptyTestDir();
+        try {
+            QuorumPeerConfig configMock = mock(QuorumPeerConfig.class);
+            when(configMock.getDataDir()).thenReturn(dataDir.getAbsolutePath());
+            when(configMock.getDataLogDir()).thenReturn(dataLogDir.getAbsolutePath());
 
-        QuorumPeer qpMock = mock(QuorumPeer.class);
+            QuorumPeer qpMock = mock(QuorumPeer.class);
 
-        doCallRealMethod().when(qpMock).setTxnFactory(any(FileTxnSnapLog.class));
-        when(qpMock.getTxnFactory()).thenCallRealMethod();
-        InjectableQuorumPeerMain qpMain = new InjectableQuorumPeerMain(qpMock);
+            doCallRealMethod().when(qpMock).setTxnFactory(any(FileTxnSnapLog.class));
+            when(qpMock.getTxnFactory()).thenCallRealMethod();
+            InjectableQuorumPeerMain qpMain = new InjectableQuorumPeerMain(qpMock);
 
-        // Act
-        qpMain.runFromConfig(configMock);
+            // Act
+            qpMain.runFromConfig(configMock);
 
-        // Assert
-        FileTxnSnapLog txnFactory = qpMain.getQuorumPeer().getTxnFactory();
-        assertEquals("/tmp/zookeeperLog/version-2", txnFactory.getDataDir().getAbsolutePath());
-        assertEquals("/tmp/zookeeper/version-2", txnFactory.getSnapDir().getAbsolutePath());
+            // Assert
+            FileTxnSnapLog txnFactory = qpMain.getQuorumPeer().getTxnFactory();
+            assertEquals(dataLogDir.getAbsolutePath() + "/version-2", txnFactory.getDataDir().getAbsolutePath());
+            assertEquals(dataDir.getAbsolutePath() + "/version-2", txnFactory.getSnapDir().getAbsolutePath());
+        } finally {
+            FileUtils.deleteDirectory(dataDir);
+            FileUtils.deleteDirectory(dataLogDir);
+        }
     }
 
     private class InjectableQuorumPeerMain extends QuorumPeerMain {