[test] fix mock zookeeper change (#1552)

Co-authored-by: [email protected] <[email protected]>

Author: RobertIndie

amqp-impl/src/test/java/io/streamnative/pulsar/handlers/amqp/test/AopProtocolHandlerTestBase.java

@@ -18,7 +18,6 @@
 import static org.mockito.Mockito.spy;
 
 import com.google.common.collect.Sets;
-import com.google.common.util.concurrent.MoreExecutors;
 import io.netty.channel.EventLoopGroup;
 import io.streamnative.pulsar.handlers.amqp.AmqpServiceConfiguration;
 import java.lang.reflect.Field;
@@ -163,7 +162,7 @@ protected void setupBrokerMocks(PulsarService pulsar) throws Exception {
     }
 
     public static MockZooKeeper createMockZooKeeper() throws Exception {
-        MockZooKeeper zk = MockZooKeeper.newInstance(MoreExecutors.newDirectExecutorService());
+        MockZooKeeper zk = MockZooKeeper.newInstance();
         List<ACL> dummyAclList = new ArrayList<>(0);
 
         ZkUtils.createFullPathOptimistic(zk, "/ledgers/available/192.168.1.1:" + 5000,

tests-qpid-jms-client/src/test/java/io/streamnative/pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java

@@ -14,7 +14,6 @@
 package io.streamnative.pulsar.handlers.amqp;
 
 import com.google.common.collect.Sets;
-import com.google.common.util.concurrent.MoreExecutors;
 import io.netty.channel.EventLoopGroup;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
@@ -40,7 +39,6 @@
 import org.apache.zookeeper.MockZooKeeper;
 import org.apache.zookeeper.MockZooKeeperSession;
 import org.apache.zookeeper.data.ACL;
-import org.mockito.Mockito;
 
 import java.lang.reflect.Field;
 import java.net.URI;
@@ -290,7 +288,7 @@ protected void setupBrokerMocks(PulsarService pulsar) throws Exception {
     }
 
     public static MockZooKeeper createMockZooKeeper() throws Exception {
-        MockZooKeeper zk = MockZooKeeper.newInstance(MoreExecutors.newDirectExecutorService());
+        MockZooKeeper zk = MockZooKeeper.newInstance();
         zk.setSessionId(-1);
         List<ACL> dummyAclList = new ArrayList<>(0);
 

tests/src/test/java/io/streamnative/pulsar/handlers/amqp/AmqpProtocolHandlerTestBase.java

@@ -18,7 +18,6 @@
 import static org.mockito.Mockito.spy;
 
 import com.google.common.collect.Sets;
-import com.google.common.util.concurrent.MoreExecutors;
 import io.netty.channel.EventLoopGroup;
 import java.lang.reflect.Field;
 import java.net.URI;
@@ -317,7 +316,7 @@ protected void setupBrokerMocks(PulsarService pulsar) throws Exception {
     }
 
     public static MockZooKeeper createMockZooKeeper() throws Exception {
-        MockZooKeeper zk = MockZooKeeper.newInstance(MoreExecutors.newDirectExecutorService());
+        MockZooKeeper zk = MockZooKeeper.newInstance();
         zk.setSessionId(-1);
         List<ACL> dummyAclList = new ArrayList<>(0);