[test] remove PowerMockito from the classpath and replace the usages with Mockito

managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerFactoryShutdownTest.java

@@ -25,7 +25,8 @@
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.doAnswer;
-import static org.powermock.api.mockito.PowerMockito.mock;
+import static org.mockito.Mockito.mock;
+
 import java.util.Collections;
 import java.util.Optional;
 import java.util.UUID;

pom.xml

@@ -324,13 +324,7 @@ flexible messaging model and an intuitive client API.</description>
 
       <dependency>
         <groupId>org.powermock</groupId>
-        <artifactId>powermock-api-mockito2</artifactId>
-        <version>${powermock.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.powermock</groupId>
-        <artifactId>powermock-module-testng</artifactId>
+        <artifactId>powermock-reflect</artifactId>
         <version>${powermock.version}</version>
       </dependency>
 
@@ -1312,13 +1306,7 @@ flexible messaging model and an intuitive client API.</description>
 
     <dependency>
       <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito2</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-testng</artifactId>
+      <artifactId>powermock-reflect</artifactId>
       <scope>test</scope>
     </dependency>
 

pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicsTest.java

@@ -87,12 +87,12 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
-import static org.powermock.api.mockito.PowerMockito.doAnswer;
-import static org.powermock.api.mockito.PowerMockito.doReturn;
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.spy;
 
 public class TopicsTest extends MockedPulsarServiceBaseTest {
 

pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java

@@ -66,14 +66,12 @@
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.MockZooKeeper;
 import org.apache.zookeeper.data.ACL;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * Base class for all tests that need a Pulsar instance without a ZK and BK cluster.
  */
-@PowerMockIgnore(value = {"org.slf4j.*", "com.sun.org.apache.xerces.*" })
 public abstract class MockedPulsarServiceBaseTest extends TestRetrySupport {
 
     protected final String DUMMY_VALUE = "DUMMY_VALUE";

pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentMessageFinderTest.java

@@ -21,12 +21,12 @@
 import static org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest.retryStrategically;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.clearInvocations;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.powermock.api.mockito.PowerMockito.doAnswer;
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.spy;
-import static org.powermock.api.mockito.PowerMockito.when;
+import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotEquals;

pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicOwnerTest.java

@@ -20,8 +20,9 @@
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.nullable;
-import static org.powermock.api.mockito.PowerMockito.doAnswer;
-import static org.powermock.api.mockito.PowerMockito.spy;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.spy;
+
 import com.github.benmanes.caffeine.cache.AsyncLoadingCache;
 import com.google.common.collect.Sets;
 import java.util.LinkedHashMap;

pulsar-broker/src/test/java/org/apache/pulsar/broker/service/streamingdispatch/StreamingEntryReaderTests.java

@@ -54,11 +54,11 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.reset;
-import static org.powermock.api.mockito.PowerMockito.doAnswer;
-import static org.powermock.api.mockito.PowerMockito.mock;
-import static org.powermock.api.mockito.PowerMockito.spy;
-import static org.powermock.api.mockito.PowerMockito.when;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
 
 /**

pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestCmdPackages.java

@@ -35,15 +35,13 @@
 import org.apache.pulsar.client.admin.PulsarAdmin;
 import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.apache.pulsar.packages.management.core.common.PackageMetadata;
-import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 /**
  * Unit test for packages commands.
  */
-@PrepareForTest(CmdPackages.class)
 public class TestCmdPackages {
 
     private PulsarAdmin pulsarAdmin;

pulsar-client/src/test/java/org/apache/pulsar/client/impl/AutoClusterFailoverTest.java

@@ -30,10 +30,11 @@
 import org.apache.pulsar.client.impl.conf.ClientConfigurationData;
 import org.awaitility.Awaitility;
 import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import static org.mockito.Mockito.mock;
+
 @Test(groups = "broker-impl")
 public class AutoClusterFailoverTest {
     @Test
@@ -116,7 +117,7 @@ public void testAutoClusterFailoverSwitchWithoutAuthentication() {
                 .build();
 
         AutoClusterFailover autoClusterFailover = Mockito.spy((AutoClusterFailover) provider);
-        PulsarClientImpl pulsarClient = PowerMockito.mock(PulsarClientImpl.class);
+        PulsarClientImpl pulsarClient = mock(PulsarClientImpl.class);
         Mockito.doReturn(false).when(autoClusterFailover).probeAvailable(primary);
         Mockito.doReturn(true).when(autoClusterFailover).probeAvailable(secondary);
         Mockito.doReturn(configurationData).when(pulsarClient).getConfiguration();
@@ -172,7 +173,7 @@ public void testAutoClusterFailoverSwitchWithAuthentication() throws IOException
                 .build();
 
         AutoClusterFailover autoClusterFailover = Mockito.spy((AutoClusterFailover) provider);
-        PulsarClientImpl pulsarClient = PowerMockito.mock(PulsarClientImpl.class);
+        PulsarClientImpl pulsarClient = mock(PulsarClientImpl.class);
         Mockito.doReturn(false).when(autoClusterFailover).probeAvailable(primary);
         Mockito.doReturn(true).when(autoClusterFailover).probeAvailable(secondary);
         Mockito.doReturn(configurationData).when(pulsarClient).getConfiguration();
@@ -225,7 +226,7 @@ public void testAutoClusterFailoverSwitchTlsTrustStore() throws IOException {
                 .build();
 
         AutoClusterFailover autoClusterFailover = Mockito.spy((AutoClusterFailover) provider);
-        PulsarClientImpl pulsarClient = PowerMockito.mock(PulsarClientImpl.class);
+        PulsarClientImpl pulsarClient = mock(PulsarClientImpl.class);
         Mockito.doReturn(false).when(autoClusterFailover).probeAvailable(primary);
         Mockito.doReturn(true).when(autoClusterFailover).probeAvailable(secondary);
         Mockito.doReturn(configurationData).when(pulsarClient).getConfiguration();

pulsar-client/src/test/java/org/apache/pulsar/client/impl/BatchMessageContainerImplTest.java

@@ -18,58 +18,53 @@
  */
 package org.apache.pulsar.client.impl;
 
-import org.apache.bookkeeper.common.allocator.impl.ByteBufAllocatorBuilderImpl;
 import org.apache.bookkeeper.common.allocator.impl.ByteBufAllocatorImpl;
 import org.apache.pulsar.client.api.CompressionType;
 import org.apache.pulsar.client.api.Schema;
 import org.apache.pulsar.client.impl.conf.ProducerConfigurationData;
 import org.apache.pulsar.common.api.proto.MessageMetadata;
+import org.mockito.MockedConstruction;
 import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.testng.IObjectFactory;
-import org.testng.annotations.ObjectFactory;
 import org.testng.annotations.Test;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 
-@PrepareForTest({ByteBufAllocatorImpl.class, ByteBufAllocatorBuilderImpl.class})
-@PowerMockIgnore({"javax.management.*", "javax.ws.*", "org.apache.logging.log4j.*"})
-public class BatchMessageContainerImplTest {
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.when;
 
-    @ObjectFactory
-    public IObjectFactory getObjectFactory() {
-        return new org.powermock.modules.testng.PowerMockObjectFactory();
-    }
+public class BatchMessageContainerImplTest {
 
     @Test
     public void recoveryAfterOom() throws Exception {
-        final ByteBufAllocatorImpl mockAllocator = PowerMockito.mock(ByteBufAllocatorImpl.class);
-        PowerMockito.whenNew(ByteBufAllocatorImpl.class).withAnyArguments().thenReturn(mockAllocator);
-        PowerMockito.when(mockAllocator.buffer(Mockito.anyInt(), Mockito.anyInt())).thenThrow(new OutOfMemoryError("test")).thenReturn(null);
-        final ProducerImpl producer = Mockito.mock(ProducerImpl.class);
-        final ProducerConfigurationData producerConfigurationData = new ProducerConfigurationData();
-        producerConfigurationData.setCompressionType(CompressionType.NONE);
-        Mockito.when(producer.getConfiguration()).thenReturn(producerConfigurationData);
-        final BatchMessageContainerImpl batchMessageContainer = new BatchMessageContainerImpl();
-        batchMessageContainer.setProducer(producer);
-        MessageMetadata messageMetadata1 = new MessageMetadata();
-        messageMetadata1.setSequenceId(1L);
-        messageMetadata1.setProducerName("producer1");
-        messageMetadata1.setPublishTime(System.currentTimeMillis());
-        ByteBuffer payload1 = ByteBuffer.wrap("payload1".getBytes(StandardCharsets.UTF_8));
-        final MessageImpl<byte[]> message1 = MessageImpl.create(messageMetadata1, payload1, Schema.BYTES, null);
-        batchMessageContainer.add(message1, null);
-        MessageMetadata messageMetadata2 = new MessageMetadata();
-        messageMetadata2.setSequenceId(1L);
-        messageMetadata2.setProducerName("producer1");
-        messageMetadata2.setPublishTime(System.currentTimeMillis());
-        ByteBuffer payload2 = ByteBuffer.wrap("payload2".getBytes(StandardCharsets.UTF_8));
-        final MessageImpl<byte[]> message2 = MessageImpl.create(messageMetadata2, payload2, Schema.BYTES, null);
-        // after oom, our add can self-healing, won't throw exception
-        batchMessageContainer.add(message2, null);
+        try (MockedConstruction<ByteBufAllocatorImpl> mocked = Mockito.mockConstruction(ByteBufAllocatorImpl.class,
+                (mockAllocator, context) -> {
+                    doThrow(new OutOfMemoryError("test")).when(mockAllocator).buffer(anyInt(), anyInt());
+                })) {
+
+            final ProducerImpl producer = Mockito.mock(ProducerImpl.class);
+            final ProducerConfigurationData producerConfigurationData = new ProducerConfigurationData();
+            producerConfigurationData.setCompressionType(CompressionType.NONE);
+            when(producer.getConfiguration()).thenReturn(producerConfigurationData);
+            final BatchMessageContainerImpl batchMessageContainer = new BatchMessageContainerImpl();
+            batchMessageContainer.setProducer(producer);
+            MessageMetadata messageMetadata1 = new MessageMetadata();
+            messageMetadata1.setSequenceId(1L);
+            messageMetadata1.setProducerName("producer1");
+            messageMetadata1.setPublishTime(System.currentTimeMillis());
+            ByteBuffer payload1 = ByteBuffer.wrap("payload1".getBytes(StandardCharsets.UTF_8));
+            final MessageImpl<byte[]> message1 = MessageImpl.create(messageMetadata1, payload1, Schema.BYTES, null);
+            batchMessageContainer.add(message1, null);
+            MessageMetadata messageMetadata2 = new MessageMetadata();
+            messageMetadata2.setSequenceId(1L);
+            messageMetadata2.setProducerName("producer1");
+            messageMetadata2.setPublishTime(System.currentTimeMillis());
+            ByteBuffer payload2 = ByteBuffer.wrap("payload2".getBytes(StandardCharsets.UTF_8));
+            final MessageImpl<byte[]> message2 = MessageImpl.create(messageMetadata2, payload2, Schema.BYTES, null);
+            // after oom, our add can self-healing, won't throw exception
+            batchMessageContainer.add(message2, null);
+        }
     }
 
 }

pulsar-client/src/test/java/org/apache/pulsar/client/impl/ControlledClusterFailoverTest.java

@@ -27,10 +27,11 @@
 import org.asynchttpclient.Request;
 import org.awaitility.Awaitility;
 import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import static org.mockito.Mockito.mock;
+
 @Test(groups = "broker-impl")
 public class ControlledClusterFailoverTest {
     @Test
@@ -86,7 +87,7 @@ public void testControlledClusterFailoverSwitch() throws IOException {
             .build();
 
         ControlledClusterFailover controlledClusterFailover = Mockito.spy((ControlledClusterFailover) provider);
-        PulsarClientImpl pulsarClient = PowerMockito.mock(PulsarClientImpl.class);
+        PulsarClientImpl pulsarClient = mock(PulsarClientImpl.class);
 
         controlledClusterFailover.initialize(pulsarClient);
 

pulsar-client/src/test/java/org/apache/pulsar/client/impl/MessageImplTest.java

@@ -40,12 +40,13 @@
 import org.apache.pulsar.common.schema.KeyValue;
 import org.apache.pulsar.common.schema.KeyValueEncodingType;
 import org.testng.Assert;
+
+import static org.mockito.Mockito.when;
 import static org.testng.AssertJUnit.fail;
 import org.testng.annotations.Test;
 
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
-import static org.powermock.api.mockito.PowerMockito.when;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertFalse;

pulsar-client/src/test/java/org/apache/pulsar/client/impl/RoundRobinPartitionMessageRouterImplTest.java

@@ -19,7 +19,7 @@
 package org.apache.pulsar.client.impl;
 
 import static org.mockito.Mockito.mock;
-import static org.powermock.api.mockito.PowerMockito.when;
+import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
@@ -29,6 +29,7 @@
 
 import org.apache.pulsar.client.api.HashingScheme;
 import org.apache.pulsar.client.api.Message;
+import org.mockito.Mockito;
 import org.testng.annotations.Test;
 
 /**
@@ -51,7 +52,7 @@ public void testChoosePartitionWithoutKey() {
     @Test
     public void testChoosePartitionWithoutKeyWithBatching() {
         Message<?> msg = mock(Message.class);
-        when(msg.getKey()).thenReturn(null);
+        Mockito.when(msg.getKey()).thenReturn(null);
 
         // Fake clock, simulate 1 millisecond passes for each invocation
         Clock clock = new Clock() {

pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SupportVersioningAvroSchemaTest.java

@@ -28,7 +28,7 @@
 
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
-import static org.powermock.api.mockito.PowerMockito.when;
+import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 

pulsar-client/src/test/java/org/apache/pulsar/client/impl/schema/SupportVersioningKeyValueSchemaTest.java

@@ -29,7 +29,7 @@
 
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.mock;
-import static org.powermock.api.mockito.PowerMockito.when;
+import static org.mockito.Mockito.when;
 
 public class SupportVersioningKeyValueSchemaTest {