[cleanup] Convert 13 test classes to SharedPulsarBaseTest (#25331)

Author: merlimat

pulsar-broker/src/test/java/org/apache/bookkeeper/mledger/impl/ConsumerUnsubscribeIntegrationTest.java

@@ -21,38 +21,22 @@
 import static org.testng.Assert.assertEquals;
 import java.util.concurrent.TimeUnit;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.pulsar.broker.BrokerTestUtil;
+import org.apache.pulsar.broker.service.SharedPulsarBaseTest;
 import org.apache.pulsar.broker.service.persistent.PersistentTopic;
 import org.apache.pulsar.client.api.Consumer;
 import org.apache.pulsar.client.api.MessageId;
 import org.apache.pulsar.client.api.Producer;
-import org.apache.pulsar.client.api.ProducerConsumerBase;
 import org.apache.pulsar.client.api.Schema;
 import org.awaitility.Awaitility;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 @Slf4j
 @Test(groups = "broker-impl")
-public class ConsumerUnsubscribeIntegrationTest extends ProducerConsumerBase {
-
-    @BeforeClass(alwaysRun = true)
-    @Override
-    protected void setup() throws Exception {
-        super.internalSetup();
-        super.producerBaseSetup();
-    }
-
-    @AfterClass(alwaysRun = true)
-    @Override
-    protected void cleanup() throws Exception {
-        super.internalCleanup();
-    }
+public class ConsumerUnsubscribeIntegrationTest extends SharedPulsarBaseTest {
 
     @Test
     public void testUnSubscribeWhenCursorNotExists() throws Exception {
-        final String topic = BrokerTestUtil.newUniqueName("persistent://public/default/tp");
+        final String topic = newTopicName();
         final String subscription = "s1";
         admin.topics().createNonPartitionedTopic(topic);
         admin.topics().createSubscription(topic, subscription, MessageId.earliest);
@@ -65,7 +49,7 @@ public void testUnSubscribeWhenCursorNotExists() throws Exception {
         consumer.acknowledge(consumer.receive(2, TimeUnit.SECONDS));
 
         PersistentTopic persistentTopic =
-                (PersistentTopic) pulsar.getBrokerService().getTopic(topic, false).join().get();
+                (PersistentTopic) getTopic(topic, false).join().get();
         ManagedLedgerImpl ml = (ManagedLedgerImpl) persistentTopic.getManagedLedger();
         ManagedCursorImpl cursor = (ManagedCursorImpl) ml.getCursors().get(subscription);
         Awaitility.await().untilAsserted(() -> {

pulsar-broker/src/test/java/org/apache/pulsar/client/api/ExposeMessageRedeliveryCountTest.java

@@ -21,32 +21,18 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import org.apache.pulsar.broker.service.SharedPulsarBaseTest;
 import org.apache.pulsar.client.admin.PulsarAdminException;
 import org.testng.Assert;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 @Test(groups = "broker-api")
-public class ExposeMessageRedeliveryCountTest extends ProducerConsumerBase {
-
-    @BeforeMethod
-    @Override
-    protected void setup() throws Exception {
-        super.internalSetup();
-        super.producerBaseSetup();
-    }
-
-    @AfterMethod(alwaysRun = true)
-    @Override
-    protected void cleanup() throws Exception {
-        super.internalCleanup();
-    }
+public class ExposeMessageRedeliveryCountTest extends SharedPulsarBaseTest {
 
     @Test(timeOut = 30000)
     public void testRedeliveryCount() throws PulsarClientException {
 
-        final String topic = "persistent://my-property/my-ns/redeliveryCount";
+        final String topic = newTopicName();
 
         Consumer<byte[]> consumer = pulsarClient.newConsumer(Schema.BYTES)
                 .topic(topic)
@@ -81,7 +67,7 @@ public void testRedeliveryCount() throws PulsarClientException {
     @Test(timeOut = 30000)
     public void testRedeliveryCountWithPartitionedTopic() throws PulsarClientException, PulsarAdminException {
 
-        final String topic = "persistent://my-property/my-ns/redeliveryCount.partitioned";
+        final String topic = newTopicName();
 
         admin.topics().createPartitionedTopic(topic, 3);
 
@@ -119,7 +105,7 @@ public void testRedeliveryCountWithPartitionedTopic() throws PulsarClientExcepti
     @Test(timeOut = 30000)
     public void testRedeliveryCountWhenConsumerDisconnected() throws PulsarClientException {
 
-        String topic = "persistent://my-property/my-ns/testRedeliveryCountWhenConsumerDisconnected";
+        String topic = newTopicName();
 
         Consumer<String> consumer0 = pulsarClient.newConsumer(Schema.STRING)
                 .topic(topic)

pulsar-broker/src/test/java/org/apache/pulsar/client/api/MemoryLimitTest.java

@@ -23,17 +23,16 @@
 import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 import lombok.Cleanup;
+import org.apache.pulsar.broker.service.SharedPulsarBaseTest;
 import org.apache.pulsar.client.api.PulsarClientException.MemoryBufferIsFullError;
 import org.apache.pulsar.client.impl.ProducerImpl;
 import org.apache.pulsar.client.impl.PulsarTestClient;
 import org.awaitility.Awaitility;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 @Test(groups = "broker-api")
-public class MemoryLimitTest extends ProducerConsumerBase {
+public class MemoryLimitTest extends SharedPulsarBaseTest {
 
     @DataProvider(name = "batchingAndMemoryLimit")
     public Object[][] provider() {
@@ -44,26 +43,13 @@ public Object[][] provider() {
         };
     }
 
-    @BeforeMethod
-    @Override
-    protected void setup() throws Exception {
-        super.internalSetup();
-        super.producerBaseSetup();
-    }
-
-    @AfterMethod(alwaysRun = true)
-    @Override
-    protected void cleanup() throws Exception {
-        super.internalCleanup();
-    }
-
     @Test(dataProvider = "batchingAndMemoryLimit")
     public void testRejectMessages(boolean batching, int memoryLimit)
             throws Exception {
         String topic = newTopicName();
 
         ClientBuilder clientBuilder = PulsarClient.builder()
-                .serviceUrl(pulsar.getBrokerServiceUrl())
+                .serviceUrl(getBrokerServiceUrl())
                 .memoryLimit(memoryLimit, SizeUnit.KILO_BYTES);
 
         @Cleanup
@@ -120,7 +106,7 @@ public void testRejectMessagesOnMultipleTopics(boolean batching, int memoryLimit
         String t2 = newTopicName();
 
         ClientBuilder clientBuilder = PulsarClient.builder()
-                .serviceUrl(pulsar.getBrokerServiceUrl())
+                .serviceUrl(getBrokerServiceUrl())
                 .memoryLimit(memoryLimit, SizeUnit.KILO_BYTES);
 
         @Cleanup