This is an automated email from the ASF dual-hosted git repository. penghui pushed a commit to branch branch-2.9 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 37628b5650e27231af6d757a519ed8e53784f6bc Author: ZhangJian He <[email protected]> AuthorDate: Thu Nov 11 09:10:03 2021 +0800 Remove unnecessary powermock annotation (#12713) (cherry picked from commit 8cae63557a318240e95697f382b4f61c22b70d64) --- .../org/apache/pulsar/broker/admin/PersistentTopicsTest.java | 4 ---- .../test/java/org/apache/pulsar/broker/admin/TopicsTest.java | 4 ---- .../NonPersistentStickyKeyDispatcherMultipleConsumersTest.java | 2 -- .../broker/service/persistent/PersistentSubscriptionTest.java | 7 ------- .../service/streamingdispatch/StreamingEntryReaderTests.java | 10 ---------- 5 files changed, 27 deletions(-) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java index a471cab..6e5ef99 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java @@ -80,8 +80,6 @@ import org.apache.pulsar.common.policies.data.TenantInfoImpl; import org.apache.pulsar.common.policies.data.TopicStats; import org.apache.zookeeper.KeeperException; import org.mockito.ArgumentCaptor; -import org.powermock.core.classloader.annotations.PowerMockIgnore; -import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.reflect.Whitebox; import org.testng.Assert; import org.testng.annotations.AfterMethod; @@ -89,8 +87,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -@PrepareForTest(PersistentTopics.class) -@PowerMockIgnore("com.sun.management.*") @Slf4j @Test(groups = "broker") public class PersistentTopicsTest extends MockedPulsarServiceBaseTest { diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicsTest.java index 3f57806..7b77b1a 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicsTest.java @@ -25,13 +25,11 @@ import lombok.Data; import lombok.NoArgsConstructor; import org.apache.avro.generic.GenericData; import org.apache.avro.generic.GenericRecord; -import org.apache.avro.io.BinaryEncoder; import org.apache.avro.io.EncoderFactory; import org.apache.avro.io.JsonEncoder; import org.apache.avro.reflect.ReflectDatumWriter; import org.apache.avro.util.Utf8; import org.apache.pulsar.broker.PulsarService; -import org.apache.pulsar.broker.admin.v2.PersistentTopics; import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest; import org.apache.pulsar.broker.authentication.AuthenticationDataHttps; import org.apache.pulsar.broker.namespace.NamespaceService; @@ -70,7 +68,6 @@ import org.apache.pulsar.websocket.data.ProducerMessages; import org.mockito.ArgumentCaptor; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.reflect.Whitebox; import org.testng.Assert; import org.testng.annotations.AfterMethod; @@ -97,7 +94,6 @@ import static org.powermock.api.mockito.PowerMockito.doReturn; import static org.powermock.api.mockito.PowerMockito.mock; import static org.powermock.api.mockito.PowerMockito.spy; -@PrepareForTest(PersistentTopics.class) public class TopicsTest extends MockedPulsarServiceBaseTest { private Topics topics; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentStickyKeyDispatcherMultipleConsumersTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentStickyKeyDispatcherMultipleConsumersTest.java index 990bd8f..4a2b0f4 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentStickyKeyDispatcherMultipleConsumersTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentStickyKeyDispatcherMultipleConsumersTest.java @@ -71,7 +71,6 @@ public class NonPersistentStickyKeyDispatcherMultipleConsumersTest { private NonPersistentTopic topicMock; private NonPersistentSubscription subscriptionMock; private ServiceConfiguration configMock; - private ChannelPromise channelMock; private NonPersistentStickyKeyDispatcherMultipleConsumers nonpersistentDispatcher; @@ -100,7 +99,6 @@ public class NonPersistentStickyKeyDispatcherMultipleConsumersTest { doReturn(brokerMock).when(topicMock).getBrokerService(); doReturn(topicName).when(topicMock).getName(); - channelMock = mock(ChannelPromise.class); subscriptionMock = mock(NonPersistentSubscription.class); PowerMockito.mockStatic(DispatchRateLimiter.class); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentSubscriptionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentSubscriptionTest.java index 76f485e..a76c637 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentSubscriptionTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentSubscriptionTest.java @@ -21,7 +21,6 @@ package org.apache.pulsar.broker.service.persistent; import static org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest.createMockBookKeeper; import static org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest.createMockZooKeeper; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -73,20 +72,14 @@ import org.apache.pulsar.compaction.Compactor; import org.apache.pulsar.metadata.api.MetadataStore; import org.apache.pulsar.metadata.impl.ZKMetadataStore; import org.apache.pulsar.transaction.common.exception.TransactionConflictException; -import org.apache.pulsar.zookeeper.ZooKeeperCache; -import org.apache.pulsar.zookeeper.ZooKeeperDataCache; import org.apache.zookeeper.ZooKeeper; import org.awaitility.Awaitility; -import org.powermock.core.classloader.annotations.PowerMockIgnore; -import org.powermock.core.classloader.annotations.PrepareForTest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -@PrepareForTest({ ZooKeeperDataCache.class, BrokerService.class }) -@PowerMockIgnore({"org.apache.logging.log4j.*"}) @Test(groups = "broker") public class PersistentSubscriptionTest { diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/streamingdispatch/StreamingEntryReaderTests.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/streamingdispatch/StreamingEntryReaderTests.java index e58859d..217ac0f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/streamingdispatch/StreamingEntryReaderTests.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/streamingdispatch/StreamingEntryReaderTests.java @@ -38,8 +38,6 @@ import org.apache.pulsar.broker.service.BrokerService; import org.apache.pulsar.broker.service.persistent.PersistentTopic; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.powermock.core.classloader.annotations.PowerMockIgnore; -import org.powermock.core.classloader.annotations.PrepareForTest; import org.testng.annotations.Test; import java.nio.charset.Charset; @@ -66,15 +64,7 @@ import static org.testng.Assert.assertEquals; /** * Tests for {@link StreamingEntryReader} */ -@PowerMockIgnore({ - "javax.management.*", - "javax.xml.parsers.*", - "com.sun.org.apache.xerces.internal.jaxp.*", - "ch.qos.logback.*", - "org.slf4j.*", - "org.apache.logging.*"}) @Test(groups = "flaky") -@PrepareForTest({ManagedLedgerImpl.class}) public class StreamingEntryReaderTests extends MockedBookKeeperTestCase { private static final Charset Encoding = Charsets.UTF_8;
